1 files changed, 4 insertions, 55 deletions
diff --git a/src/backends/backendsCommon/test/DataLayoutUtils.hpp b/src/backends/backendsCommon/test/DataLayoutUtils.hpp
index 89b3900979..e920c543f0 100644
--- a/src/backends/backendsCommon/test/DataLayoutUtils.hpp
+++ b/src/backends/backendsCommon/test/DataLayoutUtils.hpp
@@ -1,60 +1,9 @@
 //
-// Copyright © 2019 Arm Ltd. All rights reserved.
+// Copyright © 2019 Arm Ltd and Contributors. All rights reserved.
 // SPDX-License-Identifier: MIT
 //
 
-#pragma once
+#include <armnnTestUtils/DataLayoutUtils.hpp>
 
-#include <armnn/Tensor.hpp>
-#include <armnn/Types.hpp>
-
-#include <armnnUtils/Permute.hpp>
-
-template<typename T>
-void PermuteTensorNchwToNhwc(armnn::TensorInfo& tensorInfo, std::vector<T>& tensorData)
-{
-    const armnn::PermutationVector nchwToNhwc = { 0, 3, 1, 2 };
-
-    tensorInfo = armnnUtils::Permuted(tensorInfo, nchwToNhwc);
-
-    std::vector<T> tmp(tensorData.size());
-    armnnUtils::Permute(tensorInfo.GetShape(), nchwToNhwc, tensorData.data(), tmp.data(), sizeof(T));
-    tensorData = tmp;
-}
-
-template<typename T>
-void PermuteTensorNhwcToNchw(armnn::TensorInfo& tensorInfo, std::vector<T>& tensorData)
-{
-    const armnn::PermutationVector nhwcToNchw = { 0, 2, 3, 1 };
-
-    tensorInfo = armnnUtils::Permuted(tensorInfo, nhwcToNchw);
-
-    std::vector<T> tmp(tensorData.size());
-    armnnUtils::Permute(tensorInfo.GetShape(), nhwcToNchw, tensorData.data(), tmp.data(), sizeof(T));
-
-    tensorData = tmp;
-}
-
-template<typename T>
-void PermuteTensorNdhwcToNcdhw(armnn::TensorInfo& tensorInfo, std::vector<T>& tensorData)
-{
-    const armnn::PermutationVector ndhwcToNcdhw = { 0, 2, 3, 4, 1 };
-
-    tensorInfo = armnnUtils::Permuted(tensorInfo, ndhwcToNcdhw);
-
-    std::vector<T> tmp(tensorData.size());
-    armnnUtils::Permute(tensorInfo.GetShape(), ndhwcToNcdhw, tensorData.data(), tmp.data(), sizeof(T));
-    tensorData = tmp;
-}
-
-template<typename T>
-void PermuteTensorNcdhwToNdhwc(armnn::TensorInfo& tensorInfo, std::vector<T>& tensorData)
-{
-    const armnn::PermutationVector ncdhwToNdhwc = { 0, 4, 1, 2, 3 };
-
-    tensorInfo = armnnUtils::Permuted(tensorInfo, ncdhwToNdhwc);
-
-    std::vector<T> tmp(tensorData.size());
-    armnnUtils::Permute(tensorInfo.GetShape(), ncdhwToNdhwc, tensorData.data(), tmp.data(), sizeof(T));
-    tensorData = tmp;
-}
+#pragma message("backendsCommon/test/DataLayoutUtils.hpp  has been deprecated, it is due for removal " \
+                "in 22.08 release. Please use public interface include/armnnTestUtils/DataLayoutUtils.hpp")