diff options
Diffstat (limited to 'src/backends')
185 files changed, 394 insertions, 804 deletions
diff --git a/src/backends/aclCommon/test/CMakeLists.txt b/src/backends/aclCommon/test/CMakeLists.txt index 756ef4aa28..7eb232a643 100644 --- a/src/backends/aclCommon/test/CMakeLists.txt +++ b/src/backends/aclCommon/test/CMakeLists.txt @@ -13,6 +13,7 @@ list(APPEND armnnAclCommonUnitTests_sources add_library(armnnAclCommonUnitTests OBJECT ${armnnAclCommonUnitTests_sources}) target_include_directories(armnnAclCommonUnitTests PRIVATE ${PROJECT_SOURCE_DIR}/src/armnn) target_include_directories(armnnAclCommonUnitTests PRIVATE ${PROJECT_SOURCE_DIR}/src/armnnUtils) +target_include_directories(armnnAclCommonUnitTests PRIVATE ${PROJECT_SOURCE_DIR}/src/armnnTestUtils) target_include_directories(armnnAclCommonUnitTests PRIVATE ${PROJECT_SOURCE_DIR}/src/backends) target_include_directories(armnnAclCommonUnitTests PRIVATE ${PROJECT_SOURCE_DIR}/src/profiling) target_include_directories(armnnAclCommonUnitTests PRIVATE ${PROJECT_SOURCE_DIR}/profiling/common/include) diff --git a/src/backends/aclCommon/test/CreateWorkloadClNeon.hpp b/src/backends/aclCommon/test/CreateWorkloadClNeon.hpp index bdae9988ed..6a0d5cf766 100644 --- a/src/backends/aclCommon/test/CreateWorkloadClNeon.hpp +++ b/src/backends/aclCommon/test/CreateWorkloadClNeon.hpp @@ -4,8 +4,8 @@ // #pragma once -#include <test/CreateWorkload.hpp> -#include <test/PredicateResult.hpp> +#include <CreateWorkload.hpp> +#include <armnnTestUtils/PredicateResult.hpp> #include <armnn/utility/PolymorphicDowncast.hpp> #include <backendsCommon/MemCopyWorkload.hpp> #include <reference/RefWorkloadFactory.hpp> diff --git a/src/backends/aclCommon/test/MemCopyTestImpl.hpp b/src/backends/aclCommon/test/MemCopyTestImpl.hpp index 91ba4eae17..d943cfd8c0 100644 --- a/src/backends/aclCommon/test/MemCopyTestImpl.hpp +++ b/src/backends/aclCommon/test/MemCopyTestImpl.hpp @@ -5,15 +5,14 @@ #pragma once #include <ResolveType.hpp> - #include <armnn/backends/IBackendInternal.hpp> -#include <backendsCommon/test/LayerTests.hpp> -#include <backendsCommon/test/TensorCopyUtils.hpp> -#include <backendsCommon/test/WorkloadFactoryHelper.hpp> +#include <test/TensorHelpers.hpp> #include <backendsCommon/test/WorkloadTestUtils.hpp> -#include <test/TensorHelpers.hpp> +#include <armnnTestUtils/LayerTestResult.hpp> +#include <armnnTestUtils/TensorCopyUtils.hpp> +#include <backendsCommon/test/WorkloadFactoryHelper.hpp> namespace { diff --git a/src/backends/backendsCommon/WorkloadFactory.cpp b/src/backends/backendsCommon/WorkloadFactory.cpp index ef2a34889e..93932a83a1 100644 --- a/src/backends/backendsCommon/WorkloadFactory.cpp +++ b/src/backends/backendsCommon/WorkloadFactory.cpp @@ -8,6 +8,7 @@ #include <armnn/Types.hpp> #include <armnn/LayerSupport.hpp> +#include <armnn/backends/IBackendInternal.hpp> #include <armnn/backends/ILayerSupport.hpp> #include <armnn/BackendHelper.hpp> #include <armnn/BackendRegistry.hpp> @@ -17,7 +18,7 @@ #include <backendsCommon/WorkloadFactory.hpp> #include <backendsCommon/TensorHandle.hpp> -#include <backendsCommon/test/WorkloadTestUtils.hpp> +//#include <WorkloadTestUtils.hpp> #include <sstream> @@ -45,6 +46,31 @@ const TensorInfo OverrideDataType(const TensorInfo& info, Optional<DataType> typ } // anonymous namespace +inline armnn::Optional<armnn::DataType> GetBiasTypeFromWeightsType(armnn::Optional<armnn::DataType> weightsType) +{ + if (!weightsType) + { + return weightsType; + } + + switch(weightsType.value()) + { + case armnn::DataType::BFloat16: + case armnn::DataType::Float16: + case armnn::DataType::Float32: + return weightsType; + case armnn::DataType::QAsymmS8: + case armnn::DataType::QAsymmU8: + case armnn::DataType::QSymmS8: + case armnn::DataType::QSymmS16: + return armnn::DataType::Signed32; + default: + ARMNN_ASSERT_MSG(false, "GetBiasTypeFromWeightsType(): Unsupported data type."); + } + return armnn::EmptyOptional(); +} + + bool IWorkloadFactory::IsLayerConfigurationSupported(const BackendId& backendId, const IConnectableLayer& connectableLayer, Optional<DataType> dataType, diff --git a/src/backends/backendsCommon/common.mk b/src/backends/backendsCommon/common.mk index 206faf5020..8f97669d0a 100644 --- a/src/backends/backendsCommon/common.mk +++ b/src/backends/backendsCommon/common.mk @@ -35,7 +35,6 @@ COMMON_SOURCES := \ # up by the Android.mk file in the root of ArmNN COMMON_TEST_SOURCES := \ - test/CommonTestUtils.cpp \ test/CustomMemoryOptimizerStrategyTests.cpp \ test/InstanceNormalizationEndToEndTestImpl.cpp \ test/JsonPrinterTestImpl.cpp \ @@ -43,7 +42,6 @@ COMMON_TEST_SOURCES := \ test/QLstmEndToEndTestImpl.cpp \ test/QuantizedLstmEndToEndTestImpl.cpp \ test/SpaceToDepthEndToEndTestImpl.cpp \ - test/TensorCopyUtils.cpp \ test/layerTests/AbsTestImpl.cpp \ test/layerTests/ActivationTestImpl.cpp \ test/layerTests/AdditionTestImpl.cpp \ diff --git a/src/backends/backendsCommon/test/ActivationEndToEndTestImpl.hpp b/src/backends/backendsCommon/test/ActivationEndToEndTestImpl.hpp index f7d4596450..10e8363c7f 100644 --- a/src/backends/backendsCommon/test/ActivationEndToEndTestImpl.hpp +++ b/src/backends/backendsCommon/test/ActivationEndToEndTestImpl.hpp @@ -8,7 +8,9 @@ #include <armnn/INetwork.hpp> #include <armnn/TypesUtils.hpp> -#include <backendsCommon/test/CommonTestUtils.hpp> + +#include <CommonTestUtils.hpp> + #include <ResolveType.hpp> namespace diff --git a/src/backends/backendsCommon/test/ActivationFixture.hpp b/src/backends/backendsCommon/test/ActivationFixture.hpp index c61f3f097e..caa67aca37 100644 --- a/src/backends/backendsCommon/test/ActivationFixture.hpp +++ b/src/backends/backendsCommon/test/ActivationFixture.hpp @@ -4,12 +4,12 @@ // #pragma once -#include "TensorCopyUtils.hpp" -#include "WorkloadTestUtils.hpp" +#include <armnnTestUtils/TensorCopyUtils.hpp> +#include <WorkloadTestUtils.hpp> #include <armnn/utility/NumericCast.hpp> -#include <test/TensorHelpers.hpp> +#include <TensorHelpers.hpp> struct ActivationFixture { diff --git a/src/backends/backendsCommon/test/ArgMinMaxEndToEndTestImpl.hpp b/src/backends/backendsCommon/test/ArgMinMaxEndToEndTestImpl.hpp index 041f9f8f17..1b653858f8 100644 --- a/src/backends/backendsCommon/test/ArgMinMaxEndToEndTestImpl.hpp +++ b/src/backends/backendsCommon/test/ArgMinMaxEndToEndTestImpl.hpp @@ -5,7 +5,7 @@ #pragma once -#include "CommonTestUtils.hpp" +#include <CommonTestUtils.hpp> #include <QuantizeHelper.hpp> #include <ResolveType.hpp> diff --git a/src/backends/backendsCommon/test/BackendProfilingTests.cpp b/src/backends/backendsCommon/test/BackendProfilingTests.cpp index 62c06fe6d3..b40964c89a 100644 --- a/src/backends/backendsCommon/test/BackendProfilingTests.cpp +++ b/src/backends/backendsCommon/test/BackendProfilingTests.cpp @@ -14,7 +14,7 @@ #include "ProfilingUtils.hpp" #include "RequestCounterDirectoryCommandHandler.hpp" -#include <test/TestUtils.hpp> +#include <TestUtils.hpp> #include <armnn/utility/IgnoreUnused.hpp> #include <armnn/BackendId.hpp> diff --git a/src/backends/backendsCommon/test/BatchToSpaceNdEndToEndTestImpl.hpp b/src/backends/backendsCommon/test/BatchToSpaceNdEndToEndTestImpl.hpp index 859694ceb2..87fccd8ca8 100644 --- a/src/backends/backendsCommon/test/BatchToSpaceNdEndToEndTestImpl.hpp +++ b/src/backends/backendsCommon/test/BatchToSpaceNdEndToEndTestImpl.hpp @@ -8,7 +8,7 @@ #include <armnn/INetwork.hpp> -#include <backendsCommon/test/CommonTestUtils.hpp> +#include <CommonTestUtils.hpp> #include <doctest/doctest.h> diff --git a/src/backends/backendsCommon/test/CMakeLists.txt b/src/backends/backendsCommon/test/CMakeLists.txt index 958f4841fb..bb85f7e22e 100644 --- a/src/backends/backendsCommon/test/CMakeLists.txt +++ b/src/backends/backendsCommon/test/CMakeLists.txt @@ -10,12 +10,15 @@ list(APPEND armnnBackendsCommonUnitTests_sources BackendIdTests.cpp BackendProfilingTests.cpp BackendRegistryTests.cpp + CommonTestUtils.hpp ChannelShuffleEndToEndTestImpl.hpp ComparisonEndToEndTestImpl.hpp CompatibilityTests.cpp ConcatEndToEndTestImpl.hpp Convolution3dEndToEndTestImpl.hpp CustomMemoryOptimizerStrategyTests.cpp + DataLayoutUtils.hpp + DataTypeUtils.hpp DefaultAsyncExecuteTest.cpp DepthToSpaceEndToEndTestImpl.hpp DequantizeEndToEndTestImpl.hpp @@ -54,7 +57,9 @@ list(APPEND armnnBackendsCommonUnitTests_sources SpaceToDepthEndToEndTestImpl.hpp SplitterEndToEndTestImpl.hpp StridedSliceAsyncEndToEndTest.hpp + TensorCopyUtils.hpp WorkloadFactoryHelper.hpp + WorkloadTestUtils.hpp layerTests/AbsTestImpl.cpp layerTests/AbsTestImpl.hpp layerTests/ActivationTestImpl.cpp @@ -116,6 +121,7 @@ list(APPEND armnnBackendsCommonUnitTests_sources layerTests/InstanceNormalizationTestImpl.hpp layerTests/L2NormalizationTestImpl.cpp layerTests/L2NormalizationTestImpl.hpp + layerTests/LayerTestResult.hpp layerTests/LogTestImpl.cpp layerTests/LogTestImpl.hpp layerTests/LogicalTestImpl.cpp @@ -200,6 +206,7 @@ endif() add_library(armnnBackendsCommonUnitTests OBJECT ${armnnBackendsCommonUnitTests_sources}) target_include_directories(armnnBackendsCommonUnitTests PRIVATE ${PROJECT_SOURCE_DIR}/src/armnn) target_include_directories(armnnBackendsCommonUnitTests PRIVATE ${PROJECT_SOURCE_DIR}/src/armnnUtils) +target_include_directories(armnnBackendsCommonUnitTests PRIVATE ${PROJECT_SOURCE_DIR}/src/armnnTestUtils) target_include_directories(armnnBackendsCommonUnitTests PRIVATE ${PROJECT_SOURCE_DIR}/src/backends) target_include_directories(armnnBackendsCommonUnitTests PRIVATE ${PROJECT_SOURCE_DIR}/src/profiling) target_include_directories(armnnBackendsCommonUnitTests PRIVATE ${PROJECT_SOURCE_DIR}/profiling/common/include) diff --git a/src/backends/backendsCommon/test/ChannelShuffleEndToEndTestImpl.hpp b/src/backends/backendsCommon/test/ChannelShuffleEndToEndTestImpl.hpp index 7d46be7bcb..27907f1df3 100644 --- a/src/backends/backendsCommon/test/ChannelShuffleEndToEndTestImpl.hpp +++ b/src/backends/backendsCommon/test/ChannelShuffleEndToEndTestImpl.hpp @@ -5,7 +5,7 @@ #pragma once -#include "CommonTestUtils.hpp" +#include <CommonTestUtils.hpp> #include <armnn/INetwork.hpp> #include <ResolveType.hpp> diff --git a/src/backends/backendsCommon/test/CommonTestUtils.cpp b/src/backends/backendsCommon/test/CommonTestUtils.cpp deleted file mode 100644 index 287c71ebc7..0000000000 --- a/src/backends/backendsCommon/test/CommonTestUtils.cpp +++ /dev/null @@ -1,70 +0,0 @@ -// -// Copyright © 2017 Arm Ltd. All rights reserved. -// SPDX-License-Identifier: MIT -// - -#include "CommonTestUtils.hpp" - -#include <armnn/backends/IBackendInternal.hpp> - -using namespace armnn; - -SubgraphView::InputSlots CreateInputsFrom(const std::vector<Layer*>& layers) -{ - SubgraphView::InputSlots result; - for (auto&& layer : layers) - { - for (auto&& it = layer->BeginInputSlots(); it != layer->EndInputSlots(); ++it) - { - result.push_back(&(*it)); - } - } - return result; -} - -SubgraphView::OutputSlots CreateOutputsFrom(const std::vector<Layer*>& layers) -{ - SubgraphView::OutputSlots result; - for (auto && layer : layers) - { - for (auto&& it = layer->BeginOutputSlots(); it != layer->EndOutputSlots(); ++it) - { - result.push_back(&(*it)); - } - } - return result; -} - -SubgraphView::SubgraphViewPtr CreateSubgraphViewFrom(SubgraphView::InputSlots&& inputs, - SubgraphView::OutputSlots&& outputs, - SubgraphView::Layers&& layers) -{ - return std::make_unique<SubgraphView>(std::move(inputs), std::move(outputs), std::move(layers)); -} - -armnn::IBackendInternalUniquePtr CreateBackendObject(const armnn::BackendId& backendId) -{ - auto& backendRegistry = BackendRegistryInstance(); - auto backendFactory = backendRegistry.GetFactory(backendId); - auto backendObjPtr = backendFactory(); - - return backendObjPtr; -} - -armnn::TensorShape MakeTensorShape(unsigned int batches, - unsigned int channels, - unsigned int height, - unsigned int width, - armnn::DataLayout layout) -{ - using namespace armnn; - switch (layout) - { - case DataLayout::NCHW: - return TensorShape{ batches, channels, height, width }; - case DataLayout::NHWC: - return TensorShape{ batches, height, width, channels }; - default: - throw InvalidArgumentException(std::string("Unsupported data layout: ") + GetDataLayoutName(layout)); - } -} diff --git a/src/backends/backendsCommon/test/CommonTestUtils.hpp b/src/backends/backendsCommon/test/CommonTestUtils.hpp index 07523d73c4..72e3860ecb 100644 --- a/src/backends/backendsCommon/test/CommonTestUtils.hpp +++ b/src/backends/backendsCommon/test/CommonTestUtils.hpp @@ -1,119 +1,12 @@ // -// Copyright © 2017 Arm Ltd. All rights reserved. +// Copyright © 2017 Arm Ltd and Contributors. All rights reserved. // SPDX-License-Identifier: MIT // -#pragma once +// This file is deprecated and will be removed soon. +// Please use the new header in armnnTestUtils instead. +// This will use the new armnnTestUtils header. +#include "../../../armnnTestUtils/CommonTestUtils.hpp" -#include <Graph.hpp> -#include <SubgraphView.hpp> -#include <SubgraphViewSelector.hpp> -#include <ResolveType.hpp> - -#include <armnn/BackendRegistry.hpp> - -#include <armnn/Types.hpp> -#include <backendsCommon/TensorHandle.hpp> - -#include <test/TestUtils.hpp> - -#include <algorithm> -#include <random> -#include <vector> - -// Checks that two collections have the exact same contents (in any order) -// The given collections do not have to contain duplicates -// Cannot use std::sort here because std lists have their own std::list::sort method -template <typename CollectionType> -bool AreEqual(const CollectionType& lhs, const CollectionType& rhs) -{ - if (lhs.size() != rhs.size()) - { - return false; - } - - auto lhs_it = std::find_if(lhs.begin(), lhs.end(), [&rhs](auto& item) - { - return std::find(rhs.begin(), rhs.end(), item) == rhs.end(); - }); - - return lhs_it == lhs.end(); -} - -// Checks that the given collection contains the specified item -template <typename CollectionType> -bool Contains(const CollectionType& collection, const typename CollectionType::value_type& item) -{ - return std::find(collection.begin(), collection.end(), item) != collection.end(); -} - -// Checks that the given map contains the specified key -template <typename MapType> -bool Contains(const MapType& map, const typename MapType::key_type& key) -{ - return map.find(key) != map.end(); -} - -// Utility template for comparing tensor elements -template<armnn::DataType ArmnnType, typename T = armnn::ResolveType<ArmnnType>> -inline bool Compare(T a, T b, float tolerance = 0.000001f) -{ - if (ArmnnType == armnn::DataType::Boolean) - { - // NOTE: Boolean is represented as uint8_t (with zero equals - // false and everything else equals true), therefore values - // need to be casted to bool before comparing them - return static_cast<bool>(a) == static_cast<bool>(b); - } - - // NOTE: All other types can be cast to float and compared with - // a certain level of tolerance - return std::fabs(static_cast<float>(a) - static_cast<float>(b)) <= tolerance; -} - -template <typename ConvolutionLayer> -void SetWeightAndBias(ConvolutionLayer* layer, const armnn::TensorInfo& weightInfo, const armnn::TensorInfo& biasInfo) -{ - layer->m_Weight = std::make_unique<armnn::ScopedTensorHandle>(weightInfo); - layer->m_Bias = std::make_unique<armnn::ScopedTensorHandle>(biasInfo); - - layer->m_Weight->Allocate(); - layer->m_Bias->Allocate(); -} - -armnn::SubgraphView::InputSlots CreateInputsFrom(const std::vector<armnn::Layer*>& layers); - -armnn::SubgraphView::OutputSlots CreateOutputsFrom(const std::vector<armnn::Layer*>& layers); - -armnn::SubgraphView::SubgraphViewPtr CreateSubgraphViewFrom(armnn::SubgraphView::InputSlots&& inputs, - armnn::SubgraphView::OutputSlots&& outputs, - armnn::SubgraphView::Layers&& layers); - -armnn::IBackendInternalUniquePtr CreateBackendObject(const armnn::BackendId& backendId); - -armnn::TensorShape MakeTensorShape(unsigned int batches, - unsigned int channels, - unsigned int height, - unsigned int width, - armnn::DataLayout layout); - -template<typename DataType> -static std::vector<DataType> GenerateRandomData(size_t size) -{ - constexpr bool isIntegerType = std::is_integral<DataType>::value; - using Distribution = - typename std::conditional<isIntegerType, - std::uniform_int_distribution<DataType>, - std::uniform_real_distribution<DataType>>::type; - - static constexpr DataType lowerLimit = std::numeric_limits<DataType>::min(); - static constexpr DataType upperLimit = std::numeric_limits<DataType>::max(); - - static Distribution distribution(lowerLimit, upperLimit); - static std::default_random_engine generator; - - std::vector<DataType> randomData(size); - generate(randomData.begin(), randomData.end(), []() { return distribution(generator); }); - - return randomData; -} +#pragma message("backendsCommon/test/CommonTestUtils.hpp has been deprecated, it is due for removal in 22.08 release." \ + " Please use from armnnTestUtils library, /src/armnnTestUtils/CommonTestUtils.hpp)
\ No newline at end of file diff --git a/src/backends/backendsCommon/test/ComparisonEndToEndTestImpl.hpp b/src/backends/backendsCommon/test/ComparisonEndToEndTestImpl.hpp index e274163c6f..4bdf3f8bee 100644 --- a/src/backends/backendsCommon/test/ComparisonEndToEndTestImpl.hpp +++ b/src/backends/backendsCommon/test/ComparisonEndToEndTestImpl.hpp @@ -4,7 +4,7 @@ // #pragma once -#include "CommonTestUtils.hpp" +#include <CommonTestUtils.hpp> #include <ResolveType.hpp> diff --git a/src/backends/backendsCommon/test/ConcatEndToEndTestImpl.hpp b/src/backends/backendsCommon/test/ConcatEndToEndTestImpl.hpp index 62f0e4cd36..c8d20dace0 100644 --- a/src/backends/backendsCommon/test/ConcatEndToEndTestImpl.hpp +++ b/src/backends/backendsCommon/test/ConcatEndToEndTestImpl.hpp @@ -4,7 +4,7 @@ // #pragma once -#include "CommonTestUtils.hpp" +#include <CommonTestUtils.hpp> #include <ResolveType.hpp> diff --git a/src/backends/backendsCommon/test/Convolution3dEndToEndTestImpl.hpp b/src/backends/backendsCommon/test/Convolution3dEndToEndTestImpl.hpp index b1f685b4cd..fab5670a4f 100644 --- a/src/backends/backendsCommon/test/Convolution3dEndToEndTestImpl.hpp +++ b/src/backends/backendsCommon/test/Convolution3dEndToEndTestImpl.hpp @@ -9,8 +9,8 @@ #include <ResolveType.hpp> -#include <backendsCommon/test/CommonTestUtils.hpp> -#include <backendsCommon/test/DataLayoutUtils.hpp> +#include <CommonTestUtils.hpp> +#include <armnnTestUtils/DataLayoutUtils.hpp> #include <map> #include <vector> 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") diff --git a/src/backends/backendsCommon/test/DataTypeUtils.hpp b/src/backends/backendsCommon/test/DataTypeUtils.hpp index cf97c8186c..03ee1d231a 100644 --- a/src/backends/backendsCommon/test/DataTypeUtils.hpp +++ b/src/backends/backendsCommon/test/DataTypeUtils.hpp @@ -1,45 +1,9 @@ // -// Copyright © 2017 Arm Ltd. All rights reserved. +// Copyright © 2017 Arm Ltd and Contributors. All rights reserved. // SPDX-License-Identifier: MIT // -#pragma once +#include "../../armnnTestUtils/DataTypeUtils.hpp" -#include <ResolveType.hpp> - - -#include <reference/workloads/Encoders.hpp> - -#include <vector> - -// Utility tenmplate to convert a collection of values to the correct type -template <armnn::DataType ArmnnType, typename T = armnn::ResolveType<ArmnnType>> -std::vector<T> ConvertToDataType(const std::vector<float>& input, - const armnn::TensorInfo& inputTensorInfo) -{ - std::vector<T> output(input.size()); - auto outputTensorInfo = inputTensorInfo; - outputTensorInfo.SetDataType(ArmnnType); - - std::unique_ptr<armnn::Encoder<float>> pOutputEncoder = armnn::MakeEncoder<float>(outputTensorInfo, output.data()); - armnn::Encoder<float>& rOutputEncoder = *pOutputEncoder; - - for (auto it = input.begin(); it != input.end(); ++it) - { - rOutputEncoder.Set(*it); - ++rOutputEncoder; - } - return output; -} - -// Utility tenmplate to convert a single value to the correct type -template <typename T> -T ConvertToDataType(const float& value, - const armnn::TensorInfo& tensorInfo) -{ - std::vector<T> output(1); - std::unique_ptr<armnn::Encoder<float>> pEncoder = armnn::MakeEncoder<float>(tensorInfo, output.data()); - armnn::Encoder<float>& rEncoder = *pEncoder; - rEncoder.Set(value); - return output[0]; -} +#pragma message("backendsCommon/test/DataTypeUtils.hpp has been deprecated, it is due for removal in 22.08 release." \ + " Please use from armnnTestUtils library, /src/armnnTestUtils/DataTypeUtils.hpp) diff --git a/src/backends/backendsCommon/test/DepthToSpaceEndToEndTestImpl.hpp b/src/backends/backendsCommon/test/DepthToSpaceEndToEndTestImpl.hpp index b64e618075..863d66caeb 100644 --- a/src/backends/backendsCommon/test/DepthToSpaceEndToEndTestImpl.hpp +++ b/src/backends/backendsCommon/test/DepthToSpaceEndToEndTestImpl.hpp @@ -10,7 +10,7 @@ #include <QuantizeHelper.hpp> -#include <backendsCommon/test/DataLayoutUtils.hpp> +#include <armnnTestUtils/DataLayoutUtils.hpp> namespace { diff --git a/src/backends/backendsCommon/test/DequantizeEndToEndTestImpl.hpp b/src/backends/backendsCommon/test/DequantizeEndToEndTestImpl.hpp index fff4c4fab9..439c083673 100644 --- a/src/backends/backendsCommon/test/DequantizeEndToEndTestImpl.hpp +++ b/src/backends/backendsCommon/test/DequantizeEndToEndTestImpl.hpp @@ -5,7 +5,7 @@ #pragma once -#include "CommonTestUtils.hpp" +#include <CommonTestUtils.hpp> #include <armnn/INetwork.hpp> #include <ResolveType.hpp> diff --git a/src/backends/backendsCommon/test/DetectionPostProcessEndToEndTestImpl.hpp b/src/backends/backendsCommon/test/DetectionPostProcessEndToEndTestImpl.hpp index c4488865a1..0f6d2c07dc 100644 --- a/src/backends/backendsCommon/test/DetectionPostProcessEndToEndTestImpl.hpp +++ b/src/backends/backendsCommon/test/DetectionPostProcessEndToEndTestImpl.hpp @@ -5,7 +5,7 @@ #pragma once -#include "CommonTestUtils.hpp" +#include <CommonTestUtils.hpp> #include <armnn/INetwork.hpp> #include <ResolveType.hpp> diff --git a/src/backends/backendsCommon/test/DynamicBackendTests.cpp b/src/backends/backendsCommon/test/DynamicBackendTests.cpp index 669ce6020e..72688adcbd 100644 --- a/src/backends/backendsCommon/test/DynamicBackendTests.cpp +++ b/src/backends/backendsCommon/test/DynamicBackendTests.cpp @@ -5,7 +5,7 @@ #include "DynamicBackendTests.hpp" -#include <test/UnitTests.hpp> +#include <UnitTests.hpp> #include <doctest/doctest.h> diff --git a/src/backends/backendsCommon/test/ElementwiseUnaryEndToEndTestImpl.hpp b/src/backends/backendsCommon/test/ElementwiseUnaryEndToEndTestImpl.hpp index 635dc96720..3f530ccb15 100644 --- a/src/backends/backendsCommon/test/ElementwiseUnaryEndToEndTestImpl.hpp +++ b/src/backends/backendsCommon/test/ElementwiseUnaryEndToEndTestImpl.hpp @@ -4,7 +4,7 @@ // #pragma once -#include "CommonTestUtils.hpp" +#include <CommonTestUtils.hpp> #include <ResolveType.hpp> diff --git a/src/backends/backendsCommon/test/EndToEndTestImpl.hpp b/src/backends/backendsCommon/test/EndToEndTestImpl.hpp index 269a46077e..d326631bf3 100644 --- a/src/backends/backendsCommon/test/EndToEndTestImpl.hpp +++ b/src/backends/backendsCommon/test/EndToEndTestImpl.hpp @@ -4,7 +4,7 @@ // #pragma once -#include "CommonTestUtils.hpp" +#include <CommonTestUtils.hpp> #include <armnn/Descriptors.hpp> #include <armnn/INetwork.hpp> diff --git a/src/backends/backendsCommon/test/FillEndToEndTestImpl.hpp b/src/backends/backendsCommon/test/FillEndToEndTestImpl.hpp index 27e5aa0229..53722e1acd 100644 --- a/src/backends/backendsCommon/test/FillEndToEndTestImpl.hpp +++ b/src/backends/backendsCommon/test/FillEndToEndTestImpl.hpp @@ -5,7 +5,7 @@ #pragma once -#include "CommonTestUtils.hpp" +#include <CommonTestUtils.hpp> #include <armnn/INetwork.hpp> #include <armnn/TypesUtils.hpp> diff --git a/src/backends/backendsCommon/test/FullyConnectedEndToEndTestImpl.hpp b/src/backends/backendsCommon/test/FullyConnectedEndToEndTestImpl.hpp index 878b6afeee..1076aa6669 100644 --- a/src/backends/backendsCommon/test/FullyConnectedEndToEndTestImpl.hpp +++ b/src/backends/backendsCommon/test/FullyConnectedEndToEndTestImpl.hpp @@ -4,7 +4,7 @@ // #pragma once -#include "CommonTestUtils.hpp" +#include <CommonTestUtils.hpp> #include <ResolveType.hpp> diff --git a/src/backends/backendsCommon/test/GatherEndToEndTestImpl.hpp b/src/backends/backendsCommon/test/GatherEndToEndTestImpl.hpp index 4c67ec2c8e..cf4294780d 100644 --- a/src/backends/backendsCommon/test/GatherEndToEndTestImpl.hpp +++ b/src/backends/backendsCommon/test/GatherEndToEndTestImpl.hpp @@ -5,7 +5,7 @@ #pragma once -#include "CommonTestUtils.hpp" +#include <CommonTestUtils.hpp> #include <armnn/INetwork.hpp> #include <ResolveType.hpp> diff --git a/src/backends/backendsCommon/test/InstanceNormalizationEndToEndTestImpl.cpp b/src/backends/backendsCommon/test/InstanceNormalizationEndToEndTestImpl.cpp index e715e6b187..846aa76298 100644 --- a/src/backends/backendsCommon/test/InstanceNormalizationEndToEndTestImpl.cpp +++ b/src/backends/backendsCommon/test/InstanceNormalizationEndToEndTestImpl.cpp @@ -12,9 +12,9 @@ #include <armnn/INetwork.hpp> -#include <backendsCommon/test/DataLayoutUtils.hpp> +#include <armnnTestUtils/DataLayoutUtils.hpp> -#include <test/TestUtils.hpp> +#include <TestUtils.hpp> #include <doctest/doctest.h> diff --git a/src/backends/backendsCommon/test/LayerReleaseConstantDataTest.cpp b/src/backends/backendsCommon/test/LayerReleaseConstantDataTest.cpp index 579be513f3..f55a3c31ce 100644 --- a/src/backends/backendsCommon/test/LayerReleaseConstantDataTest.cpp +++ b/src/backends/backendsCommon/test/LayerReleaseConstantDataTest.cpp @@ -3,7 +3,7 @@ // SPDX-License-Identifier: MIT // -#include "CommonTestUtils.hpp" +#include <CommonTestUtils.hpp> #include <Graph.hpp> diff --git a/src/backends/backendsCommon/test/LogSoftmaxEndToEndTestImpl.cpp b/src/backends/backendsCommon/test/LogSoftmaxEndToEndTestImpl.cpp index 181ecd912f..9ffa2a672c 100644 --- a/src/backends/backendsCommon/test/LogSoftmaxEndToEndTestImpl.cpp +++ b/src/backends/backendsCommon/test/LogSoftmaxEndToEndTestImpl.cpp @@ -8,7 +8,7 @@ #include <armnn/INetwork.hpp> -#include <test/TestUtils.hpp> +#include <TestUtils.hpp> #include <doctest/doctest.h> diff --git a/src/backends/backendsCommon/test/OptimizationViewsTests.cpp b/src/backends/backendsCommon/test/OptimizationViewsTests.cpp index 246cb509c3..bbae229927 100644 --- a/src/backends/backendsCommon/test/OptimizationViewsTests.cpp +++ b/src/backends/backendsCommon/test/OptimizationViewsTests.cpp @@ -4,7 +4,7 @@ // -#include "CommonTestUtils.hpp" +#include <CommonTestUtils.hpp> #include "MockBackend.hpp" #include <armnn/backends/OptimizationViews.hpp> diff --git a/src/backends/backendsCommon/test/OptimizeSubgraphViewTests.cpp b/src/backends/backendsCommon/test/OptimizeSubgraphViewTests.cpp index 6c76da67b3..4dd6bc955d 100644 --- a/src/backends/backendsCommon/test/OptimizeSubgraphViewTests.cpp +++ b/src/backends/backendsCommon/test/OptimizeSubgraphViewTests.cpp @@ -3,7 +3,7 @@ // SPDX-License-Identifier: MIT // -#include "CommonTestUtils.hpp" +#include <CommonTestUtils.hpp> #include "MockBackend.hpp" #include "MockBackendId.hpp" diff --git a/src/backends/backendsCommon/test/OptimizedNetworkTests.cpp b/src/backends/backendsCommon/test/OptimizedNetworkTests.cpp index 4b932c78f8..cc7974130d 100644 --- a/src/backends/backendsCommon/test/OptimizedNetworkTests.cpp +++ b/src/backends/backendsCommon/test/OptimizedNetworkTests.cpp @@ -3,7 +3,7 @@ // SPDX-License-Identifier: MIT // -#include "CommonTestUtils.hpp" +#include <CommonTestUtils.hpp> #include <Graph.hpp> #include <Network.hpp> diff --git a/src/backends/backendsCommon/test/PreluEndToEndTestImpl.hpp b/src/backends/backendsCommon/test/PreluEndToEndTestImpl.hpp index c31d084b0e..b361511f6e 100644 --- a/src/backends/backendsCommon/test/PreluEndToEndTestImpl.hpp +++ b/src/backends/backendsCommon/test/PreluEndToEndTestImpl.hpp @@ -8,7 +8,7 @@ #include <armnn/INetwork.hpp> -#include <backendsCommon/test/CommonTestUtils.hpp> +#include <CommonTestUtils.hpp> #include <doctest/doctest.h> diff --git a/src/backends/backendsCommon/test/QLstmEndToEndTestImpl.cpp b/src/backends/backendsCommon/test/QLstmEndToEndTestImpl.cpp index 7c87f358d6..a01f65ed49 100644 --- a/src/backends/backendsCommon/test/QLstmEndToEndTestImpl.cpp +++ b/src/backends/backendsCommon/test/QLstmEndToEndTestImpl.cpp @@ -5,7 +5,7 @@ #include "QLstmEndToEndTestImpl.hpp" -#include "CommonTestUtils.hpp" +#include <CommonTestUtils.hpp> #include "EndToEndTestImpl.hpp" #include <armnn/INetwork.hpp> diff --git a/src/backends/backendsCommon/test/QuantizedLstmEndToEndTestImpl.cpp b/src/backends/backendsCommon/test/QuantizedLstmEndToEndTestImpl.cpp index d481404f92..8a535d2b8d 100644 --- a/src/backends/backendsCommon/test/QuantizedLstmEndToEndTestImpl.cpp +++ b/src/backends/backendsCommon/test/QuantizedLstmEndToEndTestImpl.cpp @@ -5,7 +5,7 @@ #include "QuantizedLstmEndToEndTestImpl.hpp" -#include "CommonTestUtils.hpp" +#include <CommonTestUtils.hpp> #include "EndToEndTestImpl.hpp" #include <ResolveType.hpp> @@ -15,7 +15,7 @@ #include <armnn/utility/NumericCast.hpp> -#include <test/TensorHelpers.hpp> +#include <TensorHelpers.hpp> #include <doctest/doctest.h> diff --git a/src/backends/backendsCommon/test/RankEndToEndTestImpl.hpp b/src/backends/backendsCommon/test/RankEndToEndTestImpl.hpp index 5229c47331..9dcf705874 100644 --- a/src/backends/backendsCommon/test/RankEndToEndTestImpl.hpp +++ b/src/backends/backendsCommon/test/RankEndToEndTestImpl.hpp @@ -5,7 +5,7 @@ #pragma once -#include "CommonTestUtils.hpp" +#include <CommonTestUtils.hpp> #include <armnn/INetwork.hpp> #include <armnn/TypesUtils.hpp> diff --git a/src/backends/backendsCommon/test/ResizeEndToEndTestImpl.hpp b/src/backends/backendsCommon/test/ResizeEndToEndTestImpl.hpp index a56db44161..94d0a4debc 100644 --- a/src/backends/backendsCommon/test/ResizeEndToEndTestImpl.hpp +++ b/src/backends/backendsCommon/test/ResizeEndToEndTestImpl.hpp @@ -12,7 +12,7 @@ #include <QuantizeHelper.hpp> #include <ResolveType.hpp> -#include <backendsCommon/test/CommonTestUtils.hpp> +#include <CommonTestUtils.hpp> #include <map> #include <vector> diff --git a/src/backends/backendsCommon/test/SpaceToDepthEndToEndTestImpl.cpp b/src/backends/backendsCommon/test/SpaceToDepthEndToEndTestImpl.cpp index e3b016ee94..b868ba3f9c 100644 --- a/src/backends/backendsCommon/test/SpaceToDepthEndToEndTestImpl.cpp +++ b/src/backends/backendsCommon/test/SpaceToDepthEndToEndTestImpl.cpp @@ -12,9 +12,9 @@ #include <armnnUtils/Permute.hpp> #include <armnnUtils/DataLayoutIndexed.hpp> -#include <backendsCommon/test/DataLayoutUtils.hpp> +#include <armnnTestUtils/DataLayoutUtils.hpp> -#include <test/TestUtils.hpp> +#include <TestUtils.hpp> #include <doctest/doctest.h> diff --git a/src/backends/backendsCommon/test/SplitterEndToEndTestImpl.hpp b/src/backends/backendsCommon/test/SplitterEndToEndTestImpl.hpp index 3a2af6850c..b750a7a918 100644 --- a/src/backends/backendsCommon/test/SplitterEndToEndTestImpl.hpp +++ b/src/backends/backendsCommon/test/SplitterEndToEndTestImpl.hpp @@ -10,7 +10,7 @@ #include <armnn/utility/NumericCast.hpp> -#include <backendsCommon/test/CommonTestUtils.hpp> +#include <CommonTestUtils.hpp> #include <doctest/doctest.h> diff --git a/src/backends/backendsCommon/test/StridedSliceAsyncEndToEndTest.hpp b/src/backends/backendsCommon/test/StridedSliceAsyncEndToEndTest.hpp index 8ef5ecc203..e29782f890 100644 --- a/src/backends/backendsCommon/test/StridedSliceAsyncEndToEndTest.hpp +++ b/src/backends/backendsCommon/test/StridedSliceAsyncEndToEndTest.hpp @@ -13,7 +13,7 @@ #include <armnn/IAsyncExecutionCallback.hpp> #include <AsyncExecutionCallback.hpp> -#include <backendsCommon/test/CommonTestUtils.hpp> +#include <CommonTestUtils.hpp> #include <doctest/doctest.h> diff --git a/src/backends/backendsCommon/test/TensorCopyUtils.cpp b/src/backends/backendsCommon/test/TensorCopyUtils.cpp deleted file mode 100644 index ba7208cc40..0000000000 --- a/src/backends/backendsCommon/test/TensorCopyUtils.cpp +++ /dev/null @@ -1,23 +0,0 @@ -// -// Copyright © 2017 Arm Ltd. All rights reserved. -// SPDX-License-Identifier: MIT -// - -#include "TensorCopyUtils.hpp" -#include <Half.hpp> - -void CopyDataToITensorHandle(armnn::ITensorHandle* tensorHandle, const void* memory) -{ - tensorHandle->CopyInFrom(memory); -} - -void CopyDataFromITensorHandle(void* memory, const armnn::ITensorHandle* tensorHandle) -{ - tensorHandle->CopyOutTo(memory); -} - -void AllocateAndCopyDataToITensorHandle(armnn::ITensorHandle* tensorHandle, const void* memory) -{ - tensorHandle->Allocate(); - CopyDataToITensorHandle(tensorHandle, memory); -} diff --git a/src/backends/backendsCommon/test/TensorCopyUtils.hpp b/src/backends/backendsCommon/test/TensorCopyUtils.hpp index d3c8d9056b..e0aa7a0c3c 100644 --- a/src/backends/backendsCommon/test/TensorCopyUtils.hpp +++ b/src/backends/backendsCommon/test/TensorCopyUtils.hpp @@ -1,15 +1,9 @@ // -// Copyright © 2017 Arm Ltd. All rights reserved. +// Copyright © 2017 Arm Ltd and Contributors. All rights reserved. // SPDX-License-Identifier: MIT // -#pragma once -#include <armnn/Tensor.hpp> - -#include <armnn/backends/ITensorHandle.hpp> - -void CopyDataToITensorHandle(armnn::ITensorHandle* tensorHandle, const void* memory); - -void CopyDataFromITensorHandle(void* mem, const armnn::ITensorHandle* tensorHandle); - -void AllocateAndCopyDataToITensorHandle(armnn::ITensorHandle* tensorHandle, const void* memory);
\ No newline at end of file +// This file is deprecated and will be removed soon. +// Please use the new header in armnnTestUtils instead. +// This will use the new armnnTestUtils header. +#include <armnnTestUtils/TesnorCopyUtils.hpp>
\ No newline at end of file diff --git a/src/backends/backendsCommon/test/TransposeConvolution2dEndToEndTestImpl.hpp b/src/backends/backendsCommon/test/TransposeConvolution2dEndToEndTestImpl.hpp index 8f10869088..d1b6945d6f 100644 --- a/src/backends/backendsCommon/test/TransposeConvolution2dEndToEndTestImpl.hpp +++ b/src/backends/backendsCommon/test/TransposeConvolution2dEndToEndTestImpl.hpp @@ -12,7 +12,7 @@ #include <QuantizeHelper.hpp> #include <ResolveType.hpp> -#include <backendsCommon/test/CommonTestUtils.hpp> +#include <CommonTestUtils.hpp> #include <map> #include <vector> diff --git a/src/backends/backendsCommon/test/WorkloadDataValidation.cpp b/src/backends/backendsCommon/test/WorkloadDataValidation.cpp index a19d12f1cc..ee632ff41b 100644 --- a/src/backends/backendsCommon/test/WorkloadDataValidation.cpp +++ b/src/backends/backendsCommon/test/WorkloadDataValidation.cpp @@ -3,7 +3,7 @@ // SPDX-License-Identifier: MIT // -#include "WorkloadTestUtils.hpp" +#include <WorkloadTestUtils.hpp> #include <armnn/Exceptions.hpp> diff --git a/src/backends/backendsCommon/test/WorkloadTestUtils.hpp b/src/backends/backendsCommon/test/WorkloadTestUtils.hpp index 3173561a94..cb605af2d3 100644 --- a/src/backends/backendsCommon/test/WorkloadTestUtils.hpp +++ b/src/backends/backendsCommon/test/WorkloadTestUtils.hpp @@ -1,113 +1,9 @@ // -// Copyright © 2017 Arm Ltd. All rights reserved. +// Copyright © 2017 Arm Ltd and Contributors. All rights reserved. // SPDX-License-Identifier: MIT // -#pragma once -#include <armnn/Tensor.hpp> - -#include <armnn/backends/IBackendInternal.hpp> -#include <armnn/backends/IMemoryManager.hpp> -#include <backendsCommon/Workload.hpp> -#include <backendsCommon/WorkloadInfo.hpp> - -namespace armnn -{ -class ITensorHandle; -} // namespace armnn - -namespace -{ - -template <typename QueueDescriptor> -void AddInputToWorkload(QueueDescriptor& descriptor, - armnn::WorkloadInfo& info, - const armnn::TensorInfo& tensorInfo, - armnn::ITensorHandle* tensorHandle) -{ - descriptor.m_Inputs.push_back(tensorHandle); - info.m_InputTensorInfos.push_back(tensorInfo); -} - -template <typename QueueDescriptor> -void AddOutputToWorkload(QueueDescriptor& descriptor, - armnn::WorkloadInfo& info, - const armnn::TensorInfo& tensorInfo, - armnn::ITensorHandle* tensorHandle) -{ - descriptor.m_Outputs.push_back(tensorHandle); - info.m_OutputTensorInfos.push_back(tensorInfo); -} - -template <typename QueueDescriptor> -void SetWorkloadInput(QueueDescriptor& descriptor, - armnn::WorkloadInfo& info, - unsigned int index, - const armnn::TensorInfo& tensorInfo, - armnn::ITensorHandle* tensorHandle) -{ - descriptor.m_Inputs[index] = tensorHandle; - info.m_InputTensorInfos[index] = tensorInfo; -} - -template <typename QueueDescriptor> -void SetWorkloadOutput(QueueDescriptor& descriptor, - armnn::WorkloadInfo& info, - unsigned int index, - const armnn::TensorInfo& tensorInfo, - armnn::ITensorHandle* tensorHandle) -{ - descriptor.m_Outputs[index] = tensorHandle; - info.m_OutputTensorInfos[index] = tensorInfo; -} - -inline void ExecuteWorkload(armnn::IWorkload& workload, - const armnn::IBackendInternal::IMemoryManagerSharedPtr& memoryManager, - bool memoryManagementRequested = true) -{ - const bool manageMemory = memoryManager && memoryManagementRequested; - - // Acquire working memory (if needed) - if (manageMemory) - { - memoryManager->Acquire(); - } - - // Perform PostAllocationConfiguration - workload.PostAllocationConfigure(); - - // Execute the workload - workload.Execute(); - - // Release working memory (if needed) - if (manageMemory) - { - memoryManager->Release(); - } -} - -inline armnn::Optional<armnn::DataType> GetBiasTypeFromWeightsType(armnn::Optional<armnn::DataType> weightsType) -{ - if (!weightsType) - { - return weightsType; - } - - switch(weightsType.value()) - { - case armnn::DataType::BFloat16: - case armnn::DataType::Float16: - case armnn::DataType::Float32: - return weightsType; - case armnn::DataType::QAsymmS8: - case armnn::DataType::QAsymmU8: - case armnn::DataType::QSymmS8: - case armnn::DataType::QSymmS16: - return armnn::DataType::Signed32; - default: - ARMNN_ASSERT_MSG(false, "GetBiasTypeFromWeightsType(): Unsupported data type."); - } - return armnn::EmptyOptional(); -} - -} // anonymous namespace +// This file is deprecated and will be removed soon. +// Please use the new header in armnnTestUtils instead. +// This will use the new armnnTestUtils header. +#include "../../../armnnTestUtils/WorkloadTestUtils.hpp" diff --git a/src/backends/backendsCommon/test/layerTests/AbsTestImpl.hpp b/src/backends/backendsCommon/test/layerTests/AbsTestImpl.hpp index 44dd9cea9d..7f2d1be972 100644 --- a/src/backends/backendsCommon/test/layerTests/AbsTestImpl.hpp +++ b/src/backends/backendsCommon/test/layerTests/AbsTestImpl.hpp @@ -5,7 +5,7 @@ #pragma once -#include "LayerTestResult.hpp" +#include <armnnTestUtils/LayerTestResult.hpp> #include <ResolveType.hpp> diff --git a/src/backends/backendsCommon/test/layerTests/ActivationTestImpl.cpp b/src/backends/backendsCommon/test/layerTests/ActivationTestImpl.cpp index 54052073a9..5ec8e13430 100644 --- a/src/backends/backendsCommon/test/layerTests/ActivationTestImpl.cpp +++ b/src/backends/backendsCommon/test/layerTests/ActivationTestImpl.cpp @@ -9,13 +9,13 @@ #include <ResolveType.hpp> #include <backendsCommon/test/ActivationFixture.hpp> -#include <backendsCommon/test/TensorCopyUtils.hpp> -#include <backendsCommon/test/WorkloadTestUtils.hpp> +#include <armnnTestUtils/TensorCopyUtils.hpp> +#include <WorkloadTestUtils.hpp> #include <reference/test/RefWorkloadFactoryHelper.hpp> #include <armnn/utility/NumericCast.hpp> -#include <test/TensorHelpers.hpp> +#include <TensorHelpers.hpp> #include <algorithm> diff --git a/src/backends/backendsCommon/test/layerTests/ActivationTestImpl.hpp b/src/backends/backendsCommon/test/layerTests/ActivationTestImpl.hpp index a65d97cdce..9e8b3a2b29 100644 --- a/src/backends/backendsCommon/test/layerTests/ActivationTestImpl.hpp +++ b/src/backends/backendsCommon/test/layerTests/ActivationTestImpl.hpp @@ -5,7 +5,7 @@ #pragma once -#include "LayerTestResult.hpp" +#include <armnnTestUtils/LayerTestResult.hpp> #include <armnn/backends/IBackendInternal.hpp> #include <backendsCommon/WorkloadFactory.hpp> diff --git a/src/backends/backendsCommon/test/layerTests/AdditionTestImpl.hpp b/src/backends/backendsCommon/test/layerTests/AdditionTestImpl.hpp index b6d6e4ad43..a66d474f22 100644 --- a/src/backends/backendsCommon/test/layerTests/AdditionTestImpl.hpp +++ b/src/backends/backendsCommon/test/layerTests/AdditionTestImpl.hpp @@ -5,7 +5,7 @@ #pragma once -#include "LayerTestResult.hpp" +#include <armnnTestUtils/LayerTestResult.hpp> #include <armnn/backends/IBackendInternal.hpp> #include <backendsCommon/WorkloadFactory.hpp> diff --git a/src/backends/backendsCommon/test/layerTests/ArgMinMaxTestImpl.cpp b/src/backends/backendsCommon/test/layerTests/ArgMinMaxTestImpl.cpp index 34b2539c32..4f82b599f2 100644 --- a/src/backends/backendsCommon/test/layerTests/ArgMinMaxTestImpl.cpp +++ b/src/backends/backendsCommon/test/layerTests/ArgMinMaxTestImpl.cpp @@ -6,11 +6,11 @@ #include "ArgMinMaxTestImpl.hpp" -#include <backendsCommon/test/DataTypeUtils.hpp> -#include <backendsCommon/test/TensorCopyUtils.hpp> -#include <backendsCommon/test/WorkloadTestUtils.hpp> +#include <DataTypeUtils.hpp> +#include <armnnTestUtils/TensorCopyUtils.hpp> +#include <WorkloadTestUtils.hpp> -#include <test/TensorHelpers.hpp> +#include <TensorHelpers.hpp> namespace { diff --git a/src/backends/backendsCommon/test/layerTests/ArgMinMaxTestImpl.hpp b/src/backends/backendsCommon/test/layerTests/ArgMinMaxTestImpl.hpp index 2e7a54b6af..941470590a 100644 --- a/src/backends/backendsCommon/test/layerTests/ArgMinMaxTestImpl.hpp +++ b/src/backends/backendsCommon/test/layerTests/ArgMinMaxTestImpl.hpp @@ -5,7 +5,7 @@ #pragma once -#include "LayerTestResult.hpp" +#include <armnnTestUtils/LayerTestResult.hpp> #include <ResolveType.hpp> diff --git a/src/backends/backendsCommon/test/layerTests/BatchNormalizationTestImpl.cpp b/src/backends/backendsCommon/test/layerTests/BatchNormalizationTestImpl.cpp index 4311faff4e..90bc8d76c1 100644 --- a/src/backends/backendsCommon/test/layerTests/BatchNormalizationTestImpl.cpp +++ b/src/backends/backendsCommon/test/layerTests/BatchNormalizationTestImpl.cpp @@ -16,10 +16,10 @@ #include <backendsCommon/WorkloadFactory.hpp> #include <reference/test/RefWorkloadFactoryHelper.hpp> -#include <backendsCommon/test/TensorCopyUtils.hpp> -#include <backendsCommon/test/WorkloadTestUtils.hpp> +#include <armnnTestUtils/TensorCopyUtils.hpp> +#include <WorkloadTestUtils.hpp> -#include <test/TensorHelpers.hpp> +#include <TensorHelpers.hpp> namespace { diff --git a/src/backends/backendsCommon/test/layerTests/BatchNormalizationTestImpl.hpp b/src/backends/backendsCommon/test/layerTests/BatchNormalizationTestImpl.hpp index f57c061f57..11bc2973a2 100644 --- a/src/backends/backendsCommon/test/layerTests/BatchNormalizationTestImpl.hpp +++ b/src/backends/backendsCommon/test/layerTests/BatchNormalizationTestImpl.hpp @@ -5,7 +5,7 @@ #pragma once -#include "LayerTestResult.hpp" +#include <armnnTestUtils/LayerTestResult.hpp> #include <Half.hpp> diff --git a/src/backends/backendsCommon/test/layerTests/BatchToSpaceNdTestImpl.hpp b/src/backends/backendsCommon/test/layerTests/BatchToSpaceNdTestImpl.hpp index 3669281d48..19d472bb0f 100644 --- a/src/backends/backendsCommon/test/layerTests/BatchToSpaceNdTestImpl.hpp +++ b/src/backends/backendsCommon/test/layerTests/BatchToSpaceNdTestImpl.hpp @@ -5,19 +5,16 @@ #pragma once -#include "LayerTestResult.hpp" - #include <ResolveType.hpp> - #include <armnn/backends/IBackendInternal.hpp> #include <backendsCommon/WorkloadFactory.hpp> -#include <backendsCommon/test/DataTypeUtils.hpp> -#include <backendsCommon/test/TensorCopyUtils.hpp> -#include <backendsCommon/test/WorkloadTestUtils.hpp> - -#include <test/TensorHelpers.hpp> +#include <armnnTestUtils/LayerTestResult.hpp> +#include <armnnTestUtils/TensorCopyUtils.hpp> +#include <DataTypeUtils.hpp> +#include <TensorHelpers.hpp> +#include <WorkloadTestUtils.hpp> namespace { diff --git a/src/backends/backendsCommon/test/layerTests/CastTestImpl.hpp b/src/backends/backendsCommon/test/layerTests/CastTestImpl.hpp index bf8d5a4e24..556909860e 100644 --- a/src/backends/backendsCommon/test/layerTests/CastTestImpl.hpp +++ b/src/backends/backendsCommon/test/layerTests/CastTestImpl.hpp @@ -5,7 +5,7 @@ #pragma once -#include "LayerTestResult.hpp" +#include <armnnTestUtils/LayerTestResult.hpp> #include <ResolveType.hpp> diff --git a/src/backends/backendsCommon/test/layerTests/ChannelShuffleTestImpl.cpp b/src/backends/backendsCommon/test/layerTests/ChannelShuffleTestImpl.cpp index b026b4e7e0..598f205694 100644 --- a/src/backends/backendsCommon/test/layerTests/ChannelShuffleTestImpl.cpp +++ b/src/backends/backendsCommon/test/layerTests/ChannelShuffleTestImpl.cpp @@ -5,9 +5,9 @@ #include "ChannelShuffleTestImpl.hpp" -#include <backendsCommon/test/DataTypeUtils.hpp> -#include <backendsCommon/test/TensorCopyUtils.hpp> -#include <backendsCommon/test/WorkloadTestUtils.hpp> +#include <DataTypeUtils.hpp> +#include <armnnTestUtils/TensorCopyUtils.hpp> +#include <WorkloadTestUtils.hpp> namespace { diff --git a/src/backends/backendsCommon/test/layerTests/ChannelShuffleTestImpl.hpp b/src/backends/backendsCommon/test/layerTests/ChannelShuffleTestImpl.hpp index 3500e72ae7..9c5f40d550 100644 --- a/src/backends/backendsCommon/test/layerTests/ChannelShuffleTestImpl.hpp +++ b/src/backends/backendsCommon/test/layerTests/ChannelShuffleTestImpl.hpp @@ -5,7 +5,7 @@ #pragma once -#include "LayerTestResult.hpp" +#include <armnnTestUtils/LayerTestResult.hpp> #include <ResolveType.hpp> diff --git a/src/backends/backendsCommon/test/layerTests/ComparisonTestImpl.cpp b/src/backends/backendsCommon/test/layerTests/ComparisonTestImpl.cpp index 68bc588860..5eccd011f6 100644 --- a/src/backends/backendsCommon/test/layerTests/ComparisonTestImpl.cpp +++ b/src/backends/backendsCommon/test/layerTests/ComparisonTestImpl.cpp @@ -13,10 +13,10 @@ #include <backendsCommon/Workload.hpp> #include <backendsCommon/WorkloadData.hpp> -#include <backendsCommon/test/TensorCopyUtils.hpp> -#include <backendsCommon/test/WorkloadTestUtils.hpp> +#include <armnnTestUtils/TensorCopyUtils.hpp> +#include <WorkloadTestUtils.hpp> -#include <test/TensorHelpers.hpp> +#include <TensorHelpers.hpp> namespace { diff --git a/src/backends/backendsCommon/test/layerTests/ComparisonTestImpl.hpp b/src/backends/backendsCommon/test/layerTests/ComparisonTestImpl.hpp index 301241785b..8a920e5f5f 100644 --- a/src/backends/backendsCommon/test/layerTests/ComparisonTestImpl.hpp +++ b/src/backends/backendsCommon/test/layerTests/ComparisonTestImpl.hpp @@ -5,7 +5,7 @@ #pragma once -#include "LayerTestResult.hpp" +#include <armnnTestUtils/LayerTestResult.hpp> #include <armnn/backends/IBackendInternal.hpp> #include <backendsCommon/WorkloadFactory.hpp> diff --git a/src/backends/backendsCommon/test/layerTests/ConcatTestImpl.cpp b/src/backends/backendsCommon/test/layerTests/ConcatTestImpl.cpp index 3eca27364d..52387298c6 100644 --- a/src/backends/backendsCommon/test/layerTests/ConcatTestImpl.cpp +++ b/src/backends/backendsCommon/test/layerTests/ConcatTestImpl.cpp @@ -11,10 +11,10 @@ #include <armnnUtils/Permute.hpp> -#include <backendsCommon/test/TensorCopyUtils.hpp> -#include <backendsCommon/test/WorkloadTestUtils.hpp> +#include <armnnTestUtils/TensorCopyUtils.hpp> +#include <WorkloadTestUtils.hpp> -#include <test/TensorHelpers.hpp> +#include <TensorHelpers.hpp> using namespace armnn; using namespace armnnUtils; diff --git a/src/backends/backendsCommon/test/layerTests/ConcatTestImpl.hpp b/src/backends/backendsCommon/test/layerTests/ConcatTestImpl.hpp index 64e0c0a722..c91ee86cf9 100644 --- a/src/backends/backendsCommon/test/layerTests/ConcatTestImpl.hpp +++ b/src/backends/backendsCommon/test/layerTests/ConcatTestImpl.hpp @@ -5,7 +5,7 @@ #pragma once -#include "LayerTestResult.hpp" +#include <armnnTestUtils/LayerTestResult.hpp> #include <BFloat16.hpp> #include <Half.hpp> diff --git a/src/backends/backendsCommon/test/layerTests/ConstantTestImpl.cpp b/src/backends/backendsCommon/test/layerTests/ConstantTestImpl.cpp index bb827ef359..dd339badb2 100644 --- a/src/backends/backendsCommon/test/layerTests/ConstantTestImpl.cpp +++ b/src/backends/backendsCommon/test/layerTests/ConstantTestImpl.cpp @@ -13,10 +13,10 @@ #include <backendsCommon/TensorHandle.hpp> -#include <backendsCommon/test/TensorCopyUtils.hpp> -#include <backendsCommon/test/WorkloadTestUtils.hpp> +#include <armnnTestUtils/TensorCopyUtils.hpp> +#include <WorkloadTestUtils.hpp> -#include <test/TensorHelpers.hpp> +#include <TensorHelpers.hpp> namespace { diff --git a/src/backends/backendsCommon/test/layerTests/ConstantTestImpl.hpp b/src/backends/backendsCommon/test/layerTests/ConstantTestImpl.hpp index 71aacb5e62..34491b1c76 100644 --- a/src/backends/backendsCommon/test/layerTests/ConstantTestImpl.hpp +++ b/src/backends/backendsCommon/test/layerTests/ConstantTestImpl.hpp @@ -5,7 +5,7 @@ #pragma once -#include "LayerTestResult.hpp" +#include <armnnTestUtils/LayerTestResult.hpp> #include <armnn/backends/IBackendInternal.hpp> #include <backendsCommon/WorkloadFactory.hpp> diff --git a/src/backends/backendsCommon/test/layerTests/Conv2dTestImpl.cpp b/src/backends/backendsCommon/test/layerTests/Conv2dTestImpl.cpp index 99f1436c98..61e000a891 100644 --- a/src/backends/backendsCommon/test/layerTests/Conv2dTestImpl.cpp +++ b/src/backends/backendsCommon/test/layerTests/Conv2dTestImpl.cpp @@ -15,11 +15,11 @@ #include <backendsCommon/TensorHandle.hpp> -#include <backendsCommon/test/DataLayoutUtils.hpp> -#include <backendsCommon/test/TensorCopyUtils.hpp> -#include <backendsCommon/test/WorkloadTestUtils.hpp> +#include <armnnTestUtils/DataLayoutUtils.hpp> +#include <armnnTestUtils/TensorCopyUtils.hpp> +#include <WorkloadTestUtils.hpp> -#include <test/TensorHelpers.hpp> +#include <TensorHelpers.hpp> #include <string> diff --git a/src/backends/backendsCommon/test/layerTests/Conv2dTestImpl.hpp b/src/backends/backendsCommon/test/layerTests/Conv2dTestImpl.hpp index 1f54034703..f54a6f85f5 100644 --- a/src/backends/backendsCommon/test/layerTests/Conv2dTestImpl.hpp +++ b/src/backends/backendsCommon/test/layerTests/Conv2dTestImpl.hpp @@ -5,7 +5,7 @@ #pragma once -#include "LayerTestResult.hpp" +#include <armnnTestUtils/LayerTestResult.hpp> #include <ResolveType.hpp> diff --git a/src/backends/backendsCommon/test/layerTests/Conv3dTestImpl.cpp b/src/backends/backendsCommon/test/layerTests/Conv3dTestImpl.cpp index a592ea3f31..4adc6ef63f 100644 --- a/src/backends/backendsCommon/test/layerTests/Conv3dTestImpl.cpp +++ b/src/backends/backendsCommon/test/layerTests/Conv3dTestImpl.cpp @@ -11,11 +11,11 @@ #include <backendsCommon/TensorHandle.hpp> -#include <backendsCommon/test/DataLayoutUtils.hpp> -#include <backendsCommon/test/TensorCopyUtils.hpp> -#include <backendsCommon/test/WorkloadTestUtils.hpp> +#include <armnnTestUtils/DataLayoutUtils.hpp> +#include <armnnTestUtils/TensorCopyUtils.hpp> +#include <WorkloadTestUtils.hpp> -#include <test/TensorHelpers.hpp> +#include <TensorHelpers.hpp> using namespace armnnUtils; diff --git a/src/backends/backendsCommon/test/layerTests/Conv3dTestImpl.hpp b/src/backends/backendsCommon/test/layerTests/Conv3dTestImpl.hpp index c612e19c9b..127e7ef883 100644 --- a/src/backends/backendsCommon/test/layerTests/Conv3dTestImpl.hpp +++ b/src/backends/backendsCommon/test/layerTests/Conv3dTestImpl.hpp @@ -5,7 +5,7 @@ #pragma once -#include "LayerTestResult.hpp" +#include <armnnTestUtils/LayerTestResult.hpp> #include <Half.hpp> diff --git a/src/backends/backendsCommon/test/layerTests/ConvertBf16ToFp32TestImpl.cpp b/src/backends/backendsCommon/test/layerTests/ConvertBf16ToFp32TestImpl.cpp index b16ce47c8f..7699daa21d 100644 --- a/src/backends/backendsCommon/test/layerTests/ConvertBf16ToFp32TestImpl.cpp +++ b/src/backends/backendsCommon/test/layerTests/ConvertBf16ToFp32TestImpl.cpp @@ -5,10 +5,10 @@ #include "ConvertBf16ToFp32TestImpl.hpp" -#include <backendsCommon/test/TensorCopyUtils.hpp> -#include <backendsCommon/test/WorkloadTestUtils.hpp> +#include <armnnTestUtils/TensorCopyUtils.hpp> +#include <WorkloadTestUtils.hpp> -#include <test/TensorHelpers.hpp> +#include <TensorHelpers.hpp> LayerTestResult<float, 4> ConvertBf16ToFp32Test( armnn::IWorkloadFactory& workloadFactory, diff --git a/src/backends/backendsCommon/test/layerTests/ConvertBf16ToFp32TestImpl.hpp b/src/backends/backendsCommon/test/layerTests/ConvertBf16ToFp32TestImpl.hpp index 08f4c04074..db92d42aca 100644 --- a/src/backends/backendsCommon/test/layerTests/ConvertBf16ToFp32TestImpl.hpp +++ b/src/backends/backendsCommon/test/layerTests/ConvertBf16ToFp32TestImpl.hpp @@ -5,7 +5,7 @@ #pragma once -#include "LayerTestResult.hpp" +#include <armnnTestUtils/LayerTestResult.hpp> #include <BFloat16.hpp> diff --git a/src/backends/backendsCommon/test/layerTests/ConvertFp16ToFp32TestImpl.cpp b/src/backends/backendsCommon/test/layerTests/ConvertFp16ToFp32TestImpl.cpp index 177acef772..2c1f9b9407 100644 --- a/src/backends/backendsCommon/test/layerTests/ConvertFp16ToFp32TestImpl.cpp +++ b/src/backends/backendsCommon/test/layerTests/ConvertFp16ToFp32TestImpl.cpp @@ -8,10 +8,10 @@ #include <Half.hpp> -#include <backendsCommon/test/TensorCopyUtils.hpp> -#include <backendsCommon/test/WorkloadTestUtils.hpp> +#include <armnnTestUtils/TensorCopyUtils.hpp> +#include <WorkloadTestUtils.hpp> -#include <test/TensorHelpers.hpp> +#include <TensorHelpers.hpp> LayerTestResult<float, 4> SimpleConvertFp16ToFp32Test( armnn::IWorkloadFactory& workloadFactory, diff --git a/src/backends/backendsCommon/test/layerTests/ConvertFp16ToFp32TestImpl.hpp b/src/backends/backendsCommon/test/layerTests/ConvertFp16ToFp32TestImpl.hpp index 8eefb77892..9e64cdd823 100644 --- a/src/backends/backendsCommon/test/layerTests/ConvertFp16ToFp32TestImpl.hpp +++ b/src/backends/backendsCommon/test/layerTests/ConvertFp16ToFp32TestImpl.hpp @@ -5,7 +5,7 @@ #pragma once -#include "LayerTestResult.hpp" +#include <armnnTestUtils/LayerTestResult.hpp> #include <armnn/backends/IBackendInternal.hpp> #include <backendsCommon/WorkloadFactory.hpp> diff --git a/src/backends/backendsCommon/test/layerTests/ConvertFp32ToBf16TestImpl.cpp b/src/backends/backendsCommon/test/layerTests/ConvertFp32ToBf16TestImpl.cpp index 9ab3746b61..14a75c13de 100644 --- a/src/backends/backendsCommon/test/layerTests/ConvertFp32ToBf16TestImpl.cpp +++ b/src/backends/backendsCommon/test/layerTests/ConvertFp32ToBf16TestImpl.cpp @@ -5,10 +5,10 @@ #include "ConvertFp32ToBf16TestImpl.hpp" -#include <backendsCommon/test/TensorCopyUtils.hpp> -#include <backendsCommon/test/WorkloadTestUtils.hpp> +#include <armnnTestUtils/TensorCopyUtils.hpp> +#include <WorkloadTestUtils.hpp> -#include <test/TensorHelpers.hpp> +#include <TensorHelpers.hpp> LayerTestResult<armnn::BFloat16, 4> ConvertFp32ToBf16Test( armnn::IWorkloadFactory& workloadFactory, diff --git a/src/backends/backendsCommon/test/layerTests/ConvertFp32ToBf16TestImpl.hpp b/src/backends/backendsCommon/test/layerTests/ConvertFp32ToBf16TestImpl.hpp index 9e1da65c2e..737181def1 100644 --- a/src/backends/backendsCommon/test/layerTests/ConvertFp32ToBf16TestImpl.hpp +++ b/src/backends/backendsCommon/test/layerTests/ConvertFp32ToBf16TestImpl.hpp @@ -5,7 +5,7 @@ #pragma once -#include "LayerTestResult.hpp" +#include <armnnTestUtils/LayerTestResult.hpp> #include <BFloat16.hpp> diff --git a/src/backends/backendsCommon/test/layerTests/ConvertFp32ToFp16TestImpl.cpp b/src/backends/backendsCommon/test/layerTests/ConvertFp32ToFp16TestImpl.cpp index 9946801aab..8210b2d2d1 100644 --- a/src/backends/backendsCommon/test/layerTests/ConvertFp32ToFp16TestImpl.cpp +++ b/src/backends/backendsCommon/test/layerTests/ConvertFp32ToFp16TestImpl.cpp @@ -6,10 +6,10 @@ #include "ConvertFp32ToFp16TestImpl.hpp" -#include <backendsCommon/test/TensorCopyUtils.hpp> -#include <backendsCommon/test/WorkloadTestUtils.hpp> +#include <armnnTestUtils/TensorCopyUtils.hpp> +#include <WorkloadTestUtils.hpp> -#include <test/TensorHelpers.hpp> +#include <TensorHelpers.hpp> LayerTestResult<armnn::Half, 4> SimpleConvertFp32ToFp16Test( armnn::IWorkloadFactory& workloadFactory, diff --git a/src/backends/backendsCommon/test/layerTests/ConvertFp32ToFp16TestImpl.hpp b/src/backends/backendsCommon/test/layerTests/ConvertFp32ToFp16TestImpl.hpp index 39dc8a4d4d..8b6617c8ef 100644 --- a/src/backends/backendsCommon/test/layerTests/ConvertFp32ToFp16TestImpl.hpp +++ b/src/backends/backendsCommon/test/layerTests/ConvertFp32ToFp16TestImpl.hpp @@ -5,7 +5,7 @@ #pragma once -#include "LayerTestResult.hpp" +#include <armnnTestUtils/LayerTestResult.hpp> #include <Half.hpp> diff --git a/src/backends/backendsCommon/test/layerTests/DebugTestImpl.cpp b/src/backends/backendsCommon/test/layerTests/DebugTestImpl.cpp index 0539cd1470..5475dbfae7 100644 --- a/src/backends/backendsCommon/test/layerTests/DebugTestImpl.cpp +++ b/src/backends/backendsCommon/test/layerTests/DebugTestImpl.cpp @@ -9,10 +9,10 @@ #include <ResolveType.hpp> -#include <backendsCommon/test/TensorCopyUtils.hpp> -#include <backendsCommon/test/WorkloadTestUtils.hpp> +#include <armnnTestUtils/TensorCopyUtils.hpp> +#include <WorkloadTestUtils.hpp> -#include <test/TensorHelpers.hpp> +#include <TensorHelpers.hpp> #include <doctest/doctest.h> diff --git a/src/backends/backendsCommon/test/layerTests/DebugTestImpl.hpp b/src/backends/backendsCommon/test/layerTests/DebugTestImpl.hpp index cf4b237d27..beab583cab 100644 --- a/src/backends/backendsCommon/test/layerTests/DebugTestImpl.hpp +++ b/src/backends/backendsCommon/test/layerTests/DebugTestImpl.hpp @@ -5,7 +5,7 @@ #pragma once -#include "LayerTestResult.hpp" +#include <armnnTestUtils/LayerTestResult.hpp> #include <BFloat16.hpp> diff --git a/src/backends/backendsCommon/test/layerTests/DepthToSpaceTestImpl.cpp b/src/backends/backendsCommon/test/layerTests/DepthToSpaceTestImpl.cpp index 7495c6b5b3..be88e77456 100644 --- a/src/backends/backendsCommon/test/layerTests/DepthToSpaceTestImpl.cpp +++ b/src/backends/backendsCommon/test/layerTests/DepthToSpaceTestImpl.cpp @@ -8,11 +8,11 @@ #include <QuantizeHelper.hpp> -#include <backendsCommon/test/DataLayoutUtils.hpp> -#include <backendsCommon/test/TensorCopyUtils.hpp> -#include <backendsCommon/test/WorkloadTestUtils.hpp> +#include <armnnTestUtils/DataLayoutUtils.hpp> +#include <armnnTestUtils/TensorCopyUtils.hpp> +#include <WorkloadTestUtils.hpp> -#include <test/TensorHelpers.hpp> +#include <TensorHelpers.hpp> namespace { diff --git a/src/backends/backendsCommon/test/layerTests/DepthToSpaceTestImpl.hpp b/src/backends/backendsCommon/test/layerTests/DepthToSpaceTestImpl.hpp index 18797c66dc..c6781a99c3 100644 --- a/src/backends/backendsCommon/test/layerTests/DepthToSpaceTestImpl.hpp +++ b/src/backends/backendsCommon/test/layerTests/DepthToSpaceTestImpl.hpp @@ -4,7 +4,7 @@ // #pragma once -#include "LayerTestResult.hpp" +#include <armnnTestUtils/LayerTestResult.hpp> #include <ResolveType.hpp> diff --git a/src/backends/backendsCommon/test/layerTests/DequantizeTestImpl.cpp b/src/backends/backendsCommon/test/layerTests/DequantizeTestImpl.cpp index 924844d92f..61fb4078c4 100644 --- a/src/backends/backendsCommon/test/layerTests/DequantizeTestImpl.cpp +++ b/src/backends/backendsCommon/test/layerTests/DequantizeTestImpl.cpp @@ -8,10 +8,10 @@ #include <ResolveType.hpp> -#include <backendsCommon/test/TensorCopyUtils.hpp> -#include <backendsCommon/test/WorkloadTestUtils.hpp> +#include <armnnTestUtils/TensorCopyUtils.hpp> +#include <WorkloadTestUtils.hpp> -#include <test/TensorHelpers.hpp> +#include <TensorHelpers.hpp> namespace { diff --git a/src/backends/backendsCommon/test/layerTests/DequantizeTestImpl.hpp b/src/backends/backendsCommon/test/layerTests/DequantizeTestImpl.hpp index 1e079a75bf..8f120d3b03 100644 --- a/src/backends/backendsCommon/test/layerTests/DequantizeTestImpl.hpp +++ b/src/backends/backendsCommon/test/layerTests/DequantizeTestImpl.hpp @@ -5,7 +5,7 @@ #pragma once -#include "LayerTestResult.hpp" +#include <armnnTestUtils/LayerTestResult.hpp> #include <armnn/backends/IBackendInternal.hpp> #include <backendsCommon/WorkloadFactory.hpp> diff --git a/src/backends/backendsCommon/test/layerTests/DetectionPostProcessTestImpl.hpp b/src/backends/backendsCommon/test/layerTests/DetectionPostProcessTestImpl.hpp index 2472c342ea..b9f06deaa1 100644 --- a/src/backends/backendsCommon/test/layerTests/DetectionPostProcessTestImpl.hpp +++ b/src/backends/backendsCommon/test/layerTests/DetectionPostProcessTestImpl.hpp @@ -12,11 +12,11 @@ #include <armnn/backends/IBackendInternal.hpp> #include <backendsCommon/WorkloadFactory.hpp> -#include <backendsCommon/test/TensorCopyUtils.hpp> +#include <armnnTestUtils/TensorCopyUtils.hpp> #include <backendsCommon/test/WorkloadFactoryHelper.hpp> -#include <backendsCommon/test/WorkloadTestUtils.hpp> +#include <WorkloadTestUtils.hpp> -#include <test/TensorHelpers.hpp> +#include <TensorHelpers.hpp> #include <doctest/doctest.h> diff --git a/src/backends/backendsCommon/test/layerTests/DivisionTestImpl.hpp b/src/backends/backendsCommon/test/layerTests/DivisionTestImpl.hpp index 41467466b2..b5d04e5f43 100644 --- a/src/backends/backendsCommon/test/layerTests/DivisionTestImpl.hpp +++ b/src/backends/backendsCommon/test/layerTests/DivisionTestImpl.hpp @@ -5,7 +5,7 @@ #pragma once -#include "LayerTestResult.hpp" +#include <armnnTestUtils/LayerTestResult.hpp> #include <Half.hpp> diff --git a/src/backends/backendsCommon/test/layerTests/ElementwiseTestImpl.hpp b/src/backends/backendsCommon/test/layerTests/ElementwiseTestImpl.hpp index 88f34f6add..3175aaf4c3 100644 --- a/src/backends/backendsCommon/test/layerTests/ElementwiseTestImpl.hpp +++ b/src/backends/backendsCommon/test/layerTests/ElementwiseTestImpl.hpp @@ -5,7 +5,7 @@ #pragma once -#include "LayerTestResult.hpp" +#include <armnnTestUtils/LayerTestResult.hpp> #include <ResolveType.hpp> @@ -15,11 +15,11 @@ #include <backendsCommon/WorkloadData.hpp> #include <backendsCommon/WorkloadFactory.hpp> -#include <backendsCommon/test/DataTypeUtils.hpp> -#include <backendsCommon/test/TensorCopyUtils.hpp> -#include <backendsCommon/test/WorkloadTestUtils.hpp> +#include <DataTypeUtils.hpp> +#include <armnnTestUtils/TensorCopyUtils.hpp> +#include <WorkloadTestUtils.hpp> -#include <test/TensorHelpers.hpp> +#include <TensorHelpers.hpp> #include <memory> diff --git a/src/backends/backendsCommon/test/layerTests/ElementwiseUnaryTestImpl.hpp b/src/backends/backendsCommon/test/layerTests/ElementwiseUnaryTestImpl.hpp index 20e341b4e2..a15add049f 100644 --- a/src/backends/backendsCommon/test/layerTests/ElementwiseUnaryTestImpl.hpp +++ b/src/backends/backendsCommon/test/layerTests/ElementwiseUnaryTestImpl.hpp @@ -5,7 +5,7 @@ #pragma once -#include "LayerTestResult.hpp" +#include <armnnTestUtils/LayerTestResult.hpp> #include <armnn/ArmNN.hpp> @@ -16,11 +16,11 @@ #include <backendsCommon/WorkloadData.hpp> #include <backendsCommon/WorkloadFactory.hpp> -#include <backendsCommon/test/DataTypeUtils.hpp> -#include <backendsCommon/test/TensorCopyUtils.hpp> -#include <backendsCommon/test/WorkloadTestUtils.hpp> +#include <DataTypeUtils.hpp> +#include <armnnTestUtils/TensorCopyUtils.hpp> +#include <WorkloadTestUtils.hpp> -#include <test/TensorHelpers.hpp> +#include <TensorHelpers.hpp> #include <memory> diff --git a/src/backends/backendsCommon/test/layerTests/ExpTestImpl.hpp b/src/backends/backendsCommon/test/layerTests/ExpTestImpl.hpp index 91cb669737..c7008a744f 100644 --- a/src/backends/backendsCommon/test/layerTests/ExpTestImpl.hpp +++ b/src/backends/backendsCommon/test/layerTests/ExpTestImpl.hpp @@ -5,7 +5,7 @@ #pragma once -#include "LayerTestResult.hpp" +#include <armnnTestUtils/LayerTestResult.hpp> #include <ResolveType.hpp> diff --git a/src/backends/backendsCommon/test/layerTests/FakeQuantizationTestImpl.cpp b/src/backends/backendsCommon/test/layerTests/FakeQuantizationTestImpl.cpp index bbe481657d..f433f9dd17 100644 --- a/src/backends/backendsCommon/test/layerTests/FakeQuantizationTestImpl.cpp +++ b/src/backends/backendsCommon/test/layerTests/FakeQuantizationTestImpl.cpp @@ -8,10 +8,10 @@ #include <backendsCommon/TensorHandle.hpp> -#include <backendsCommon/test/TensorCopyUtils.hpp> -#include <backendsCommon/test/WorkloadTestUtils.hpp> +#include <armnnTestUtils/TensorCopyUtils.hpp> +#include <WorkloadTestUtils.hpp> -#include <test/TensorHelpers.hpp> +#include <TensorHelpers.hpp> LayerTestResult<float, 2> FakeQuantizationTest( armnn::IWorkloadFactory& workloadFactory, diff --git a/src/backends/backendsCommon/test/layerTests/FakeQuantizationTestImpl.hpp b/src/backends/backendsCommon/test/layerTests/FakeQuantizationTestImpl.hpp index 519880e92a..d8af8c561e 100644 --- a/src/backends/backendsCommon/test/layerTests/FakeQuantizationTestImpl.hpp +++ b/src/backends/backendsCommon/test/layerTests/FakeQuantizationTestImpl.hpp @@ -5,7 +5,7 @@ #pragma once -#include "LayerTestResult.hpp" +#include <armnnTestUtils/LayerTestResult.hpp> #include <armnn/backends/IBackendInternal.hpp> #include <backendsCommon/WorkloadFactory.hpp> diff --git a/src/backends/backendsCommon/test/layerTests/FillTestImpl.cpp b/src/backends/backendsCommon/test/layerTests/FillTestImpl.cpp index 9208a311a7..41fcf59ba8 100644 --- a/src/backends/backendsCommon/test/layerTests/FillTestImpl.cpp +++ b/src/backends/backendsCommon/test/layerTests/FillTestImpl.cpp @@ -5,11 +5,11 @@ #include "FillTestImpl.hpp" -#include <backendsCommon/test/DataTypeUtils.hpp> -#include <backendsCommon/test/TensorCopyUtils.hpp> -#include <backendsCommon/test/WorkloadTestUtils.hpp> +#include <DataTypeUtils.hpp> +#include <armnnTestUtils/TensorCopyUtils.hpp> +#include <WorkloadTestUtils.hpp> -#include <test/TensorHelpers.hpp> +#include <TensorHelpers.hpp> template<armnn::DataType ArmnnType, typename T> LayerTestResult<T, 4> SimpleFillTest( diff --git a/src/backends/backendsCommon/test/layerTests/FillTestImpl.hpp b/src/backends/backendsCommon/test/layerTests/FillTestImpl.hpp index 0eaffd14b6..beaf35c050 100644 --- a/src/backends/backendsCommon/test/layerTests/FillTestImpl.hpp +++ b/src/backends/backendsCommon/test/layerTests/FillTestImpl.hpp @@ -5,7 +5,7 @@ #pragma once -#include "LayerTestResult.hpp" +#include <armnnTestUtils/LayerTestResult.hpp> #include <ResolveType.hpp> diff --git a/src/backends/backendsCommon/test/layerTests/FloorTestImpl.cpp b/src/backends/backendsCommon/test/layerTests/FloorTestImpl.cpp index bf871ae2f4..c05e1d833e 100644 --- a/src/backends/backendsCommon/test/layerTests/FloorTestImpl.cpp +++ b/src/backends/backendsCommon/test/layerTests/FloorTestImpl.cpp @@ -5,11 +5,11 @@ #include "FloorTestImpl.hpp" -#include <backendsCommon/test/DataTypeUtils.hpp> -#include <backendsCommon/test/TensorCopyUtils.hpp> -#include <backendsCommon/test/WorkloadTestUtils.hpp> +#include <DataTypeUtils.hpp> +#include <armnnTestUtils/TensorCopyUtils.hpp> +#include <WorkloadTestUtils.hpp> -#include <test/TensorHelpers.hpp> +#include <TensorHelpers.hpp> template<armnn::DataType ArmnnType, typename T> LayerTestResult<T, 4> SimpleFloorTest( diff --git a/src/backends/backendsCommon/test/layerTests/FloorTestImpl.hpp b/src/backends/backendsCommon/test/layerTests/FloorTestImpl.hpp index 78211c6c15..ff25252d14 100644 --- a/src/backends/backendsCommon/test/layerTests/FloorTestImpl.hpp +++ b/src/backends/backendsCommon/test/layerTests/FloorTestImpl.hpp @@ -5,7 +5,7 @@ #pragma once -#include "LayerTestResult.hpp" +#include <armnnTestUtils/LayerTestResult.hpp> #include <ResolveType.hpp> diff --git a/src/backends/backendsCommon/test/layerTests/FullyConnectedTestImpl.cpp b/src/backends/backendsCommon/test/layerTests/FullyConnectedTestImpl.cpp index dcf87fe92b..59e67febdf 100644 --- a/src/backends/backendsCommon/test/layerTests/FullyConnectedTestImpl.cpp +++ b/src/backends/backendsCommon/test/layerTests/FullyConnectedTestImpl.cpp @@ -10,11 +10,11 @@ #include <backendsCommon/TensorHandle.hpp> -#include <backendsCommon/test/DataTypeUtils.hpp> -#include <backendsCommon/test/TensorCopyUtils.hpp> -#include <backendsCommon/test/WorkloadTestUtils.hpp> +#include <DataTypeUtils.hpp> +#include <armnnTestUtils/TensorCopyUtils.hpp> +#include <WorkloadTestUtils.hpp> -#include <test/TensorHelpers.hpp> +#include <TensorHelpers.hpp> // // Implementation templates diff --git a/src/backends/backendsCommon/test/layerTests/FullyConnectedTestImpl.hpp b/src/backends/backendsCommon/test/layerTests/FullyConnectedTestImpl.hpp index ec921f7dd5..76cea90c04 100644 --- a/src/backends/backendsCommon/test/layerTests/FullyConnectedTestImpl.hpp +++ b/src/backends/backendsCommon/test/layerTests/FullyConnectedTestImpl.hpp @@ -5,7 +5,7 @@ #pragma once -#include "LayerTestResult.hpp" +#include <armnnTestUtils/LayerTestResult.hpp> #include <ResolveType.hpp> diff --git a/src/backends/backendsCommon/test/layerTests/GatherTestImpl.cpp b/src/backends/backendsCommon/test/layerTests/GatherTestImpl.cpp index 51df1eb847..edcc900f5e 100644 --- a/src/backends/backendsCommon/test/layerTests/GatherTestImpl.cpp +++ b/src/backends/backendsCommon/test/layerTests/GatherTestImpl.cpp @@ -8,10 +8,10 @@ #include <ResolveType.hpp> -#include <backendsCommon/test/TensorCopyUtils.hpp> -#include <backendsCommon/test/WorkloadTestUtils.hpp> +#include <armnnTestUtils/TensorCopyUtils.hpp> +#include <WorkloadTestUtils.hpp> -#include <test/TensorHelpers.hpp> +#include <TensorHelpers.hpp> namespace { diff --git a/src/backends/backendsCommon/test/layerTests/GatherTestImpl.hpp b/src/backends/backendsCommon/test/layerTests/GatherTestImpl.hpp index 8c37f92f42..363478dd30 100644 --- a/src/backends/backendsCommon/test/layerTests/GatherTestImpl.hpp +++ b/src/backends/backendsCommon/test/layerTests/GatherTestImpl.hpp @@ -5,7 +5,7 @@ #pragma once -#include "LayerTestResult.hpp" +#include <armnnTestUtils/LayerTestResult.hpp> #include <Half.hpp> diff --git a/src/backends/backendsCommon/test/layerTests/InstanceNormalizationTestImpl.cpp b/src/backends/backendsCommon/test/layerTests/InstanceNormalizationTestImpl.cpp index ed656daa02..da9608c122 100644 --- a/src/backends/backendsCommon/test/layerTests/InstanceNormalizationTestImpl.cpp +++ b/src/backends/backendsCommon/test/layerTests/InstanceNormalizationTestImpl.cpp @@ -13,11 +13,11 @@ #include <armnn/backends/IBackendInternal.hpp> #include <backendsCommon/WorkloadFactory.hpp> -#include <backendsCommon/test/DataLayoutUtils.hpp> -#include <backendsCommon/test/TensorCopyUtils.hpp> -#include <backendsCommon/test/WorkloadTestUtils.hpp> +#include <armnnTestUtils/DataLayoutUtils.hpp> +#include <armnnTestUtils/TensorCopyUtils.hpp> +#include <WorkloadTestUtils.hpp> -#include <test/TensorHelpers.hpp> +#include <TensorHelpers.hpp> namespace { diff --git a/src/backends/backendsCommon/test/layerTests/InstanceNormalizationTestImpl.hpp b/src/backends/backendsCommon/test/layerTests/InstanceNormalizationTestImpl.hpp index d28069a8ef..be771441a2 100644 --- a/src/backends/backendsCommon/test/layerTests/InstanceNormalizationTestImpl.hpp +++ b/src/backends/backendsCommon/test/layerTests/InstanceNormalizationTestImpl.hpp @@ -5,7 +5,7 @@ #pragma once -#include "LayerTestResult.hpp" +#include <armnnTestUtils/LayerTestResult.hpp> #include <Half.hpp> diff --git a/src/backends/backendsCommon/test/layerTests/L2NormalizationTestImpl.cpp b/src/backends/backendsCommon/test/layerTests/L2NormalizationTestImpl.cpp index 11c9766604..67f1c3c221 100644 --- a/src/backends/backendsCommon/test/layerTests/L2NormalizationTestImpl.cpp +++ b/src/backends/backendsCommon/test/layerTests/L2NormalizationTestImpl.cpp @@ -11,10 +11,10 @@ #include <armnnUtils/TensorUtils.hpp> #include <armnnUtils/Permute.hpp> -#include <backendsCommon/test/TensorCopyUtils.hpp> -#include <backendsCommon/test/WorkloadTestUtils.hpp> +#include <armnnTestUtils/TensorCopyUtils.hpp> +#include <WorkloadTestUtils.hpp> -#include <test/TensorHelpers.hpp> +#include <TensorHelpers.hpp> #include <numeric> diff --git a/src/backends/backendsCommon/test/layerTests/L2NormalizationTestImpl.hpp b/src/backends/backendsCommon/test/layerTests/L2NormalizationTestImpl.hpp index 137ab7e8f6..283a25b187 100644 --- a/src/backends/backendsCommon/test/layerTests/L2NormalizationTestImpl.hpp +++ b/src/backends/backendsCommon/test/layerTests/L2NormalizationTestImpl.hpp @@ -5,7 +5,7 @@ #pragma once -#include "LayerTestResult.hpp" +#include <armnnTestUtils/LayerTestResult.hpp> #include <armnn/Types.hpp> diff --git a/src/backends/backendsCommon/test/layerTests/LayerTestResult.hpp b/src/backends/backendsCommon/test/layerTests/LayerTestResult.hpp index ac60764964..e0054cad63 100644 --- a/src/backends/backendsCommon/test/layerTests/LayerTestResult.hpp +++ b/src/backends/backendsCommon/test/layerTests/LayerTestResult.hpp @@ -1,62 +1,15 @@ // -// Copyright © 2017 Arm Ltd. All rights reserved. +// Copyright © 2017 Arm Ltd and Contributors. All rights reserved. // SPDX-License-Identifier: MIT // -#pragma once +// This file is deprecated and will be removed soon. +// Please use the new header in armnnTestUtils instead. +// This will use the new armnnTestUtils header. +#include <armnnTestUtils/LayerTestResult.hpp> -#include <armnn/Tensor.hpp> -#include <armnn/utility/Assert.hpp> - -#include <cstddef> -#include <vector> - -template <typename T, std::size_t n> -struct LayerTestResult -{ - LayerTestResult(const armnn::TensorInfo& outputInfo) - : m_Supported(true) - , m_CompareBoolean(false) - { - m_ActualData.reserve(outputInfo.GetNumElements()); - m_ExpectedData.reserve(outputInfo.GetNumElements()); - m_ActualShape = outputInfo.GetShape(); - m_ExpectedShape = outputInfo.GetShape(); - } - - LayerTestResult(const std::vector<T>& actualData, - const std::vector<T>& expectedData, - const armnn::TensorShape& actualShape, - const armnn::TensorShape& expectedShape) - : m_ActualData(actualData) - , m_ExpectedData(expectedData) - , m_ActualShape(actualShape) - , m_ExpectedShape(expectedShape) - , m_Supported(true) - , m_CompareBoolean(false) - {} - - LayerTestResult(const std::vector<T>& actualData, - const std::vector<T>& expectedData, - const armnn::TensorShape& actualShape, - const armnn::TensorShape& expectedShape, - const bool compareBoolean) - : m_ActualData(actualData) - , m_ExpectedData(expectedData) - , m_ActualShape(actualShape) - , m_ExpectedShape(expectedShape) - , m_Supported(true) - , m_CompareBoolean(compareBoolean) - {} - - std::vector<T> m_ActualData; - std::vector<T> m_ExpectedData; - armnn::TensorShape m_ActualShape; - armnn::TensorShape m_ExpectedShape; - - bool m_Supported; - bool m_CompareBoolean; -}; +#pragma message("backendsCommon/test/layerTests/LayerTestResult.hpp has been deprecated, it is due for " \ + "removal in 22.08 release. Please use public interface include/armnnTestUtils/LayerTestResult.hpp") diff --git a/src/backends/backendsCommon/test/layerTests/LogSoftmaxTestImpl.cpp b/src/backends/backendsCommon/test/layerTests/LogSoftmaxTestImpl.cpp index ad23f8f380..94f5a5be1c 100644 --- a/src/backends/backendsCommon/test/layerTests/LogSoftmaxTestImpl.cpp +++ b/src/backends/backendsCommon/test/layerTests/LogSoftmaxTestImpl.cpp @@ -14,10 +14,10 @@ #include <armnn/backends/IBackendInternal.hpp> #include <backendsCommon/WorkloadFactory.hpp> -#include <backendsCommon/test/TensorCopyUtils.hpp> -#include <backendsCommon/test/WorkloadTestUtils.hpp> +#include <armnnTestUtils/TensorCopyUtils.hpp> +#include <WorkloadTestUtils.hpp> -#include <test/TensorHelpers.hpp> +#include <TensorHelpers.hpp> namespace { diff --git a/src/backends/backendsCommon/test/layerTests/LogSoftmaxTestImpl.hpp b/src/backends/backendsCommon/test/layerTests/LogSoftmaxTestImpl.hpp index 1f4cc8947c..b293337554 100644 --- a/src/backends/backendsCommon/test/layerTests/LogSoftmaxTestImpl.hpp +++ b/src/backends/backendsCommon/test/layerTests/LogSoftmaxTestImpl.hpp @@ -5,7 +5,7 @@ #pragma once -#include "LayerTestResult.hpp" +#include <armnnTestUtils/LayerTestResult.hpp> #include <ResolveType.hpp> diff --git a/src/backends/backendsCommon/test/layerTests/LogTestImpl.hpp b/src/backends/backendsCommon/test/layerTests/LogTestImpl.hpp index e7e14b89d1..cf9878f592 100644 --- a/src/backends/backendsCommon/test/layerTests/LogTestImpl.hpp +++ b/src/backends/backendsCommon/test/layerTests/LogTestImpl.hpp @@ -5,7 +5,7 @@ #pragma once -#include "LayerTestResult.hpp" +#include <armnnTestUtils/LayerTestResult.hpp> #include <ResolveType.hpp> diff --git a/src/backends/backendsCommon/test/layerTests/LogicalTestImpl.cpp b/src/backends/backendsCommon/test/layerTests/LogicalTestImpl.cpp index 119e76bda9..a2ce5af2f3 100644 --- a/src/backends/backendsCommon/test/layerTests/LogicalTestImpl.cpp +++ b/src/backends/backendsCommon/test/layerTests/LogicalTestImpl.cpp @@ -11,10 +11,10 @@ #include <backendsCommon/Workload.hpp> #include <backendsCommon/WorkloadData.hpp> -#include <backendsCommon/test/TensorCopyUtils.hpp> -#include <backendsCommon/test/WorkloadTestUtils.hpp> +#include <armnnTestUtils/TensorCopyUtils.hpp> +#include <WorkloadTestUtils.hpp> -#include <test/TensorHelpers.hpp> +#include <TensorHelpers.hpp> namespace { diff --git a/src/backends/backendsCommon/test/layerTests/LogicalTestImpl.hpp b/src/backends/backendsCommon/test/layerTests/LogicalTestImpl.hpp index 1711d90d5a..b81d2f38a1 100644 --- a/src/backends/backendsCommon/test/layerTests/LogicalTestImpl.hpp +++ b/src/backends/backendsCommon/test/layerTests/LogicalTestImpl.hpp @@ -5,7 +5,7 @@ #pragma once -#include "LayerTestResult.hpp" +#include <armnnTestUtils/LayerTestResult.hpp> #include <armnn/backends/IBackendInternal.hpp> #include <backendsCommon/WorkloadFactory.hpp> diff --git a/src/backends/backendsCommon/test/layerTests/LstmTestImpl.cpp b/src/backends/backendsCommon/test/layerTests/LstmTestImpl.cpp index 035c592738..56bc23cf9c 100644 --- a/src/backends/backendsCommon/test/layerTests/LstmTestImpl.cpp +++ b/src/backends/backendsCommon/test/layerTests/LstmTestImpl.cpp @@ -11,14 +11,14 @@ #include <backendsCommon/TensorHandle.hpp> -#include <backendsCommon/test/TensorCopyUtils.hpp> -#include <backendsCommon/test/WorkloadTestUtils.hpp> +#include <armnnTestUtils/TensorCopyUtils.hpp> +#include <WorkloadTestUtils.hpp> #include <reference/workloads/Decoders.hpp> #include <reference/workloads/Encoders.hpp> #include <reference/workloads/LstmUtils.hpp> -#include <test/TensorHelpers.hpp> +#include <TensorHelpers.hpp> #include <doctest/doctest.h> namespace diff --git a/src/backends/backendsCommon/test/layerTests/LstmTestImpl.hpp b/src/backends/backendsCommon/test/layerTests/LstmTestImpl.hpp index d27ddd6920..62bb125519 100644 --- a/src/backends/backendsCommon/test/layerTests/LstmTestImpl.hpp +++ b/src/backends/backendsCommon/test/layerTests/LstmTestImpl.hpp @@ -5,7 +5,7 @@ #pragma once -#include "LayerTestResult.hpp" +#include <armnnTestUtils/LayerTestResult.hpp> #include <armnn/backends/IBackendInternal.hpp> #include <backendsCommon/WorkloadFactory.hpp> diff --git a/src/backends/backendsCommon/test/layerTests/MaximumTestImpl.hpp b/src/backends/backendsCommon/test/layerTests/MaximumTestImpl.hpp index 8cc660b76f..c13059b445 100644 --- a/src/backends/backendsCommon/test/layerTests/MaximumTestImpl.hpp +++ b/src/backends/backendsCommon/test/layerTests/MaximumTestImpl.hpp @@ -5,7 +5,7 @@ #pragma once -#include "LayerTestResult.hpp" +#include <armnnTestUtils/LayerTestResult.hpp> #include <Half.hpp> diff --git a/src/backends/backendsCommon/test/layerTests/MeanTestImpl.hpp b/src/backends/backendsCommon/test/layerTests/MeanTestImpl.hpp index 0f045d1198..9cc45e2e69 100644 --- a/src/backends/backendsCommon/test/layerTests/MeanTestImpl.hpp +++ b/src/backends/backendsCommon/test/layerTests/MeanTestImpl.hpp @@ -5,7 +5,7 @@ #pragma once -#include "LayerTestResult.hpp" +#include <armnnTestUtils/LayerTestResult.hpp> #include <ResolveType.hpp> diff --git a/src/backends/backendsCommon/test/layerTests/MinimumTestImpl.hpp b/src/backends/backendsCommon/test/layerTests/MinimumTestImpl.hpp index 1e84191908..bd60b20af0 100644 --- a/src/backends/backendsCommon/test/layerTests/MinimumTestImpl.hpp +++ b/src/backends/backendsCommon/test/layerTests/MinimumTestImpl.hpp @@ -5,7 +5,7 @@ #pragma once -#include "LayerTestResult.hpp" +#include <armnnTestUtils/LayerTestResult.hpp> #include <Half.hpp> diff --git a/src/backends/backendsCommon/test/layerTests/MirrorPadTestImpl.cpp b/src/backends/backendsCommon/test/layerTests/MirrorPadTestImpl.cpp index 61899db00e..60fbfb0548 100644 --- a/src/backends/backendsCommon/test/layerTests/MirrorPadTestImpl.cpp +++ b/src/backends/backendsCommon/test/layerTests/MirrorPadTestImpl.cpp @@ -7,10 +7,10 @@ #include <QuantizeHelper.hpp> -#include <backendsCommon/test/TensorCopyUtils.hpp> -#include <backendsCommon/test/WorkloadTestUtils.hpp> +#include <armnnTestUtils/TensorCopyUtils.hpp> +#include <WorkloadTestUtils.hpp> -#include <test/TensorHelpers.hpp> +#include <TensorHelpers.hpp> // // Implementation templates diff --git a/src/backends/backendsCommon/test/layerTests/MirrorPadTestImpl.hpp b/src/backends/backendsCommon/test/layerTests/MirrorPadTestImpl.hpp index 52898b820c..60475fdeb8 100644 --- a/src/backends/backendsCommon/test/layerTests/MirrorPadTestImpl.hpp +++ b/src/backends/backendsCommon/test/layerTests/MirrorPadTestImpl.hpp @@ -5,7 +5,7 @@ #pragma once -#include "LayerTestResult.hpp" +#include <armnnTestUtils/LayerTestResult.hpp> #include <Half.hpp> diff --git a/src/backends/backendsCommon/test/layerTests/MultiplicationTestImpl.hpp b/src/backends/backendsCommon/test/layerTests/MultiplicationTestImpl.hpp index 9d2a95409d..72154dbc33 100644 --- a/src/backends/backendsCommon/test/layerTests/MultiplicationTestImpl.hpp +++ b/src/backends/backendsCommon/test/layerTests/MultiplicationTestImpl.hpp @@ -5,7 +5,7 @@ #pragma once -#include "LayerTestResult.hpp" +#include <armnnTestUtils/LayerTestResult.hpp> #include <armnn/backends/IBackendInternal.hpp> #include <backendsCommon/WorkloadFactory.hpp> diff --git a/src/backends/backendsCommon/test/layerTests/NegTestImpl.hpp b/src/backends/backendsCommon/test/layerTests/NegTestImpl.hpp index 126a754335..0296ca2993 100644 --- a/src/backends/backendsCommon/test/layerTests/NegTestImpl.hpp +++ b/src/backends/backendsCommon/test/layerTests/NegTestImpl.hpp @@ -5,7 +5,7 @@ #pragma once -#include "LayerTestResult.hpp" +#include <armnnTestUtils/LayerTestResult.hpp> #include <ResolveType.hpp> diff --git a/src/backends/backendsCommon/test/layerTests/NormalizationTestImpl.cpp b/src/backends/backendsCommon/test/layerTests/NormalizationTestImpl.cpp index 153afd9cd7..e3a3bea798 100644 --- a/src/backends/backendsCommon/test/layerTests/NormalizationTestImpl.cpp +++ b/src/backends/backendsCommon/test/layerTests/NormalizationTestImpl.cpp @@ -12,10 +12,10 @@ #include <backendsCommon/TensorHandle.hpp> -#include <backendsCommon/test/TensorCopyUtils.hpp> -#include <backendsCommon/test/WorkloadTestUtils.hpp> +#include <armnnTestUtils/TensorCopyUtils.hpp> +#include <WorkloadTestUtils.hpp> -#include <test/TensorHelpers.hpp> +#include <TensorHelpers.hpp> namespace { diff --git a/src/backends/backendsCommon/test/layerTests/NormalizationTestImpl.hpp b/src/backends/backendsCommon/test/layerTests/NormalizationTestImpl.hpp index bbbbc4fe02..30cd57ca05 100644 --- a/src/backends/backendsCommon/test/layerTests/NormalizationTestImpl.hpp +++ b/src/backends/backendsCommon/test/layerTests/NormalizationTestImpl.hpp @@ -5,7 +5,7 @@ #pragma once -#include "LayerTestResult.hpp" +#include <armnnTestUtils/LayerTestResult.hpp> #include <armnn/Types.hpp> diff --git a/src/backends/backendsCommon/test/layerTests/PadTestImpl.cpp b/src/backends/backendsCommon/test/layerTests/PadTestImpl.cpp index a09e387b0e..628eed04b0 100644 --- a/src/backends/backendsCommon/test/layerTests/PadTestImpl.cpp +++ b/src/backends/backendsCommon/test/layerTests/PadTestImpl.cpp @@ -7,10 +7,10 @@ #include <QuantizeHelper.hpp> -#include <backendsCommon/test/TensorCopyUtils.hpp> -#include <backendsCommon/test/WorkloadTestUtils.hpp> +#include <armnnTestUtils/TensorCopyUtils.hpp> +#include <WorkloadTestUtils.hpp> -#include <test/TensorHelpers.hpp> +#include <TensorHelpers.hpp> // // Implementation templates diff --git a/src/backends/backendsCommon/test/layerTests/PadTestImpl.hpp b/src/backends/backendsCommon/test/layerTests/PadTestImpl.hpp index 4c30c427cb..1d19aa84ff 100644 --- a/src/backends/backendsCommon/test/layerTests/PadTestImpl.hpp +++ b/src/backends/backendsCommon/test/layerTests/PadTestImpl.hpp @@ -5,7 +5,7 @@ #pragma once -#include "LayerTestResult.hpp" +#include <armnnTestUtils/LayerTestResult.hpp> #include <ResolveType.hpp> diff --git a/src/backends/backendsCommon/test/layerTests/PermuteTestImpl.hpp b/src/backends/backendsCommon/test/layerTests/PermuteTestImpl.hpp index 91add545ec..26fb5044b1 100644 --- a/src/backends/backendsCommon/test/layerTests/PermuteTestImpl.hpp +++ b/src/backends/backendsCommon/test/layerTests/PermuteTestImpl.hpp @@ -11,9 +11,9 @@ #include <armnn/backends/IBackendInternal.hpp> #include <backendsCommon/WorkloadFactory.hpp> -#include <backendsCommon/test/WorkloadTestUtils.hpp> +#include <WorkloadTestUtils.hpp> -#include <test/TensorHelpers.hpp> +#include <TensorHelpers.hpp> template<typename T> LayerTestResult<T, 4> SimplePermuteTestImpl( diff --git a/src/backends/backendsCommon/test/layerTests/Pooling2dTestImpl.cpp b/src/backends/backendsCommon/test/layerTests/Pooling2dTestImpl.cpp index 1eaf1f9d66..7bb0e59547 100644 --- a/src/backends/backendsCommon/test/layerTests/Pooling2dTestImpl.cpp +++ b/src/backends/backendsCommon/test/layerTests/Pooling2dTestImpl.cpp @@ -19,10 +19,10 @@ #include <backendsCommon/WorkloadInfo.hpp> -#include <backendsCommon/test/TensorCopyUtils.hpp> -#include <backendsCommon/test/WorkloadTestUtils.hpp> +#include <armnnTestUtils/TensorCopyUtils.hpp> +#include <WorkloadTestUtils.hpp> -#include <test/TensorHelpers.hpp> +#include <TensorHelpers.hpp> namespace { diff --git a/src/backends/backendsCommon/test/layerTests/Pooling2dTestImpl.hpp b/src/backends/backendsCommon/test/layerTests/Pooling2dTestImpl.hpp index bf2c39e9a3..0a25339ff5 100644 --- a/src/backends/backendsCommon/test/layerTests/Pooling2dTestImpl.hpp +++ b/src/backends/backendsCommon/test/layerTests/Pooling2dTestImpl.hpp @@ -5,7 +5,7 @@ #pragma once -#include "LayerTestResult.hpp" +#include <armnnTestUtils/LayerTestResult.hpp> #include <armnn/Types.hpp> diff --git a/src/backends/backendsCommon/test/layerTests/Pooling3dTestImpl.cpp b/src/backends/backendsCommon/test/layerTests/Pooling3dTestImpl.cpp index 96a56fd9f0..ad438eaf6e 100644 --- a/src/backends/backendsCommon/test/layerTests/Pooling3dTestImpl.cpp +++ b/src/backends/backendsCommon/test/layerTests/Pooling3dTestImpl.cpp @@ -19,10 +19,10 @@ #include <armnn/BackendHelper.hpp> #include <backendsCommon/WorkloadInfo.hpp> -#include <backendsCommon/test/TensorCopyUtils.hpp> -#include <backendsCommon/test/WorkloadTestUtils.hpp> +#include <armnnTestUtils/TensorCopyUtils.hpp> +#include <WorkloadTestUtils.hpp> -#include <test/TensorHelpers.hpp> +#include <TensorHelpers.hpp> namespace { diff --git a/src/backends/backendsCommon/test/layerTests/Pooling3dTestImpl.hpp b/src/backends/backendsCommon/test/layerTests/Pooling3dTestImpl.hpp index e7cd6b4577..6c1d5defff 100644 --- a/src/backends/backendsCommon/test/layerTests/Pooling3dTestImpl.hpp +++ b/src/backends/backendsCommon/test/layerTests/Pooling3dTestImpl.hpp @@ -5,7 +5,7 @@ #pragma once -#include "LayerTestResult.hpp" +#include <armnnTestUtils/LayerTestResult.hpp> #include <armnn/Types.hpp> diff --git a/src/backends/backendsCommon/test/layerTests/PreluTestImpl.hpp b/src/backends/backendsCommon/test/layerTests/PreluTestImpl.hpp index 3cf85817c8..6b9aaed742 100644 --- a/src/backends/backendsCommon/test/layerTests/PreluTestImpl.hpp +++ b/src/backends/backendsCommon/test/layerTests/PreluTestImpl.hpp @@ -5,7 +5,7 @@ #pragma once -#include "LayerTestResult.hpp" +#include <armnnTestUtils/LayerTestResult.hpp> #include <QuantizeHelper.hpp> #include <ResolveType.hpp> @@ -14,11 +14,11 @@ #include <armnn/backends/IBackendInternal.hpp> #include <backendsCommon/WorkloadFactory.hpp> -#include <backendsCommon/test/TensorCopyUtils.hpp> +#include <armnnTestUtils/TensorCopyUtils.hpp> #include <backendsCommon/test/WorkloadFactoryHelper.hpp> -#include <backendsCommon/test/WorkloadTestUtils.hpp> +#include <WorkloadTestUtils.hpp> -#include <test/TensorHelpers.hpp> +#include <TensorHelpers.hpp> template<armnn::DataType ArmnnType, typename T = armnn::ResolveType<ArmnnType>> LayerTestResult<T, 4> PreluTest( diff --git a/src/backends/backendsCommon/test/layerTests/QuantizeTestImpl.cpp b/src/backends/backendsCommon/test/layerTests/QuantizeTestImpl.cpp index 029d50e718..b593620326 100644 --- a/src/backends/backendsCommon/test/layerTests/QuantizeTestImpl.cpp +++ b/src/backends/backendsCommon/test/layerTests/QuantizeTestImpl.cpp @@ -11,10 +11,10 @@ #include <armnn/backends/IBackendInternal.hpp> #include <backendsCommon/WorkloadFactory.hpp> -#include <backendsCommon/test/TensorCopyUtils.hpp> -#include <backendsCommon/test/WorkloadTestUtils.hpp> +#include <armnnTestUtils/TensorCopyUtils.hpp> +#include <WorkloadTestUtils.hpp> -#include <test/TensorHelpers.hpp> +#include <TensorHelpers.hpp> namespace { diff --git a/src/backends/backendsCommon/test/layerTests/QuantizeTestImpl.hpp b/src/backends/backendsCommon/test/layerTests/QuantizeTestImpl.hpp index 9e2f3dfe28..967155061d 100644 --- a/src/backends/backendsCommon/test/layerTests/QuantizeTestImpl.hpp +++ b/src/backends/backendsCommon/test/layerTests/QuantizeTestImpl.hpp @@ -5,7 +5,7 @@ #pragma once -#include "LayerTestResult.hpp" +#include <armnnTestUtils/LayerTestResult.hpp> #include <armnn/backends/IBackendInternal.hpp> #include <backendsCommon/WorkloadFactory.hpp> diff --git a/src/backends/backendsCommon/test/layerTests/RankTestImpl.cpp b/src/backends/backendsCommon/test/layerTests/RankTestImpl.cpp index c483d2cdc6..c04d7b2e82 100644 --- a/src/backends/backendsCommon/test/layerTests/RankTestImpl.cpp +++ b/src/backends/backendsCommon/test/layerTests/RankTestImpl.cpp @@ -5,11 +5,11 @@ #include "RankTestImpl.hpp" -#include <backendsCommon/test/DataTypeUtils.hpp> -#include <backendsCommon/test/TensorCopyUtils.hpp> -#include <backendsCommon/test/WorkloadTestUtils.hpp> +#include <DataTypeUtils.hpp> +#include <armnnTestUtils/TensorCopyUtils.hpp> +#include <WorkloadTestUtils.hpp> -#include <test/TensorHelpers.hpp> +#include <TensorHelpers.hpp> template<typename T, std::size_t n> LayerTestResult<int32_t, 1> RankTest( diff --git a/src/backends/backendsCommon/test/layerTests/RankTestImpl.hpp b/src/backends/backendsCommon/test/layerTests/RankTestImpl.hpp index 0aacee1aa5..27b0fcc609 100644 --- a/src/backends/backendsCommon/test/layerTests/RankTestImpl.hpp +++ b/src/backends/backendsCommon/test/layerTests/RankTestImpl.hpp @@ -5,7 +5,7 @@ #pragma once -#include "LayerTestResult.hpp" +#include <armnnTestUtils/LayerTestResult.hpp> #include <ResolveType.hpp> diff --git a/src/backends/backendsCommon/test/layerTests/ReduceProdTestImpl.cpp b/src/backends/backendsCommon/test/layerTests/ReduceProdTestImpl.cpp index 4fb0732141..b93eb55104 100644 --- a/src/backends/backendsCommon/test/layerTests/ReduceProdTestImpl.cpp +++ b/src/backends/backendsCommon/test/layerTests/ReduceProdTestImpl.cpp @@ -5,11 +5,11 @@ #include "ReduceProdTestImpl.hpp" -#include <backendsCommon/test/DataTypeUtils.hpp> -#include <backendsCommon/test/TensorCopyUtils.hpp> -#include <backendsCommon/test/WorkloadTestUtils.hpp> +#include <DataTypeUtils.hpp> +#include <armnnTestUtils/TensorCopyUtils.hpp> +#include <WorkloadTestUtils.hpp> -#include <test/TensorHelpers.hpp> +#include <TensorHelpers.hpp> namespace { diff --git a/src/backends/backendsCommon/test/layerTests/ReduceProdTestImpl.hpp b/src/backends/backendsCommon/test/layerTests/ReduceProdTestImpl.hpp index 97e94978f7..4d7ddde92c 100644 --- a/src/backends/backendsCommon/test/layerTests/ReduceProdTestImpl.hpp +++ b/src/backends/backendsCommon/test/layerTests/ReduceProdTestImpl.hpp @@ -5,7 +5,7 @@ #pragma once -#include "LayerTestResult.hpp" +#include <armnnTestUtils/LayerTestResult.hpp> #include <ResolveType.hpp> diff --git a/src/backends/backendsCommon/test/layerTests/ReduceSumTestImpl.cpp b/src/backends/backendsCommon/test/layerTests/ReduceSumTestImpl.cpp index 9f5422bcbc..c50fe75394 100644 --- a/src/backends/backendsCommon/test/layerTests/ReduceSumTestImpl.cpp +++ b/src/backends/backendsCommon/test/layerTests/ReduceSumTestImpl.cpp @@ -5,11 +5,11 @@ #include "ReduceSumTestImpl.hpp" -#include <backendsCommon/test/DataTypeUtils.hpp> -#include <backendsCommon/test/TensorCopyUtils.hpp> -#include <backendsCommon/test/WorkloadTestUtils.hpp> +#include <DataTypeUtils.hpp> +#include <armnnTestUtils/TensorCopyUtils.hpp> +#include <WorkloadTestUtils.hpp> -#include <test/TensorHelpers.hpp> +#include <TensorHelpers.hpp> namespace { diff --git a/src/backends/backendsCommon/test/layerTests/ReduceSumTestImpl.hpp b/src/backends/backendsCommon/test/layerTests/ReduceSumTestImpl.hpp index db23240958..a5249b41da 100644 --- a/src/backends/backendsCommon/test/layerTests/ReduceSumTestImpl.hpp +++ b/src/backends/backendsCommon/test/layerTests/ReduceSumTestImpl.hpp @@ -5,7 +5,7 @@ #pragma once -#include "LayerTestResult.hpp" +#include <armnnTestUtils/LayerTestResult.hpp> #include <ResolveType.hpp> diff --git a/src/backends/backendsCommon/test/layerTests/ReductionTestImpl.cpp b/src/backends/backendsCommon/test/layerTests/ReductionTestImpl.cpp index 7ce03ad13a..a69afb8438 100644 --- a/src/backends/backendsCommon/test/layerTests/ReductionTestImpl.cpp +++ b/src/backends/backendsCommon/test/layerTests/ReductionTestImpl.cpp @@ -5,11 +5,11 @@ #include "ReductionTestImpl.hpp" -#include <backendsCommon/test/DataTypeUtils.hpp> -#include <backendsCommon/test/TensorCopyUtils.hpp> -#include <backendsCommon/test/WorkloadTestUtils.hpp> +#include <DataTypeUtils.hpp> +#include <armnnTestUtils/TensorCopyUtils.hpp> +#include <WorkloadTestUtils.hpp> -#include <test/TensorHelpers.hpp> +#include <TensorHelpers.hpp> #include <iostream> diff --git a/src/backends/backendsCommon/test/layerTests/ReductionTestImpl.hpp b/src/backends/backendsCommon/test/layerTests/ReductionTestImpl.hpp index 495a74b64f..14809353d7 100644 --- a/src/backends/backendsCommon/test/layerTests/ReductionTestImpl.hpp +++ b/src/backends/backendsCommon/test/layerTests/ReductionTestImpl.hpp @@ -5,7 +5,7 @@ #pragma once -#include "LayerTestResult.hpp" +#include <armnnTestUtils/LayerTestResult.hpp> #include <ResolveType.hpp> diff --git a/src/backends/backendsCommon/test/layerTests/ReshapeTestImpl.cpp b/src/backends/backendsCommon/test/layerTests/ReshapeTestImpl.cpp index c3aacad4b0..ccf234588a 100644 --- a/src/backends/backendsCommon/test/layerTests/ReshapeTestImpl.cpp +++ b/src/backends/backendsCommon/test/layerTests/ReshapeTestImpl.cpp @@ -5,11 +5,11 @@ #include "ReshapeTestImpl.hpp" -#include <backendsCommon/test/DataTypeUtils.hpp> -#include <backendsCommon/test/TensorCopyUtils.hpp> -#include <backendsCommon/test/WorkloadTestUtils.hpp> +#include <DataTypeUtils.hpp> +#include <armnnTestUtils/TensorCopyUtils.hpp> +#include <WorkloadTestUtils.hpp> -#include <test/TensorHelpers.hpp> +#include <TensorHelpers.hpp> namespace { diff --git a/src/backends/backendsCommon/test/layerTests/ReshapeTestImpl.hpp b/src/backends/backendsCommon/test/layerTests/ReshapeTestImpl.hpp index a29a965fdc..c692c95bc7 100644 --- a/src/backends/backendsCommon/test/layerTests/ReshapeTestImpl.hpp +++ b/src/backends/backendsCommon/test/layerTests/ReshapeTestImpl.hpp @@ -5,7 +5,7 @@ #pragma once -#include "LayerTestResult.hpp" +#include <armnnTestUtils/LayerTestResult.hpp> #include <ResolveType.hpp> diff --git a/src/backends/backendsCommon/test/layerTests/ResizeTestImpl.cpp b/src/backends/backendsCommon/test/layerTests/ResizeTestImpl.cpp index 7706bde60d..aa5bbae8d7 100644 --- a/src/backends/backendsCommon/test/layerTests/ResizeTestImpl.cpp +++ b/src/backends/backendsCommon/test/layerTests/ResizeTestImpl.cpp @@ -12,11 +12,11 @@ #include <armnnUtils/DataLayoutIndexed.hpp> #include <armnnUtils/Permute.hpp> -#include <backendsCommon/test/DataLayoutUtils.hpp> -#include <backendsCommon/test/TensorCopyUtils.hpp> -#include <backendsCommon/test/WorkloadTestUtils.hpp> +#include <armnnTestUtils/DataLayoutUtils.hpp> +#include <armnnTestUtils/TensorCopyUtils.hpp> +#include <WorkloadTestUtils.hpp> -#include <test/TensorHelpers.hpp> +#include <TensorHelpers.hpp> namespace { diff --git a/src/backends/backendsCommon/test/layerTests/ResizeTestImpl.hpp b/src/backends/backendsCommon/test/layerTests/ResizeTestImpl.hpp index ce7d41910c..bbbe861658 100644 --- a/src/backends/backendsCommon/test/layerTests/ResizeTestImpl.hpp +++ b/src/backends/backendsCommon/test/layerTests/ResizeTestImpl.hpp @@ -5,7 +5,7 @@ #pragma once -#include "LayerTestResult.hpp" +#include <armnnTestUtils/LayerTestResult.hpp> #include <ResolveType.hpp> diff --git a/src/backends/backendsCommon/test/layerTests/RsqrtTestImpl.hpp b/src/backends/backendsCommon/test/layerTests/RsqrtTestImpl.hpp index 0df9ea7999..33d965bdac 100644 --- a/src/backends/backendsCommon/test/layerTests/RsqrtTestImpl.hpp +++ b/src/backends/backendsCommon/test/layerTests/RsqrtTestImpl.hpp @@ -5,7 +5,7 @@ #pragma once -#include "LayerTestResult.hpp" +#include <armnnTestUtils/LayerTestResult.hpp> #include <ResolveType.hpp> diff --git a/src/backends/backendsCommon/test/layerTests/ShapeTestImpl.cpp b/src/backends/backendsCommon/test/layerTests/ShapeTestImpl.cpp index d6c03141ab..3ebb5236bc 100644 --- a/src/backends/backendsCommon/test/layerTests/ShapeTestImpl.cpp +++ b/src/backends/backendsCommon/test/layerTests/ShapeTestImpl.cpp @@ -5,11 +5,11 @@ #include "ShapeTestImpl.hpp" -#include <backendsCommon/test/DataTypeUtils.hpp> -#include <backendsCommon/test/TensorCopyUtils.hpp> -#include <backendsCommon/test/WorkloadTestUtils.hpp> +#include <DataTypeUtils.hpp> +#include <armnnTestUtils/TensorCopyUtils.hpp> +#include <WorkloadTestUtils.hpp> -#include <test/TensorHelpers.hpp> +#include <TensorHelpers.hpp> template<typename T, std::size_t n> LayerTestResult<int32_t, 1> ShapeTest( diff --git a/src/backends/backendsCommon/test/layerTests/ShapeTestImpl.hpp b/src/backends/backendsCommon/test/layerTests/ShapeTestImpl.hpp index 85f7c0a453..8b95aa50c3 100644 --- a/src/backends/backendsCommon/test/layerTests/ShapeTestImpl.hpp +++ b/src/backends/backendsCommon/test/layerTests/ShapeTestImpl.hpp @@ -5,7 +5,7 @@ #pragma once -#include "LayerTestResult.hpp" +#include <armnnTestUtils/LayerTestResult.hpp> #include <ResolveType.hpp> diff --git a/src/backends/backendsCommon/test/layerTests/SinTestImpl.hpp b/src/backends/backendsCommon/test/layerTests/SinTestImpl.hpp index b04d75a255..ee7bcb94ac 100644 --- a/src/backends/backendsCommon/test/layerTests/SinTestImpl.hpp +++ b/src/backends/backendsCommon/test/layerTests/SinTestImpl.hpp @@ -5,7 +5,7 @@ #pragma once -#include "LayerTestResult.hpp" +#include <armnnTestUtils/LayerTestResult.hpp> #include <ResolveType.hpp> diff --git a/src/backends/backendsCommon/test/layerTests/SliceTestImpl.cpp b/src/backends/backendsCommon/test/layerTests/SliceTestImpl.cpp index f3e28363c2..ddf216dec0 100644 --- a/src/backends/backendsCommon/test/layerTests/SliceTestImpl.cpp +++ b/src/backends/backendsCommon/test/layerTests/SliceTestImpl.cpp @@ -9,10 +9,10 @@ #include <ResolveType.hpp> -#include <backendsCommon/test/TensorCopyUtils.hpp> -#include <backendsCommon/test/WorkloadTestUtils.hpp> +#include <armnnTestUtils/TensorCopyUtils.hpp> +#include <WorkloadTestUtils.hpp> -#include <test/TensorHelpers.hpp> +#include <TensorHelpers.hpp> namespace { diff --git a/src/backends/backendsCommon/test/layerTests/SliceTestImpl.hpp b/src/backends/backendsCommon/test/layerTests/SliceTestImpl.hpp index d308268acd..c4d62ccd71 100644 --- a/src/backends/backendsCommon/test/layerTests/SliceTestImpl.hpp +++ b/src/backends/backendsCommon/test/layerTests/SliceTestImpl.hpp @@ -5,7 +5,7 @@ #pragma once -#include "LayerTestResult.hpp" +#include <armnnTestUtils/LayerTestResult.hpp> #include <armnn/backends/IBackendInternal.hpp> #include <backendsCommon/WorkloadFactory.hpp> diff --git a/src/backends/backendsCommon/test/layerTests/SoftmaxTestImpl.cpp b/src/backends/backendsCommon/test/layerTests/SoftmaxTestImpl.cpp index 375bdaa130..05c4784bfb 100644 --- a/src/backends/backendsCommon/test/layerTests/SoftmaxTestImpl.cpp +++ b/src/backends/backendsCommon/test/layerTests/SoftmaxTestImpl.cpp @@ -11,10 +11,10 @@ #include <backendsCommon/TensorHandle.hpp> -#include <backendsCommon/test/TensorCopyUtils.hpp> -#include <backendsCommon/test/WorkloadTestUtils.hpp> +#include <armnnTestUtils/TensorCopyUtils.hpp> +#include <WorkloadTestUtils.hpp> -#include <test/TensorHelpers.hpp> +#include <TensorHelpers.hpp> #include <algorithm> diff --git a/src/backends/backendsCommon/test/layerTests/SoftmaxTestImpl.hpp b/src/backends/backendsCommon/test/layerTests/SoftmaxTestImpl.hpp index f0efe4d233..9f93c025b3 100644 --- a/src/backends/backendsCommon/test/layerTests/SoftmaxTestImpl.hpp +++ b/src/backends/backendsCommon/test/layerTests/SoftmaxTestImpl.hpp @@ -5,7 +5,7 @@ #pragma once -#include "LayerTestResult.hpp" +#include <armnnTestUtils/LayerTestResult.hpp> #include <Half.hpp> diff --git a/src/backends/backendsCommon/test/layerTests/SpaceToBatchNdTestImpl.cpp b/src/backends/backendsCommon/test/layerTests/SpaceToBatchNdTestImpl.cpp index 44a37f4fe8..69f5f5aae4 100644 --- a/src/backends/backendsCommon/test/layerTests/SpaceToBatchNdTestImpl.cpp +++ b/src/backends/backendsCommon/test/layerTests/SpaceToBatchNdTestImpl.cpp @@ -11,10 +11,10 @@ #include <armnnUtils/Permute.hpp> -#include <backendsCommon/test/TensorCopyUtils.hpp> -#include <backendsCommon/test/WorkloadTestUtils.hpp> +#include <armnnTestUtils/TensorCopyUtils.hpp> +#include <WorkloadTestUtils.hpp> -#include <test/TensorHelpers.hpp> +#include <TensorHelpers.hpp> namespace { diff --git a/src/backends/backendsCommon/test/layerTests/SpaceToBatchNdTestImpl.hpp b/src/backends/backendsCommon/test/layerTests/SpaceToBatchNdTestImpl.hpp index 69ee99bea7..1f446b7b41 100644 --- a/src/backends/backendsCommon/test/layerTests/SpaceToBatchNdTestImpl.hpp +++ b/src/backends/backendsCommon/test/layerTests/SpaceToBatchNdTestImpl.hpp @@ -4,7 +4,7 @@ // #pragma once -#include "LayerTestResult.hpp" +#include <armnnTestUtils/LayerTestResult.hpp> #include <Half.hpp> diff --git a/src/backends/backendsCommon/test/layerTests/SpaceToDepthTestImpl.cpp b/src/backends/backendsCommon/test/layerTests/SpaceToDepthTestImpl.cpp index 9175aec8c6..d8c5747917 100644 --- a/src/backends/backendsCommon/test/layerTests/SpaceToDepthTestImpl.cpp +++ b/src/backends/backendsCommon/test/layerTests/SpaceToDepthTestImpl.cpp @@ -11,10 +11,10 @@ #include <armnnUtils/Permute.hpp> -#include <backendsCommon/test/TensorCopyUtils.hpp> -#include <backendsCommon/test/WorkloadTestUtils.hpp> +#include <armnnTestUtils/TensorCopyUtils.hpp> +#include <WorkloadTestUtils.hpp> -#include <test/TensorHelpers.hpp> +#include <TensorHelpers.hpp> namespace { diff --git a/src/backends/backendsCommon/test/layerTests/SpaceToDepthTestImpl.hpp b/src/backends/backendsCommon/test/layerTests/SpaceToDepthTestImpl.hpp index 29f2646816..5a3e4934ef 100644 --- a/src/backends/backendsCommon/test/layerTests/SpaceToDepthTestImpl.hpp +++ b/src/backends/backendsCommon/test/layerTests/SpaceToDepthTestImpl.hpp @@ -4,7 +4,7 @@ // #pragma once -#include "LayerTestResult.hpp" +#include <armnnTestUtils/LayerTestResult.hpp> #include <Half.hpp> diff --git a/src/backends/backendsCommon/test/layerTests/SplitterTestImpl.cpp b/src/backends/backendsCommon/test/layerTests/SplitterTestImpl.cpp index e19a3216c3..bf95a9fec8 100644 --- a/src/backends/backendsCommon/test/layerTests/SplitterTestImpl.cpp +++ b/src/backends/backendsCommon/test/layerTests/SplitterTestImpl.cpp @@ -9,10 +9,10 @@ #include <ResolveType.hpp> -#include <backendsCommon/test/TensorCopyUtils.hpp> -#include <backendsCommon/test/WorkloadTestUtils.hpp> +#include <armnnTestUtils/TensorCopyUtils.hpp> +#include <WorkloadTestUtils.hpp> -#include <test/TensorHelpers.hpp> +#include <TensorHelpers.hpp> namespace { diff --git a/src/backends/backendsCommon/test/layerTests/SplitterTestImpl.hpp b/src/backends/backendsCommon/test/layerTests/SplitterTestImpl.hpp index 400720088c..dc76bc9233 100644 --- a/src/backends/backendsCommon/test/layerTests/SplitterTestImpl.hpp +++ b/src/backends/backendsCommon/test/layerTests/SplitterTestImpl.hpp @@ -3,7 +3,7 @@ // SPDX-License-Identifier: MIT // -#include "LayerTestResult.hpp" +#include <armnnTestUtils/LayerTestResult.hpp> #include <Half.hpp> diff --git a/src/backends/backendsCommon/test/layerTests/StackTestImpl.cpp b/src/backends/backendsCommon/test/layerTests/StackTestImpl.cpp index 25989f90ed..2a0e049937 100644 --- a/src/backends/backendsCommon/test/layerTests/StackTestImpl.cpp +++ b/src/backends/backendsCommon/test/layerTests/StackTestImpl.cpp @@ -4,7 +4,7 @@ // #include "StackTestImpl.hpp" -#include "LayerTestResult.hpp" +#include <armnnTestUtils/LayerTestResult.hpp> #include <ResolveType.hpp> @@ -12,10 +12,10 @@ #include <armnn/backends/IBackendInternal.hpp> #include <backendsCommon/WorkloadFactory.hpp> -#include <backendsCommon/test/TensorCopyUtils.hpp> -#include <backendsCommon/test/WorkloadTestUtils.hpp> +#include <armnnTestUtils/TensorCopyUtils.hpp> +#include <WorkloadTestUtils.hpp> -#include <test/TensorHelpers.hpp> +#include <TensorHelpers.hpp> namespace { diff --git a/src/backends/backendsCommon/test/layerTests/StackTestImpl.hpp b/src/backends/backendsCommon/test/layerTests/StackTestImpl.hpp index 75e9ae82d5..24e88c4f24 100644 --- a/src/backends/backendsCommon/test/layerTests/StackTestImpl.hpp +++ b/src/backends/backendsCommon/test/layerTests/StackTestImpl.hpp @@ -5,7 +5,7 @@ #pragma once -#include "LayerTestResult.hpp" +#include <armnnTestUtils/LayerTestResult.hpp> #include <Half.hpp> diff --git a/src/backends/backendsCommon/test/layerTests/StridedSliceTestImpl.cpp b/src/backends/backendsCommon/test/layerTests/StridedSliceTestImpl.cpp index af4b089cde..72ba681c7d 100644 --- a/src/backends/backendsCommon/test/layerTests/StridedSliceTestImpl.cpp +++ b/src/backends/backendsCommon/test/layerTests/StridedSliceTestImpl.cpp @@ -9,10 +9,10 @@ #include <ResolveType.hpp> -#include <backendsCommon/test/TensorCopyUtils.hpp> -#include <backendsCommon/test/WorkloadTestUtils.hpp> +#include <armnnTestUtils/TensorCopyUtils.hpp> +#include <WorkloadTestUtils.hpp> -#include <test/TensorHelpers.hpp> +#include <TensorHelpers.hpp> namespace { diff --git a/src/backends/backendsCommon/test/layerTests/StridedSliceTestImpl.hpp b/src/backends/backendsCommon/test/layerTests/StridedSliceTestImpl.hpp index 52feb0c01a..3806d33cae 100644 --- a/src/backends/backendsCommon/test/layerTests/StridedSliceTestImpl.hpp +++ b/src/backends/backendsCommon/test/layerTests/StridedSliceTestImpl.hpp @@ -5,7 +5,7 @@ #pragma once -#include "LayerTestResult.hpp" +#include <armnnTestUtils/LayerTestResult.hpp> #include <armnn/backends/IBackendInternal.hpp> #include <backendsCommon/WorkloadFactory.hpp> diff --git a/src/backends/backendsCommon/test/layerTests/SubtractionTestImpl.hpp b/src/backends/backendsCommon/test/layerTests/SubtractionTestImpl.hpp index 6113b029b8..eba0d0ab85 100644 --- a/src/backends/backendsCommon/test/layerTests/SubtractionTestImpl.hpp +++ b/src/backends/backendsCommon/test/layerTests/SubtractionTestImpl.hpp @@ -5,7 +5,7 @@ #pragma once -#include "LayerTestResult.hpp" +#include <armnnTestUtils/LayerTestResult.hpp> #include <Half.hpp> diff --git a/src/backends/backendsCommon/test/layerTests/TransposeConvolution2dTestImpl.cpp b/src/backends/backendsCommon/test/layerTests/TransposeConvolution2dTestImpl.cpp index dae7483011..34abc86400 100644 --- a/src/backends/backendsCommon/test/layerTests/TransposeConvolution2dTestImpl.cpp +++ b/src/backends/backendsCommon/test/layerTests/TransposeConvolution2dTestImpl.cpp @@ -12,13 +12,13 @@ #include <backendsCommon/TensorHandle.hpp> -#include <backendsCommon/test/DataLayoutUtils.hpp> -#include <backendsCommon/test/TensorCopyUtils.hpp> -#include <backendsCommon/test/WorkloadTestUtils.hpp> +#include <armnnTestUtils/DataLayoutUtils.hpp> +#include <armnnTestUtils/TensorCopyUtils.hpp> +#include <WorkloadTestUtils.hpp> #include <reference/RefWorkloadFactory.hpp> -#include <test/TensorHelpers.hpp> +#include <TensorHelpers.hpp> #include <doctest/doctest.h> diff --git a/src/backends/backendsCommon/test/layerTests/TransposeConvolution2dTestImpl.hpp b/src/backends/backendsCommon/test/layerTests/TransposeConvolution2dTestImpl.hpp index 0c45b0fb9b..6af9e32dec 100644 --- a/src/backends/backendsCommon/test/layerTests/TransposeConvolution2dTestImpl.hpp +++ b/src/backends/backendsCommon/test/layerTests/TransposeConvolution2dTestImpl.hpp @@ -5,7 +5,7 @@ #pragma once -#include "LayerTestResult.hpp" +#include <armnnTestUtils/LayerTestResult.hpp> #include <ResolveType.hpp> diff --git a/src/backends/backendsCommon/test/layerTests/TransposeTestImpl.hpp b/src/backends/backendsCommon/test/layerTests/TransposeTestImpl.hpp index 6be8bcb5cb..dceb386b31 100644 --- a/src/backends/backendsCommon/test/layerTests/TransposeTestImpl.hpp +++ b/src/backends/backendsCommon/test/layerTests/TransposeTestImpl.hpp @@ -12,9 +12,9 @@ #include <backendsCommon/WorkloadFactory.hpp> #include <backendsCommon/test/WorkloadFactoryHelper.hpp> -#include <backendsCommon/test/WorkloadTestUtils.hpp> +#include <WorkloadTestUtils.hpp> -#include <test/TensorHelpers.hpp> +#include <TensorHelpers.hpp> template<typename T> LayerTestResult<T, 4> SimpleTransposeTestImpl( diff --git a/src/backends/backendsCommon/test/layerTests/UnidirectionalSequenceLstmTestImpl.cpp b/src/backends/backendsCommon/test/layerTests/UnidirectionalSequenceLstmTestImpl.cpp index d17dceb3f6..5315dd3685 100644 --- a/src/backends/backendsCommon/test/layerTests/UnidirectionalSequenceLstmTestImpl.cpp +++ b/src/backends/backendsCommon/test/layerTests/UnidirectionalSequenceLstmTestImpl.cpp @@ -9,8 +9,8 @@ #include <backendsCommon/TensorHandle.hpp> -#include <backendsCommon/test/TensorCopyUtils.hpp> -#include <backendsCommon/test/WorkloadTestUtils.hpp> +#include <armnnTestUtils/TensorCopyUtils.hpp> +#include <WorkloadTestUtils.hpp> #include <ResolveType.hpp> diff --git a/src/backends/backendsCommon/test/layerTests/UnidirectionalSequenceLstmTestImpl.hpp b/src/backends/backendsCommon/test/layerTests/UnidirectionalSequenceLstmTestImpl.hpp index 20ac3135a4..88b09b9606 100644 --- a/src/backends/backendsCommon/test/layerTests/UnidirectionalSequenceLstmTestImpl.hpp +++ b/src/backends/backendsCommon/test/layerTests/UnidirectionalSequenceLstmTestImpl.hpp @@ -5,7 +5,7 @@ #pragma once -#include "LayerTestResult.hpp" +#include <armnnTestUtils/LayerTestResult.hpp> #include <armnn/backends/IBackendInternal.hpp> #include <backendsCommon/WorkloadFactory.hpp> diff --git a/src/backends/cl/test/CMakeLists.txt b/src/backends/cl/test/CMakeLists.txt index 8ee532a323..af116a4e9f 100644 --- a/src/backends/cl/test/CMakeLists.txt +++ b/src/backends/cl/test/CMakeLists.txt @@ -37,6 +37,7 @@ endif() add_library(armnnClBackendUnitTests OBJECT ${armnnClBackendUnitTests_sources}) target_include_directories(armnnClBackendUnitTests PRIVATE ${PROJECT_SOURCE_DIR}/src/armnn) target_include_directories(armnnClBackendUnitTests PRIVATE ${PROJECT_SOURCE_DIR}/src/armnnUtils) +target_include_directories(armnnClBackendUnitTests PRIVATE ${PROJECT_SOURCE_DIR}/src/armnnTestUtils) target_include_directories(armnnClBackendUnitTests PRIVATE ${PROJECT_SOURCE_DIR}/src/backends) target_include_directories(armnnClBackendUnitTests PRIVATE ${PROJECT_SOURCE_DIR}/src/profiling) target_include_directories(armnnClBackendUnitTests PRIVATE ${PROJECT_SOURCE_DIR}/profiling/common/include) diff --git a/src/backends/cl/test/ClCreateWorkloadTests.cpp b/src/backends/cl/test/ClCreateWorkloadTests.cpp index 4e403283e7..dd53f38382 100644 --- a/src/backends/cl/test/ClCreateWorkloadTests.cpp +++ b/src/backends/cl/test/ClCreateWorkloadTests.cpp @@ -10,8 +10,8 @@ #include <armnn/utility/IgnoreUnused.hpp> #include <armnn/utility/PolymorphicDowncast.hpp> #include <backendsCommon/MemCopyWorkload.hpp> -#include <backendsCommon/test/TensorCopyUtils.hpp> -#include <backendsCommon/test/WorkloadTestUtils.hpp> +#include <armnnTestUtils/TensorCopyUtils.hpp> +#include <WorkloadTestUtils.hpp> #include <aclCommon/test/CreateWorkloadClNeon.hpp> #include <aclCommon/ArmComputeTensorUtils.hpp> diff --git a/src/backends/cl/test/ClFallbackTests.cpp b/src/backends/cl/test/ClFallbackTests.cpp index cfe2b369ac..6ac94337ba 100644 --- a/src/backends/cl/test/ClFallbackTests.cpp +++ b/src/backends/cl/test/ClFallbackTests.cpp @@ -3,9 +3,9 @@ // SPDX-License-Identifier: MIT // -#include <backendsCommon/test/CommonTestUtils.hpp> +#include <CommonTestUtils.hpp> -#include <test/GraphUtils.hpp> +#include <GraphUtils.hpp> #include <doctest/doctest.h> diff --git a/src/backends/cl/test/ClLayerSupportTests.cpp b/src/backends/cl/test/ClLayerSupportTests.cpp index b18da11176..1747cb6763 100644 --- a/src/backends/cl/test/ClLayerSupportTests.cpp +++ b/src/backends/cl/test/ClLayerSupportTests.cpp @@ -8,7 +8,7 @@ #include <layers/ConvertFp16ToFp32Layer.hpp> #include <layers/ConvertFp32ToFp16Layer.hpp> #include <layers/MeanLayer.hpp> -#include <test/TensorHelpers.hpp> +#include <TensorHelpers.hpp> #include <backendsCommon/TensorHandle.hpp> #include <cl/ClWorkloadFactory.hpp> diff --git a/src/backends/cl/test/ClLayerTests.cpp b/src/backends/cl/test/ClLayerTests.cpp index 6c27d51853..967a7e446c 100644 --- a/src/backends/cl/test/ClLayerTests.cpp +++ b/src/backends/cl/test/ClLayerTests.cpp @@ -6,8 +6,8 @@ #include "ClContextControlFixture.hpp" #include "ClWorkloadFactoryHelper.hpp" -#include "test/TensorHelpers.hpp" -#include "test/UnitTests.hpp" +#include <TensorHelpers.hpp> +#include <UnitTests.hpp> #include <cl/ClLayerSupport.hpp> #include <cl/ClWorkloadFactory.hpp> diff --git a/src/backends/cl/test/ClOptimizedNetworkTests.cpp b/src/backends/cl/test/ClOptimizedNetworkTests.cpp index 4c2a474526..cf17eae208 100644 --- a/src/backends/cl/test/ClOptimizedNetworkTests.cpp +++ b/src/backends/cl/test/ClOptimizedNetworkTests.cpp @@ -7,7 +7,7 @@ #include <Network.hpp> -#include <test/GraphUtils.hpp> +#include <GraphUtils.hpp> #include <cl/ClWorkloadFactory.hpp> #include <cl/ClBackendContext.hpp> diff --git a/src/backends/cl/test/OpenClTimerTest.cpp b/src/backends/cl/test/OpenClTimerTest.cpp index 0da1db73b8..85fdc81a94 100644 --- a/src/backends/cl/test/OpenClTimerTest.cpp +++ b/src/backends/cl/test/OpenClTimerTest.cpp @@ -7,7 +7,7 @@ #include "ClWorkloadFactoryHelper.hpp" -#include <test/TensorHelpers.hpp> +#include <TensorHelpers.hpp> #include <backendsCommon/TensorHandle.hpp> #include <backendsCommon/WorkloadFactory.hpp> @@ -16,8 +16,8 @@ #include <cl/ClWorkloadFactory.hpp> #include <cl/OpenClTimer.hpp> -#include <backendsCommon/test/TensorCopyUtils.hpp> -#include <backendsCommon/test/WorkloadTestUtils.hpp> +#include <armnnTestUtils/TensorCopyUtils.hpp> +#include <WorkloadTestUtils.hpp> #include <arm_compute/runtime/CL/CLScheduler.h> diff --git a/src/backends/neon/test/CMakeLists.txt b/src/backends/neon/test/CMakeLists.txt index 9a45b7ddbe..e4c5b34532 100644 --- a/src/backends/neon/test/CMakeLists.txt +++ b/src/backends/neon/test/CMakeLists.txt @@ -53,6 +53,7 @@ endif() add_library(armnnNeonBackendUnitTests OBJECT ${armnnNeonBackendUnitTests_sources}) target_include_directories(armnnNeonBackendUnitTests PRIVATE ${PROJECT_SOURCE_DIR}/src/armnn) target_include_directories(armnnNeonBackendUnitTests PRIVATE ${PROJECT_SOURCE_DIR}/src/armnnUtils) +target_include_directories(armnnNeonBackendUnitTests PRIVATE ${PROJECT_SOURCE_DIR}/src/armnnTestUtils) target_include_directories(armnnNeonBackendUnitTests PRIVATE ${PROJECT_SOURCE_DIR}/src/backends) target_include_directories(armnnNeonBackendUnitTests PRIVATE ${PROJECT_SOURCE_DIR}/src/profiling) target_include_directories(armnnNeonBackendUnitTests PRIVATE ${PROJECT_SOURCE_DIR}/profiling/common/include) diff --git a/src/backends/neon/test/NeonFallbackTests.cpp b/src/backends/neon/test/NeonFallbackTests.cpp index ae6cfae3fa..d2de843fd9 100644 --- a/src/backends/neon/test/NeonFallbackTests.cpp +++ b/src/backends/neon/test/NeonFallbackTests.cpp @@ -3,10 +3,10 @@ // SPDX-License-Identifier: MIT // -#include <backendsCommon/test/CommonTestUtils.hpp> +#include <CommonTestUtils.hpp> #include <backendsCommon/test/mockBackend/MockImportBackend.hpp> -#include <test/GraphUtils.hpp> +#include <GraphUtils.hpp> #include <doctest/doctest.h> diff --git a/src/backends/neon/test/NeonLayerSupportTests.cpp b/src/backends/neon/test/NeonLayerSupportTests.cpp index 494c8f927f..fbb91a96c7 100644 --- a/src/backends/neon/test/NeonLayerSupportTests.cpp +++ b/src/backends/neon/test/NeonLayerSupportTests.cpp @@ -7,7 +7,7 @@ #include <layers/ConvertFp16ToFp32Layer.hpp> #include <layers/ConvertFp32ToFp16Layer.hpp> -#include <test/TensorHelpers.hpp> +#include <TensorHelpers.hpp> #include <backendsCommon/TensorHandle.hpp> #include <neon/NeonWorkloadFactory.hpp> diff --git a/src/backends/neon/test/NeonLayerTests.cpp b/src/backends/neon/test/NeonLayerTests.cpp index 1750f24853..3b63a88457 100644 --- a/src/backends/neon/test/NeonLayerTests.cpp +++ b/src/backends/neon/test/NeonLayerTests.cpp @@ -5,8 +5,8 @@ #include "NeonWorkloadFactoryHelper.hpp" -#include <test/TensorHelpers.hpp> -#include <test/UnitTests.hpp> +#include <TensorHelpers.hpp> +#include <UnitTests.hpp> #include <neon/NeonLayerSupport.hpp> #include <neon/NeonWorkloadFactory.hpp> diff --git a/src/backends/neon/test/NeonLayerTests_NDK_Bug.cpp b/src/backends/neon/test/NeonLayerTests_NDK_Bug.cpp index 5a65b155ef..24109605cc 100644 --- a/src/backends/neon/test/NeonLayerTests_NDK_Bug.cpp +++ b/src/backends/neon/test/NeonLayerTests_NDK_Bug.cpp @@ -5,8 +5,9 @@ #include "NeonWorkloadFactoryHelper.hpp" +#include <UnitTests.hpp> +#include <backendsCommon/test/LayerTests.hpp> #include <neon/NeonWorkloadFactory.hpp> -#include <test/UnitTests.hpp> #include <doctest/doctest.h> diff --git a/src/backends/neon/test/NeonTensorHandleTests.cpp b/src/backends/neon/test/NeonTensorHandleTests.cpp index 685a0744e7..9d69a5c2d0 100644 --- a/src/backends/neon/test/NeonTensorHandleTests.cpp +++ b/src/backends/neon/test/NeonTensorHandleTests.cpp @@ -11,9 +11,9 @@ #include <armnn/utility/NumericCast.hpp> #include <armnn/utility/PolymorphicDowncast.hpp> -#include <test/GraphUtils.hpp> +#include <GraphUtils.hpp> #include <arm_compute/runtime/Allocator.h> -#include <backendsCommon/test/CommonTestUtils.hpp> +#include <CommonTestUtils.hpp> #include <doctest/doctest.h> #include <armnn/utility/Assert.hpp> diff --git a/src/backends/neon/test/NeonTimerTest.cpp b/src/backends/neon/test/NeonTimerTest.cpp index 87e15679df..3596dfa87c 100644 --- a/src/backends/neon/test/NeonTimerTest.cpp +++ b/src/backends/neon/test/NeonTimerTest.cpp @@ -6,7 +6,7 @@ #include "NeonWorkloadFactoryHelper.hpp" -#include <test/TensorHelpers.hpp> +#include <TensorHelpers.hpp> #include <backendsCommon/TensorHandle.hpp> #include <backendsCommon/WorkloadFactory.hpp> @@ -15,8 +15,8 @@ #include <neon/NeonWorkloadFactory.hpp> #include <backendsCommon/test/LayerTests.hpp> -#include <backendsCommon/test/TensorCopyUtils.hpp> -#include <backendsCommon/test/WorkloadTestUtils.hpp> +#include <armnnTestUtils/TensorCopyUtils.hpp> +#include <WorkloadTestUtils.hpp> #include <doctest/doctest.h> diff --git a/src/backends/reference/test/CMakeLists.txt b/src/backends/reference/test/CMakeLists.txt index d7c5da896a..d5ce3553f1 100644 --- a/src/backends/reference/test/CMakeLists.txt +++ b/src/backends/reference/test/CMakeLists.txt @@ -23,6 +23,7 @@ list(APPEND armnnRefBackendUnitTests_sources add_library(armnnRefBackendUnitTests OBJECT ${armnnRefBackendUnitTests_sources}) target_include_directories(armnnRefBackendUnitTests PRIVATE ${PROJECT_SOURCE_DIR}/src/armnn) target_include_directories(armnnRefBackendUnitTests PRIVATE ${PROJECT_SOURCE_DIR}/src/armnnUtils) +target_include_directories(armnnRefBackendUnitTests PRIVATE ${PROJECT_SOURCE_DIR}/src/armnnTestUtils) target_include_directories(armnnRefBackendUnitTests PRIVATE ${PROJECT_SOURCE_DIR}/src/backends) target_include_directories(armnnRefBackendUnitTests PRIVATE ${PROJECT_SOURCE_DIR}/src/profiling) target_include_directories(armnnRefBackendUnitTests PRIVATE ${PROJECT_SOURCE_DIR}/profiling/common/include) diff --git a/src/backends/reference/test/RefCreateWorkloadTests.cpp b/src/backends/reference/test/RefCreateWorkloadTests.cpp index fae8d0cdd4..e865f25f49 100644 --- a/src/backends/reference/test/RefCreateWorkloadTests.cpp +++ b/src/backends/reference/test/RefCreateWorkloadTests.cpp @@ -3,7 +3,7 @@ // SPDX-License-Identifier: MIT // -#include <test/CreateWorkload.hpp> +#include <CreateWorkload.hpp> #include <armnn/utility/PolymorphicDowncast.hpp> #include <reference/RefTensorHandle.hpp> diff --git a/src/backends/reference/test/RefLayerSupportTests.cpp b/src/backends/reference/test/RefLayerSupportTests.cpp index 1adc54e990..f0eb62f12c 100644 --- a/src/backends/reference/test/RefLayerSupportTests.cpp +++ b/src/backends/reference/test/RefLayerSupportTests.cpp @@ -5,7 +5,8 @@ #include <layers/ConvertFp16ToFp32Layer.hpp> #include <layers/ConvertFp32ToFp16Layer.hpp> -#include <test/TensorHelpers.hpp> + +#include <TensorHelpers.hpp> #include <backendsCommon/TensorHandle.hpp> #include <reference/RefWorkloadFactory.hpp> diff --git a/src/backends/reference/test/RefLayerTests.cpp b/src/backends/reference/test/RefLayerTests.cpp index 13487dd53f..9f5814b395 100644 --- a/src/backends/reference/test/RefLayerTests.cpp +++ b/src/backends/reference/test/RefLayerTests.cpp @@ -9,7 +9,7 @@ #include <reference/RefWorkloadFactory.hpp> -#include <test/UnitTests.hpp> +#include <UnitTests.hpp> TEST_SUITE("Compute_Reference") { diff --git a/src/backends/reference/test/RefOptimizedNetworkTests.cpp b/src/backends/reference/test/RefOptimizedNetworkTests.cpp index 578d667983..5b128a1f6c 100644 --- a/src/backends/reference/test/RefOptimizedNetworkTests.cpp +++ b/src/backends/reference/test/RefOptimizedNetworkTests.cpp @@ -7,7 +7,7 @@ #include <Network.hpp> #include <reference/RefWorkloadFactory.hpp> -#include <test/GraphUtils.hpp> +#include <GraphUtils.hpp> #include <doctest/doctest.h> diff --git a/src/backends/reference/workloads/RefChannelShuffleWorkload.cpp b/src/backends/reference/workloads/RefChannelShuffleWorkload.cpp index 6571715c63..9f8514d009 100644 --- a/src/backends/reference/workloads/RefChannelShuffleWorkload.cpp +++ b/src/backends/reference/workloads/RefChannelShuffleWorkload.cpp @@ -3,7 +3,6 @@ // SPDX-License-Identifier: MIT // -#include <backendsCommon/test/DataTypeUtils.hpp> #include <armnn/backends/ITensorHandleFactory.hpp> #include <armnnUtils/Transpose.hpp> #include "RefChannelShuffleWorkload.hpp" |