From ac42efd972b7d03da17f057b2ceaaac5d6e96b1a Mon Sep 17 00:00:00 2001 From: David Beck Date: Wed, 26 Sep 2018 17:41:13 +0100 Subject: IVGCVSW-1900 : CL backend folder structure * moving backends/ClWorkloads to backends/cl * and moving pure Cl workload related code to backends/cl/workloads Change-Id: I019a3c6b4da5e7a23074bf03fb057e63199ad129 --- src/backends/test/ActivationTestImpl.hpp | 10 +++++----- src/backends/test/ArmComputeCl.cpp | 6 +++--- src/backends/test/BatchNormTestImpl.hpp | 8 ++++---- src/backends/test/ClContextControlFixture.hpp | 2 +- src/backends/test/Conv2dTestImpl.hpp | 6 +++--- src/backends/test/CreateWorkloadCl.cpp | 10 +++++----- src/backends/test/IsLayerSupportedTest.cpp | 10 +++++----- src/backends/test/LayerReleaseConstantDataTest.cpp | 8 ++++---- src/backends/test/LayerTests.cpp | 2 +- src/backends/test/LstmTestImpl.hpp | 8 ++++---- src/backends/test/MemCopyTests.cpp | 4 ++-- src/backends/test/NormTestImpl.hpp | 8 ++++---- src/backends/test/PermuteTestImpl.hpp | 6 +++--- src/backends/test/Pooling2dTestImpl.hpp | 6 +++--- src/backends/test/ReshapeTestImpl.hpp | 6 +++--- src/backends/test/SoftmaxTestImpl.hpp | 6 +++--- src/backends/test/SplitterTestImpl.hpp | 8 ++++---- src/backends/test/TensorCopyUtils.cpp | 4 ++-- src/backends/test/TensorCopyUtils.hpp | 4 ++-- 19 files changed, 61 insertions(+), 61 deletions(-) (limited to 'src/backends/test') diff --git a/src/backends/test/ActivationTestImpl.hpp b/src/backends/test/ActivationTestImpl.hpp index a5d327c287..e7d3d6a9c1 100644 --- a/src/backends/test/ActivationTestImpl.hpp +++ b/src/backends/test/ActivationTestImpl.hpp @@ -9,11 +9,11 @@ #include #include -#include "test/TensorHelpers.hpp" +#include #include "QuantizeHelper.hpp" -#include "backends/CpuTensorHandle.hpp" -#include "backends/WorkloadFactory.hpp" +#include +#include #include "ActivationFixture.hpp" #include @@ -122,7 +122,7 @@ LayerTestResult BoundedReLuUpperBoundOnlyTest(armnn::IWorkloadFactory& 0.999f, 1.2f, 0.89f, 6.1f, }; - // Calculated manually. + // Calculated manually. std::vector output = std::vector{ 0.0f, 0.1f, 0.5f, 6.0f, 0.786f, 5.9875f, 0.0f, 0.384f, @@ -147,7 +147,7 @@ LayerTestResult BoundedReLuUint8UpperBoundOnlyTest(armnn::IWorkloadF 251, 8, 92 }; - // Calculated manually. + // Calculated manually. std::vector output = std::vector{ 0, 122, 0, 255, 0, 58 diff --git a/src/backends/test/ArmComputeCl.cpp b/src/backends/test/ArmComputeCl.cpp index 5ff94c1056..4f1a84dfad 100644 --- a/src/backends/test/ArmComputeCl.cpp +++ b/src/backends/test/ArmComputeCl.cpp @@ -7,10 +7,10 @@ #include "LayerTests.hpp" #include -#include -#include +#include +#include #include -#include +#include #include "ActivationFixture.hpp" #include "ClContextControlFixture.hpp" diff --git a/src/backends/test/BatchNormTestImpl.hpp b/src/backends/test/BatchNormTestImpl.hpp index 7126db9074..35f4e4c89c 100644 --- a/src/backends/test/BatchNormTestImpl.hpp +++ b/src/backends/test/BatchNormTestImpl.hpp @@ -8,12 +8,12 @@ #include #include -#include "test/TensorHelpers.hpp" +#include -#include "backends/CpuTensorHandle.hpp" -#include "backends/WorkloadFactory.hpp" +#include +#include -#include "backends/test/QuantizeHelper.hpp" +#include template diff --git a/src/backends/test/ClContextControlFixture.hpp b/src/backends/test/ClContextControlFixture.hpp index 54c5a4f505..c81428ff82 100644 --- a/src/backends/test/ClContextControlFixture.hpp +++ b/src/backends/test/ClContextControlFixture.hpp @@ -5,7 +5,7 @@ #pragma once -#include "backends/ClContextControl.hpp" +#include template struct ClContextControlFixtureBase diff --git a/src/backends/test/Conv2dTestImpl.hpp b/src/backends/test/Conv2dTestImpl.hpp index eb7165bf09..ce193659a1 100644 --- a/src/backends/test/Conv2dTestImpl.hpp +++ b/src/backends/test/Conv2dTestImpl.hpp @@ -9,11 +9,11 @@ #include #include -#include "test/TensorHelpers.hpp" +#include #include "QuantizeHelper.hpp" -#include "backends/CpuTensorHandle.hpp" -#include "backends/WorkloadFactory.hpp" +#include +#include // Mapping from input type to bias type for fully connected layers. // float => float, uint8_t => int32_t diff --git a/src/backends/test/CreateWorkloadCl.cpp b/src/backends/test/CreateWorkloadCl.cpp index cc0e12d202..078ef8c52d 100644 --- a/src/backends/test/CreateWorkloadCl.cpp +++ b/src/backends/test/CreateWorkloadCl.cpp @@ -2,15 +2,15 @@ // Copyright © 2017 Arm Ltd. All rights reserved. // SPDX-License-Identifier: MIT // -#include +#include #include #include -#include -#include -#include +#include +#include +#include #include "ClContextControlFixture.hpp" -#include "test/CreateWorkloadClNeon.hpp" +#include boost::test_tools::predicate_result CompareIClTensorHandleShape(IClTensorHandle* tensorHandle, std::initializer_list expectedDimensions) diff --git a/src/backends/test/IsLayerSupportedTest.cpp b/src/backends/test/IsLayerSupportedTest.cpp index 7117e20db5..089822dade 100644 --- a/src/backends/test/IsLayerSupportedTest.cpp +++ b/src/backends/test/IsLayerSupportedTest.cpp @@ -4,7 +4,7 @@ // #include -#include "test/TensorHelpers.hpp" +#include #include "LayerTests.hpp" #include @@ -13,13 +13,13 @@ #include #include -#include +#include #include "IsLayerSupportedTestImpl.hpp" -#include "ClContextControlFixture.hpp" +#include -#include "layers/ConvertFp16ToFp32Layer.hpp" -#include "layers/ConvertFp32ToFp16Layer.hpp" +#include +#include BOOST_AUTO_TEST_SUITE(IsLayerSupported) diff --git a/src/backends/test/LayerReleaseConstantDataTest.cpp b/src/backends/test/LayerReleaseConstantDataTest.cpp index 7566c72352..7549dfd5f8 100644 --- a/src/backends/test/LayerReleaseConstantDataTest.cpp +++ b/src/backends/test/LayerReleaseConstantDataTest.cpp @@ -6,13 +6,13 @@ #include #include -#include "backends/WorkloadData.hpp" -#include "Graph.hpp" +#include +#include #include -#include "backends/CpuTensorHandle.hpp" -#include "backends/ClWorkloadFactory.hpp" +#include +#include using namespace armnn; using namespace std; diff --git a/src/backends/test/LayerTests.cpp b/src/backends/test/LayerTests.cpp index 4f6cb93670..55f4a5c5f9 100644 --- a/src/backends/test/LayerTests.cpp +++ b/src/backends/test/LayerTests.cpp @@ -17,7 +17,7 @@ #include #ifdef ARMCOMPUTECL_ENABLED -#include +#include #include #endif diff --git a/src/backends/test/LstmTestImpl.hpp b/src/backends/test/LstmTestImpl.hpp index 2c4e166084..7d57c86a67 100644 --- a/src/backends/test/LstmTestImpl.hpp +++ b/src/backends/test/LstmTestImpl.hpp @@ -8,12 +8,12 @@ #include #include -#include "test/TensorHelpers.hpp" +#include #include "QuantizeHelper.hpp" -#include "backends/CpuTensorHandle.hpp" +#include #include -#include "backends/WorkloadFactory.hpp" +#include LayerTestResult LstmNoCifgNoPeepholeNoProjectionTestImpl(armnn::IWorkloadFactory& workloadFactory, const boost::multi_array& input, @@ -283,7 +283,7 @@ LstmLayerFloat32NoCifgWithPeepholeWithProjectionTestImpl(armnn::IWorkloadFactory AddInputToWorkload(data, info, inputTensorInfo, inputHandle.get()); AddInputToWorkload(data, info, outputStateInTensorInfo, outputStateInHandle.get()); AddInputToWorkload(data, info, cellStateInTensorInfo, cellStateInHandle.get()); - + AddOutputToWorkload(data, info, scratchBufferTensorInfo, scratchHandle.get()); AddOutputToWorkload(data, info, outputStateOutTensorInfo, outputStateOutHandle.get()); AddOutputToWorkload(data, info, cellStateOutTensorInfo, cellStateOutHandle.get()); diff --git a/src/backends/test/MemCopyTests.cpp b/src/backends/test/MemCopyTests.cpp index a1dc34a6ec..f66caffd92 100644 --- a/src/backends/test/MemCopyTests.cpp +++ b/src/backends/test/MemCopyTests.cpp @@ -8,13 +8,13 @@ #include #include #if ARMCOMPUTECL_ENABLED -#include +#include #endif #if ARMCOMPUTENEON_ENABLED #include #endif #include -#include "test/TensorHelpers.hpp" +#include #include "TensorCopyUtils.hpp" #include "WorkloadTestUtils.hpp" diff --git a/src/backends/test/NormTestImpl.hpp b/src/backends/test/NormTestImpl.hpp index 2690313655..dfa2f7072e 100644 --- a/src/backends/test/NormTestImpl.hpp +++ b/src/backends/test/NormTestImpl.hpp @@ -3,11 +3,11 @@ // SPDX-License-Identifier: MIT // -#include "armnn/Exceptions.hpp" -#include "armnn/LayerSupport.hpp" +#include +#include -#include "backends/CpuTensorHandle.hpp" -#include "backends/WorkloadFactory.hpp" +#include +#include LayerTestResult SimpleNormalizationTestImpl(armnn::IWorkloadFactory& workloadFactory, armnn::NormalizationAlgorithmChannel normChannel, diff --git a/src/backends/test/PermuteTestImpl.hpp b/src/backends/test/PermuteTestImpl.hpp index b49c539b2e..2caf2c8d2b 100644 --- a/src/backends/test/PermuteTestImpl.hpp +++ b/src/backends/test/PermuteTestImpl.hpp @@ -9,11 +9,11 @@ #include #include -#include "test/TensorHelpers.hpp" +#include #include "QuantizeHelper.hpp" -#include "backends/CpuTensorHandle.hpp" -#include "backends/WorkloadFactory.hpp" +#include +#include template LayerTestResult SimplePermuteTestImpl( diff --git a/src/backends/test/Pooling2dTestImpl.hpp b/src/backends/test/Pooling2dTestImpl.hpp index e8c7e86e9d..4c69fb9f46 100644 --- a/src/backends/test/Pooling2dTestImpl.hpp +++ b/src/backends/test/Pooling2dTestImpl.hpp @@ -9,11 +9,11 @@ #include #include -#include "test/TensorHelpers.hpp" +#include #include "QuantizeHelper.hpp" -#include "backends/CpuTensorHandle.hpp" -#include "backends/WorkloadFactory.hpp" +#include +#include #include diff --git a/src/backends/test/ReshapeTestImpl.hpp b/src/backends/test/ReshapeTestImpl.hpp index 5d32d9d3a6..cbd3b58798 100644 --- a/src/backends/test/ReshapeTestImpl.hpp +++ b/src/backends/test/ReshapeTestImpl.hpp @@ -9,11 +9,11 @@ #include #include -#include "test/TensorHelpers.hpp" +#include #include "QuantizeHelper.hpp" -#include "backends/CpuTensorHandle.hpp" -#include "backends/WorkloadFactory.hpp" +#include +#include template LayerTestResult SimpleReshapeTestImpl( diff --git a/src/backends/test/SoftmaxTestImpl.hpp b/src/backends/test/SoftmaxTestImpl.hpp index 5bc13fa21c..7ca5f70e85 100644 --- a/src/backends/test/SoftmaxTestImpl.hpp +++ b/src/backends/test/SoftmaxTestImpl.hpp @@ -9,11 +9,11 @@ #include #include -#include "test/TensorHelpers.hpp" +#include #include "QuantizeHelper.hpp" -#include "backends/CpuTensorHandle.hpp" -#include "backends/WorkloadFactory.hpp" +#include +#include #include diff --git a/src/backends/test/SplitterTestImpl.hpp b/src/backends/test/SplitterTestImpl.hpp index 5dcc412d0e..4578ce5792 100644 --- a/src/backends/test/SplitterTestImpl.hpp +++ b/src/backends/test/SplitterTestImpl.hpp @@ -8,12 +8,12 @@ #include #include -#include "test/TensorHelpers.hpp" +#include -#include "backends/CpuTensorHandle.hpp" -#include "backends/WorkloadFactory.hpp" +#include +#include -#include "backends/test/QuantizeHelper.hpp" +#include template diff --git a/src/backends/test/TensorCopyUtils.cpp b/src/backends/test/TensorCopyUtils.cpp index b2a9efc01e..e92469aaa3 100644 --- a/src/backends/test/TensorCopyUtils.cpp +++ b/src/backends/test/TensorCopyUtils.cpp @@ -11,7 +11,7 @@ #include "TensorCopyUtils.hpp" #ifdef ARMCOMPUTECL_ENABLED -#include +#include #endif #if ARMCOMPUTENEON_ENABLED @@ -22,7 +22,7 @@ #include #endif -#include "backends/CpuTensorHandle.hpp" +#include void CopyDataToITensorHandle(armnn::ITensorHandle* tensorHandle, const void* mem) { diff --git a/src/backends/test/TensorCopyUtils.hpp b/src/backends/test/TensorCopyUtils.hpp index 0cec839903..4a3ba64239 100644 --- a/src/backends/test/TensorCopyUtils.hpp +++ b/src/backends/test/TensorCopyUtils.hpp @@ -4,8 +4,8 @@ // #pragma once -#include "armnn/Tensor.hpp" -#include "backends/ITensorHandle.hpp" +#include +#include void CopyDataToITensorHandle(armnn::ITensorHandle* tensorHandle, const void* mem); -- cgit v1.2.1