diff options
-rw-r--r-- | Android.mk | 2 | ||||
-rw-r--r-- | src/armnn/LayerSupport.cpp | 8 | ||||
-rw-r--r-- | src/armnn/LoadedNetwork.hpp | 16 | ||||
-rw-r--r-- | src/armnn/test/CreateWorkloadClNeon.hpp | 2 | ||||
-rw-r--r-- | src/armnn/test/NetworkTests.cpp | 12 | ||||
-rw-r--r-- | src/armnn/test/UnitTests.hpp | 8 | ||||
-rw-r--r-- | src/backends/CMakeLists.txt | 5 | ||||
-rw-r--r-- | src/backends/ClWorkloads/backend.mk | 4 | ||||
-rw-r--r-- | src/backends/NeonWorkloads/backend.mk | 4 | ||||
-rw-r--r-- | src/backends/RefWorkloads.hpp | 53 | ||||
-rw-r--r-- | src/backends/RefWorkloads/backend.cmake | 7 | ||||
-rw-r--r-- | src/backends/RefWorkloads/backend.mk | 49 | ||||
-rw-r--r-- | src/backends/WorkloadFactory.cpp | 10 | ||||
-rw-r--r-- | src/backends/reference/CMakeLists.txt | 19 | ||||
-rw-r--r-- | src/backends/reference/RefLayerSupport.cpp (renamed from src/backends/RefLayerSupport.cpp) | 0 | ||||
-rw-r--r-- | src/backends/reference/RefLayerSupport.hpp (renamed from src/backends/RefLayerSupport.hpp) | 0 | ||||
-rw-r--r-- | src/backends/reference/RefWorkloadFactory.cpp (renamed from src/backends/RefWorkloadFactory.cpp) | 8 | ||||
-rw-r--r-- | src/backends/reference/RefWorkloadFactory.hpp (renamed from src/backends/RefWorkloadFactory.hpp) | 4 | ||||
-rw-r--r-- | src/backends/reference/backend.cmake | 7 | ||||
-rw-r--r-- | src/backends/reference/backend.mk | 54 | ||||
-rw-r--r-- | src/backends/reference/test/CMakeLists.txt | 4 | ||||
-rw-r--r-- | src/backends/reference/workloads/Activation.cpp (renamed from src/backends/RefWorkloads/Activation.cpp) | 0 | ||||
-rw-r--r-- | src/backends/reference/workloads/Activation.hpp (renamed from src/backends/RefWorkloads/Activation.hpp) | 0 | ||||
-rw-r--r-- | src/backends/reference/workloads/ArithmeticFunction.cpp (renamed from src/backends/RefWorkloads/ArithmeticFunction.cpp) | 0 | ||||
-rw-r--r-- | src/backends/reference/workloads/ArithmeticFunction.hpp (renamed from src/backends/RefWorkloads/ArithmeticFunction.hpp) | 0 | ||||
-rw-r--r-- | src/backends/reference/workloads/BatchNormImpl.hpp (renamed from src/backends/RefWorkloads/BatchNormImpl.hpp) | 0 | ||||
-rw-r--r-- | src/backends/reference/workloads/Broadcast.cpp (renamed from src/backends/RefWorkloads/Broadcast.cpp) | 0 | ||||
-rw-r--r-- | src/backends/reference/workloads/Broadcast.hpp (renamed from src/backends/RefWorkloads/Broadcast.hpp) | 0 | ||||
-rw-r--r-- | src/backends/reference/workloads/CMakeLists.txt (renamed from src/backends/RefWorkloads/CMakeLists.txt) | 11 | ||||
-rw-r--r-- | src/backends/reference/workloads/ConvImpl.cpp (renamed from src/backends/RefWorkloads/ConvImpl.cpp) | 0 | ||||
-rw-r--r-- | src/backends/reference/workloads/ConvImpl.hpp (renamed from src/backends/RefWorkloads/ConvImpl.hpp) | 0 | ||||
-rw-r--r-- | src/backends/reference/workloads/FullyConnected.cpp (renamed from src/backends/RefWorkloads/FullyConnected.cpp) | 0 | ||||
-rw-r--r-- | src/backends/reference/workloads/FullyConnected.hpp (renamed from src/backends/RefWorkloads/FullyConnected.hpp) | 0 | ||||
-rw-r--r-- | src/backends/reference/workloads/Merger.hpp (renamed from src/backends/RefWorkloads/Merger.hpp) | 0 | ||||
-rw-r--r-- | src/backends/reference/workloads/Pooling2d.cpp (renamed from src/backends/RefWorkloads/Pooling2d.cpp) | 0 | ||||
-rw-r--r-- | src/backends/reference/workloads/Pooling2d.hpp (renamed from src/backends/RefWorkloads/Pooling2d.hpp) | 0 | ||||
-rw-r--r-- | src/backends/reference/workloads/RefActivationFloat32Workload.cpp (renamed from src/backends/RefWorkloads/RefActivationFloat32Workload.cpp) | 0 | ||||
-rw-r--r-- | src/backends/reference/workloads/RefActivationFloat32Workload.hpp (renamed from src/backends/RefWorkloads/RefActivationFloat32Workload.hpp) | 0 | ||||
-rw-r--r-- | src/backends/reference/workloads/RefActivationUint8Workload.cpp (renamed from src/backends/RefWorkloads/RefActivationUint8Workload.cpp) | 0 | ||||
-rw-r--r-- | src/backends/reference/workloads/RefActivationUint8Workload.hpp (renamed from src/backends/RefWorkloads/RefActivationUint8Workload.hpp) | 0 | ||||
-rw-r--r-- | src/backends/reference/workloads/RefArithmeticWorkload.cpp (renamed from src/backends/RefWorkloads/RefArithmeticWorkload.cpp) | 0 | ||||
-rw-r--r-- | src/backends/reference/workloads/RefArithmeticWorkload.hpp (renamed from src/backends/RefWorkloads/RefArithmeticWorkload.hpp) | 0 | ||||
-rw-r--r-- | src/backends/reference/workloads/RefBaseConstantWorkload.cpp (renamed from src/backends/RefWorkloads/RefBaseConstantWorkload.cpp) | 0 | ||||
-rw-r--r-- | src/backends/reference/workloads/RefBaseConstantWorkload.hpp (renamed from src/backends/RefWorkloads/RefBaseConstantWorkload.hpp) | 0 | ||||
-rw-r--r-- | src/backends/reference/workloads/RefBatchNormalizationFloat32Workload.cpp (renamed from src/backends/RefWorkloads/RefBatchNormalizationFloat32Workload.cpp) | 0 | ||||
-rw-r--r-- | src/backends/reference/workloads/RefBatchNormalizationFloat32Workload.hpp (renamed from src/backends/RefWorkloads/RefBatchNormalizationFloat32Workload.hpp) | 0 | ||||
-rw-r--r-- | src/backends/reference/workloads/RefBatchNormalizationUint8Workload.cpp (renamed from src/backends/RefWorkloads/RefBatchNormalizationUint8Workload.cpp) | 0 | ||||
-rw-r--r-- | src/backends/reference/workloads/RefBatchNormalizationUint8Workload.hpp (renamed from src/backends/RefWorkloads/RefBatchNormalizationUint8Workload.hpp) | 0 | ||||
-rw-r--r-- | src/backends/reference/workloads/RefConstantFloat32Workload.cpp (renamed from src/backends/RefWorkloads/RefConstantFloat32Workload.cpp) | 0 | ||||
-rw-r--r-- | src/backends/reference/workloads/RefConstantFloat32Workload.hpp (renamed from src/backends/RefWorkloads/RefConstantFloat32Workload.hpp) | 0 | ||||
-rw-r--r-- | src/backends/reference/workloads/RefConstantUint8Workload.cpp (renamed from src/backends/RefWorkloads/RefConstantUint8Workload.cpp) | 0 | ||||
-rw-r--r-- | src/backends/reference/workloads/RefConstantUint8Workload.hpp (renamed from src/backends/RefWorkloads/RefConstantUint8Workload.hpp) | 0 | ||||
-rw-r--r-- | src/backends/reference/workloads/RefConvertFp16ToFp32Workload.cpp (renamed from src/backends/RefWorkloads/RefConvertFp16ToFp32Workload.cpp) | 0 | ||||
-rw-r--r-- | src/backends/reference/workloads/RefConvertFp16ToFp32Workload.hpp (renamed from src/backends/RefWorkloads/RefConvertFp16ToFp32Workload.hpp) | 0 | ||||
-rw-r--r-- | src/backends/reference/workloads/RefConvertFp32ToFp16Workload.cpp (renamed from src/backends/RefWorkloads/RefConvertFp32ToFp16Workload.cpp) | 0 | ||||
-rw-r--r-- | src/backends/reference/workloads/RefConvertFp32ToFp16Workload.hpp (renamed from src/backends/RefWorkloads/RefConvertFp32ToFp16Workload.hpp) | 0 | ||||
-rw-r--r-- | src/backends/reference/workloads/RefConvolution2dFloat32Workload.cpp (renamed from src/backends/RefWorkloads/RefConvolution2dFloat32Workload.cpp) | 0 | ||||
-rw-r--r-- | src/backends/reference/workloads/RefConvolution2dFloat32Workload.hpp (renamed from src/backends/RefWorkloads/RefConvolution2dFloat32Workload.hpp) | 0 | ||||
-rw-r--r-- | src/backends/reference/workloads/RefConvolution2dUint8Workload.cpp (renamed from src/backends/RefWorkloads/RefConvolution2dUint8Workload.cpp) | 0 | ||||
-rw-r--r-- | src/backends/reference/workloads/RefConvolution2dUint8Workload.hpp (renamed from src/backends/RefWorkloads/RefConvolution2dUint8Workload.hpp) | 0 | ||||
-rw-r--r-- | src/backends/reference/workloads/RefDepthwiseConvolution2dFloat32Workload.cpp (renamed from src/backends/RefWorkloads/RefDepthwiseConvolution2dFloat32Workload.cpp) | 0 | ||||
-rw-r--r-- | src/backends/reference/workloads/RefDepthwiseConvolution2dFloat32Workload.hpp (renamed from src/backends/RefWorkloads/RefDepthwiseConvolution2dFloat32Workload.hpp) | 0 | ||||
-rw-r--r-- | src/backends/reference/workloads/RefDepthwiseConvolution2dUint8Workload.cpp (renamed from src/backends/RefWorkloads/RefDepthwiseConvolution2dUint8Workload.cpp) | 0 | ||||
-rw-r--r-- | src/backends/reference/workloads/RefDepthwiseConvolution2dUint8Workload.hpp (renamed from src/backends/RefWorkloads/RefDepthwiseConvolution2dUint8Workload.hpp) | 0 | ||||
-rw-r--r-- | src/backends/reference/workloads/RefFakeQuantizationFloat32Workload.cpp (renamed from src/backends/RefWorkloads/RefFakeQuantizationFloat32Workload.cpp) | 0 | ||||
-rw-r--r-- | src/backends/reference/workloads/RefFakeQuantizationFloat32Workload.hpp (renamed from src/backends/RefWorkloads/RefFakeQuantizationFloat32Workload.hpp) | 0 | ||||
-rw-r--r-- | src/backends/reference/workloads/RefFloorFloat32Workload.cpp (renamed from src/backends/RefWorkloads/RefFloorFloat32Workload.cpp) | 0 | ||||
-rw-r--r-- | src/backends/reference/workloads/RefFloorFloat32Workload.hpp (renamed from src/backends/RefWorkloads/RefFloorFloat32Workload.hpp) | 0 | ||||
-rw-r--r-- | src/backends/reference/workloads/RefFullyConnectedFloat32Workload.cpp (renamed from src/backends/RefWorkloads/RefFullyConnectedFloat32Workload.cpp) | 0 | ||||
-rw-r--r-- | src/backends/reference/workloads/RefFullyConnectedFloat32Workload.hpp (renamed from src/backends/RefWorkloads/RefFullyConnectedFloat32Workload.hpp) | 0 | ||||
-rw-r--r-- | src/backends/reference/workloads/RefFullyConnectedUint8Workload.cpp (renamed from src/backends/RefWorkloads/RefFullyConnectedUint8Workload.cpp) | 0 | ||||
-rw-r--r-- | src/backends/reference/workloads/RefFullyConnectedUint8Workload.hpp (renamed from src/backends/RefWorkloads/RefFullyConnectedUint8Workload.hpp) | 0 | ||||
-rw-r--r-- | src/backends/reference/workloads/RefL2NormalizationFloat32Workload.cpp (renamed from src/backends/RefWorkloads/RefL2NormalizationFloat32Workload.cpp) | 0 | ||||
-rw-r--r-- | src/backends/reference/workloads/RefL2NormalizationFloat32Workload.hpp (renamed from src/backends/RefWorkloads/RefL2NormalizationFloat32Workload.hpp) | 0 | ||||
-rw-r--r-- | src/backends/reference/workloads/RefLstmFloat32Workload.cpp (renamed from src/backends/RefWorkloads/RefLstmFloat32Workload.cpp) | 0 | ||||
-rw-r--r-- | src/backends/reference/workloads/RefLstmFloat32Workload.hpp (renamed from src/backends/RefWorkloads/RefLstmFloat32Workload.hpp) | 0 | ||||
-rw-r--r-- | src/backends/reference/workloads/RefMergerFloat32Workload.cpp (renamed from src/backends/RefWorkloads/RefMergerFloat32Workload.cpp) | 0 | ||||
-rw-r--r-- | src/backends/reference/workloads/RefMergerFloat32Workload.hpp (renamed from src/backends/RefWorkloads/RefMergerFloat32Workload.hpp) | 0 | ||||
-rw-r--r-- | src/backends/reference/workloads/RefMergerUint8Workload.cpp (renamed from src/backends/RefWorkloads/RefMergerUint8Workload.cpp) | 0 | ||||
-rw-r--r-- | src/backends/reference/workloads/RefMergerUint8Workload.hpp (renamed from src/backends/RefWorkloads/RefMergerUint8Workload.hpp) | 0 | ||||
-rw-r--r-- | src/backends/reference/workloads/RefNormalizationFloat32Workload.cpp (renamed from src/backends/RefWorkloads/RefNormalizationFloat32Workload.cpp) | 0 | ||||
-rw-r--r-- | src/backends/reference/workloads/RefNormalizationFloat32Workload.hpp (renamed from src/backends/RefWorkloads/RefNormalizationFloat32Workload.hpp) | 0 | ||||
-rw-r--r-- | src/backends/reference/workloads/RefPermuteWorkload.cpp (renamed from src/backends/RefWorkloads/RefPermuteWorkload.cpp) | 0 | ||||
-rw-r--r-- | src/backends/reference/workloads/RefPermuteWorkload.hpp (renamed from src/backends/RefWorkloads/RefPermuteWorkload.hpp) | 0 | ||||
-rw-r--r-- | src/backends/reference/workloads/RefPooling2dFloat32Workload.cpp (renamed from src/backends/RefWorkloads/RefPooling2dFloat32Workload.cpp) | 0 | ||||
-rw-r--r-- | src/backends/reference/workloads/RefPooling2dFloat32Workload.hpp (renamed from src/backends/RefWorkloads/RefPooling2dFloat32Workload.hpp) | 0 | ||||
-rw-r--r-- | src/backends/reference/workloads/RefPooling2dUint8Workload.cpp (renamed from src/backends/RefWorkloads/RefPooling2dUint8Workload.cpp) | 0 | ||||
-rw-r--r-- | src/backends/reference/workloads/RefPooling2dUint8Workload.hpp (renamed from src/backends/RefWorkloads/RefPooling2dUint8Workload.hpp) | 0 | ||||
-rw-r--r-- | src/backends/reference/workloads/RefReshapeFloat32Workload.cpp (renamed from src/backends/RefWorkloads/RefReshapeFloat32Workload.cpp) | 0 | ||||
-rw-r--r-- | src/backends/reference/workloads/RefReshapeFloat32Workload.hpp (renamed from src/backends/RefWorkloads/RefReshapeFloat32Workload.hpp) | 0 | ||||
-rw-r--r-- | src/backends/reference/workloads/RefReshapeUint8Workload.cpp (renamed from src/backends/RefWorkloads/RefReshapeUint8Workload.cpp) | 0 | ||||
-rw-r--r-- | src/backends/reference/workloads/RefReshapeUint8Workload.hpp (renamed from src/backends/RefWorkloads/RefReshapeUint8Workload.hpp) | 0 | ||||
-rw-r--r-- | src/backends/reference/workloads/RefResizeBilinearFloat32Workload.cpp (renamed from src/backends/RefWorkloads/RefResizeBilinearFloat32Workload.cpp) | 0 | ||||
-rw-r--r-- | src/backends/reference/workloads/RefResizeBilinearFloat32Workload.hpp (renamed from src/backends/RefWorkloads/RefResizeBilinearFloat32Workload.hpp) | 0 | ||||
-rw-r--r-- | src/backends/reference/workloads/RefResizeBilinearUint8Workload.cpp (renamed from src/backends/RefWorkloads/RefResizeBilinearUint8Workload.cpp) | 0 | ||||
-rw-r--r-- | src/backends/reference/workloads/RefResizeBilinearUint8Workload.hpp (renamed from src/backends/RefWorkloads/RefResizeBilinearUint8Workload.hpp) | 0 | ||||
-rw-r--r-- | src/backends/reference/workloads/RefSoftmaxFloat32Workload.cpp (renamed from src/backends/RefWorkloads/RefSoftmaxFloat32Workload.cpp) | 0 | ||||
-rw-r--r-- | src/backends/reference/workloads/RefSoftmaxFloat32Workload.hpp (renamed from src/backends/RefWorkloads/RefSoftmaxFloat32Workload.hpp) | 0 | ||||
-rw-r--r-- | src/backends/reference/workloads/RefSoftmaxUint8Workload.cpp (renamed from src/backends/RefWorkloads/RefSoftmaxUint8Workload.cpp) | 0 | ||||
-rw-r--r-- | src/backends/reference/workloads/RefSoftmaxUint8Workload.hpp (renamed from src/backends/RefWorkloads/RefSoftmaxUint8Workload.hpp) | 0 | ||||
-rw-r--r-- | src/backends/reference/workloads/RefSplitterFloat32Workload.cpp (renamed from src/backends/RefWorkloads/RefSplitterFloat32Workload.cpp) | 0 | ||||
-rw-r--r-- | src/backends/reference/workloads/RefSplitterFloat32Workload.hpp (renamed from src/backends/RefWorkloads/RefSplitterFloat32Workload.hpp) | 0 | ||||
-rw-r--r-- | src/backends/reference/workloads/RefSplitterUint8Workload.cpp (renamed from src/backends/RefWorkloads/RefSplitterUint8Workload.cpp) | 0 | ||||
-rw-r--r-- | src/backends/reference/workloads/RefSplitterUint8Workload.hpp (renamed from src/backends/RefWorkloads/RefSplitterUint8Workload.hpp) | 0 | ||||
-rw-r--r-- | src/backends/reference/workloads/RefWorkloadUtils.hpp (renamed from src/backends/RefWorkloads/RefWorkloadUtils.hpp) | 0 | ||||
-rw-r--r-- | src/backends/reference/workloads/RefWorkloads.hpp | 53 | ||||
-rw-r--r-- | src/backends/reference/workloads/ResizeBilinear.cpp (renamed from src/backends/RefWorkloads/ResizeBilinear.cpp) | 0 | ||||
-rw-r--r-- | src/backends/reference/workloads/ResizeBilinear.hpp (renamed from src/backends/RefWorkloads/ResizeBilinear.hpp) | 0 | ||||
-rw-r--r-- | src/backends/reference/workloads/Softmax.cpp (renamed from src/backends/RefWorkloads/Softmax.cpp) | 0 | ||||
-rw-r--r-- | src/backends/reference/workloads/Softmax.hpp (renamed from src/backends/RefWorkloads/Softmax.hpp) | 0 | ||||
-rw-r--r-- | src/backends/reference/workloads/Splitter.hpp (renamed from src/backends/RefWorkloads/Splitter.hpp) | 0 | ||||
-rw-r--r-- | src/backends/reference/workloads/TensorBufferArrayView.hpp (renamed from src/backends/RefWorkloads/TensorBufferArrayView.hpp) | 0 | ||||
-rw-r--r-- | src/backends/test/ArmComputeCl.cpp | 10 | ||||
-rw-r--r-- | src/backends/test/ArmComputeNeon.cpp | 10 | ||||
-rw-r--r-- | src/backends/test/CreateWorkloadCl.cpp | 12 | ||||
-rw-r--r-- | src/backends/test/CreateWorkloadRef.cpp | 6 | ||||
-rw-r--r-- | src/backends/test/IsLayerSupportedTest.cpp | 4 | ||||
-rw-r--r-- | src/backends/test/MemCopyTests.cpp | 2 | ||||
-rw-r--r-- | src/backends/test/Reference.cpp | 2 | ||||
-rw-r--r-- | src/backends/test/WorkloadDataValidation.cpp | 4 |
120 files changed, 211 insertions, 179 deletions
diff --git a/Android.mk b/Android.mk index 3b8e911719..e81165c391 100644 --- a/Android.mk +++ b/Android.mk @@ -67,13 +67,11 @@ LOCAL_SRC_FILES := \ src/backends/ClWorkloadFactory.cpp \ src/backends/ClContextControl.cpp \ src/backends/CpuTensorHandle.cpp \ - src/backends/RefWorkloadFactory.cpp \ src/backends/MemCopyWorkload.cpp \ src/backends/WorkloadData.cpp \ src/backends/WorkloadFactory.cpp \ src/backends/OutputHandler.cpp \ src/backends/StringMapping.cpp \ - src/backends/RefLayerSupport.cpp \ src/backends/ClLayerSupport.cpp \ src/backends/NeonLayerSupport.cpp \ src/backends/NeonWorkloadUtils.cpp \ diff --git a/src/armnn/LayerSupport.cpp b/src/armnn/LayerSupport.cpp index 9bbe17983b..85a03f2e2e 100644 --- a/src/armnn/LayerSupport.cpp +++ b/src/armnn/LayerSupport.cpp @@ -2,11 +2,11 @@ // Copyright © 2017 Arm Ltd. All rights reserved. // SPDX-License-Identifier: MIT // -#include "armnn/LayerSupport.hpp" +#include <armnn/LayerSupport.hpp> -#include "backends/RefLayerSupport.hpp" -#include "backends/NeonLayerSupport.hpp" -#include "backends/ClLayerSupport.hpp" +#include <backends/reference/RefLayerSupport.hpp> +#include <backends/NeonLayerSupport.hpp> +#include <backends/ClLayerSupport.hpp> #include <boost/assert.hpp> diff --git a/src/armnn/LoadedNetwork.hpp b/src/armnn/LoadedNetwork.hpp index 9e49cedbad..43faa4e674 100644 --- a/src/armnn/LoadedNetwork.hpp +++ b/src/armnn/LoadedNetwork.hpp @@ -4,16 +4,18 @@ // #pragma once -#include "armnn/Tensor.hpp" -#include "armnn/Types.hpp" +#include <armnn/Tensor.hpp> +#include <armnn/Types.hpp> + #include "Network.hpp" #include "LayerFwd.hpp" #include "Profiling.hpp" -#include "backends/RefWorkloadFactory.hpp" -#include "backends/NeonWorkloadFactory.hpp" -#include "backends/ClWorkloadFactory.hpp" -#include "backends/Workload.hpp" -#include "backends/WorkloadFactory.hpp" + +#include <backends/reference/RefWorkloadFactory.hpp> +#include <backends/NeonWorkloadFactory.hpp> +#include <backends/ClWorkloadFactory.hpp> +#include <backends/Workload.hpp> +#include <backends/WorkloadFactory.hpp> namespace cl { diff --git a/src/armnn/test/CreateWorkloadClNeon.hpp b/src/armnn/test/CreateWorkloadClNeon.hpp index 295132d2f4..de9a79513f 100644 --- a/src/armnn/test/CreateWorkloadClNeon.hpp +++ b/src/armnn/test/CreateWorkloadClNeon.hpp @@ -5,7 +5,7 @@ #pragma once #include "CreateWorkload.hpp" -#include "backends/RefWorkloadFactory.hpp" +#include <backends/reference/RefWorkloadFactory.hpp> #if ARMCOMPUTECL_ENABLED #include "backends/ClTensorHandle.hpp" diff --git a/src/armnn/test/NetworkTests.cpp b/src/armnn/test/NetworkTests.cpp index 0bb394f398..0fff76e82e 100644 --- a/src/armnn/test/NetworkTests.cpp +++ b/src/armnn/test/NetworkTests.cpp @@ -4,12 +4,12 @@ // #include <boost/test/unit_test.hpp> -#include "armnn/ArmNN.hpp" -#include "Network.hpp" -#include "Graph.hpp" -#include "backends/RefWorkloadFactory.hpp" -#include "backends/ClWorkloadFactory.hpp" -#include "backends/NeonWorkloadFactory.hpp" +#include <armnn/ArmNN.hpp> +#include <Network.hpp> +#include <Graph.hpp> +#include <backends/reference/RefWorkloadFactory.hpp> +#include <backends/ClWorkloadFactory.hpp> +#include <backends/NeonWorkloadFactory.hpp> #include "GraphUtils.hpp" diff --git a/src/armnn/test/UnitTests.hpp b/src/armnn/test/UnitTests.hpp index 94f531c0ec..e8c5908d72 100644 --- a/src/armnn/test/UnitTests.hpp +++ b/src/armnn/test/UnitTests.hpp @@ -4,10 +4,10 @@ // #pragma once -#include "Logging.hpp" -#include "armnn/Utils.hpp" -#include "backends/RefWorkloadFactory.hpp" -#include "backends/test/LayerTests.hpp" +#include <Logging.hpp> +#include <armnn/Utils.hpp> +#include <backends/reference/RefWorkloadFactory.hpp> +#include <backends/test/LayerTests.hpp> #include "TensorHelpers.hpp" #include <boost/test/unit_test.hpp> diff --git a/src/backends/CMakeLists.txt b/src/backends/CMakeLists.txt index 5503a9dc5a..39d6e8d834 100644 --- a/src/backends/CMakeLists.txt +++ b/src/backends/CMakeLists.txt @@ -25,11 +25,6 @@ list(APPEND armnnBackendsCommon_sources NeonWorkloads.hpp OutputHandler.cpp OutputHandler.hpp - RefLayerSupport.cpp - RefLayerSupport.hpp - RefWorkloadFactory.cpp - RefWorkloadFactory.hpp - RefWorkloads.hpp StringMapping.cpp StringMapping.hpp WorkloadDataCollector.hpp diff --git a/src/backends/ClWorkloads/backend.mk b/src/backends/ClWorkloads/backend.mk index 1239408990..9a20961287 100644 --- a/src/backends/ClWorkloads/backend.mk +++ b/src/backends/ClWorkloads/backend.mk @@ -3,6 +3,10 @@ # SPDX-License-Identifier: MIT # +# BACKEND_SOURCES contains the list of files to be included +# in the Android build and it is picked up by the Android.mk +# file in the root of ArmNN + BACKEND_SOURCES := \ ClActivationFloatWorkload.cpp \ ClActivationUint8Workload.cpp \ diff --git a/src/backends/NeonWorkloads/backend.mk b/src/backends/NeonWorkloads/backend.mk index 4c7fbe6fe0..7b7f87be6a 100644 --- a/src/backends/NeonWorkloads/backend.mk +++ b/src/backends/NeonWorkloads/backend.mk @@ -3,6 +3,10 @@ # SPDX-License-Identifier: MIT # +# BACKEND_SOURCES contains the list of files to be included +# in the Android build and it is picked up by the Android.mk +# file in the root of ArmNN + BACKEND_SOURCES := \ NeonActivationFloatWorkload.cpp \ NeonActivationUint8Workload.cpp \ diff --git a/src/backends/RefWorkloads.hpp b/src/backends/RefWorkloads.hpp deleted file mode 100644 index 746a59e71f..0000000000 --- a/src/backends/RefWorkloads.hpp +++ /dev/null @@ -1,53 +0,0 @@ -// -// Copyright © 2017 Arm Ltd. All rights reserved. -// SPDX-License-Identifier: MIT -// - -#pragma once - -#include "backends/RefWorkloads/RefConstantUint8Workload.hpp" -#include "backends/RefWorkloads/ArithmeticFunction.hpp" -#include "backends/RefWorkloads/RefArithmeticWorkload.hpp" -#include "backends/RefWorkloads/ConvImpl.hpp" -#include "backends/RefWorkloads/RefBaseConstantWorkload.hpp" -#include "backends/RefWorkloads/RefConvolution2dUint8Workload.hpp" -#include "backends/RefWorkloads/RefSplitterUint8Workload.hpp" -#include "backends/RefWorkloads/RefResizeBilinearUint8Workload.hpp" -#include "backends/RefWorkloads/RefL2NormalizationFloat32Workload.hpp" -#include "backends/RefWorkloads/RefActivationUint8Workload.hpp" -#include "backends/RefWorkloads/RefPooling2dFloat32Workload.hpp" -#include "backends/RefWorkloads/RefWorkloadUtils.hpp" -#include "backends/RefWorkloads/RefMergerUint8Workload.hpp" -#include "backends/RefWorkloads/RefFullyConnectedFloat32Workload.hpp" -#include "backends/RefWorkloads/Softmax.hpp" -#include "backends/RefWorkloads/RefMergerFloat32Workload.hpp" -#include "backends/RefWorkloads/TensorBufferArrayView.hpp" -#include "backends/RefWorkloads/RefBatchNormalizationFloat32Workload.hpp" -#include "backends/RefWorkloads/Splitter.hpp" -#include "backends/RefWorkloads/RefFullyConnectedUint8Workload.hpp" -#include "backends/RefWorkloads/RefReshapeFloat32Workload.hpp" -#include "backends/RefWorkloads/RefDepthwiseConvolution2dUint8Workload.hpp" -#include "backends/RefWorkloads/FullyConnected.hpp" -#include "backends/RefWorkloads/RefFloorFloat32Workload.hpp" -#include "backends/RefWorkloads/RefSoftmaxFloat32Workload.hpp" -#include "backends/RefWorkloads/RefSoftmaxUint8Workload.hpp" -#include "backends/RefWorkloads/RefReshapeUint8Workload.hpp" -#include "backends/RefWorkloads/RefResizeBilinearFloat32Workload.hpp" -#include "backends/RefWorkloads/RefBatchNormalizationUint8Workload.hpp" -#include "backends/RefWorkloads/ResizeBilinear.hpp" -#include "backends/RefWorkloads/RefNormalizationFloat32Workload.hpp" -#include "backends/RefWorkloads/RefDepthwiseConvolution2dFloat32Workload.hpp" -#include "backends/RefWorkloads/RefPooling2dUint8Workload.hpp" -#include "backends/RefWorkloads/BatchNormImpl.hpp" -#include "backends/RefWorkloads/Activation.hpp" -#include "backends/RefWorkloads/Merger.hpp" -#include "backends/RefWorkloads/RefSplitterFloat32Workload.hpp" -#include "backends/RefWorkloads/RefConstantFloat32Workload.hpp" -#include "backends/RefWorkloads/RefActivationFloat32Workload.hpp" -#include "backends/RefWorkloads/RefConvolution2dFloat32Workload.hpp" -#include "backends/RefWorkloads/Pooling2d.hpp" -#include "backends/RefWorkloads/RefFakeQuantizationFloat32Workload.hpp" -#include "backends/RefWorkloads/RefPermuteWorkload.hpp" -#include "backends/RefWorkloads/RefLstmFloat32Workload.hpp" -#include "backends/RefWorkloads/RefConvertFp16ToFp32Workload.hpp" -#include "backends/RefWorkloads/RefConvertFp32ToFp16Workload.hpp" diff --git a/src/backends/RefWorkloads/backend.cmake b/src/backends/RefWorkloads/backend.cmake deleted file mode 100644 index 6fd09eba6c..0000000000 --- a/src/backends/RefWorkloads/backend.cmake +++ /dev/null @@ -1,7 +0,0 @@ -# -# Copyright © 2017 Arm Ltd. All rights reserved. -# SPDX-License-Identifier: MIT -# - -add_subdirectory(${PROJECT_SOURCE_DIR}/src/backends/RefWorkloads) -list(APPEND armnnLibraries armnnRefBackend) diff --git a/src/backends/RefWorkloads/backend.mk b/src/backends/RefWorkloads/backend.mk deleted file mode 100644 index 8cde8c95dc..0000000000 --- a/src/backends/RefWorkloads/backend.mk +++ /dev/null @@ -1,49 +0,0 @@ -# -# Copyright © 2017 ARM Ltd. All rights reserved. -# SPDX-License-Identifier: MIT -# - -BACKEND_SOURCES := \ - FullyConnected.cpp \ - RefMergerUint8Workload.cpp \ - RefResizeBilinearUint8Workload.cpp \ - RefFullyConnectedFloat32Workload.cpp \ - RefSoftmaxFloat32Workload.cpp \ - RefActivationFloat32Workload.cpp \ - RefBatchNormalizationUint8Workload.cpp \ - RefBaseConstantWorkload.cpp \ - RefResizeBilinearFloat32Workload.cpp \ - RefBatchNormalizationFloat32Workload.cpp \ - Broadcast.cpp \ - ArithmeticFunction.cpp \ - RefArithmeticWorkload.cpp \ - RefFakeQuantizationFloat32Workload.cpp \ - ResizeBilinear.cpp \ - RefSoftmaxUint8Workload.cpp \ - RefDepthwiseConvolution2dFloat32Workload.cpp \ - RefPooling2dUint8Workload.cpp \ - RefFloorFloat32Workload.cpp \ - ConvImpl.cpp \ - Activation.cpp \ - RefReshapeUint8Workload.cpp \ - RefL2NormalizationFloat32Workload.cpp \ - RefLstmFloat32Workload.cpp \ - RefConvolution2dFloat32Workload.cpp \ - RefConvolution2dUint8Workload.cpp \ - RefSplitterFloat32Workload.cpp \ - RefActivationUint8Workload.cpp \ - RefSplitterUint8Workload.cpp \ - RefPooling2dFloat32Workload.cpp \ - RefReshapeFloat32Workload.cpp \ - RefNormalizationFloat32Workload.cpp \ - Softmax.cpp \ - RefDepthwiseConvolution2dUint8Workload.cpp \ - RefConstantUint8Workload.cpp \ - RefConstantFloat32Workload.cpp \ - Pooling2d.cpp \ - RefMergerFloat32Workload.cpp \ - RefFullyConnectedUint8Workload.cpp \ - RefPermuteWorkload.cpp \ - RefConvertFp16ToFp32Workload.cpp \ - RefConvertFp32ToFp16Workload.cpp - diff --git a/src/backends/WorkloadFactory.cpp b/src/backends/WorkloadFactory.cpp index 2666e7f354..8b3ab8366b 100644 --- a/src/backends/WorkloadFactory.cpp +++ b/src/backends/WorkloadFactory.cpp @@ -3,14 +3,14 @@ // SPDX-License-Identifier: MIT // #include "WorkloadFactory.hpp" -#include "RefWorkloadFactory.hpp" +#include <backends/reference/RefWorkloadFactory.hpp> #include "NeonWorkloadFactory.hpp" #include "ClWorkloadFactory.hpp" -#include "armnn/Types.hpp" -#include "armnn/LayerSupport.hpp" -#include "Layer.hpp" -#include "LayersFwd.hpp" +#include <armnn/Types.hpp> +#include <armnn/LayerSupport.hpp> +#include <Layer.hpp> +#include <LayersFwd.hpp> #include "CpuTensorHandle.hpp" #include <boost/cast.hpp> diff --git a/src/backends/reference/CMakeLists.txt b/src/backends/reference/CMakeLists.txt new file mode 100644 index 0000000000..526baaa1a8 --- /dev/null +++ b/src/backends/reference/CMakeLists.txt @@ -0,0 +1,19 @@ +# +# Copyright © 2017 Arm Ltd. All rights reserved. +# SPDX-License-Identifier: MIT +# + +list(APPEND armnnRefBackend_sources + RefLayerSupport.cpp + RefLayerSupport.hpp + RefWorkloadFactory.cpp + RefWorkloadFactory.hpp +) + +add_library(armnnRefBackend STATIC ${armnnRefBackend_sources}) +target_include_directories(armnnRefBackend PRIVATE ${PROJECT_SOURCE_DIR}/src) +target_include_directories(armnnRefBackend PRIVATE ${PROJECT_SOURCE_DIR}/src/armnn) +target_include_directories(armnnRefBackend PRIVATE ${PROJECT_SOURCE_DIR}/src/armnnUtils) + +add_subdirectory(workloads test) + diff --git a/src/backends/RefLayerSupport.cpp b/src/backends/reference/RefLayerSupport.cpp index d56cdebeda..d56cdebeda 100644 --- a/src/backends/RefLayerSupport.cpp +++ b/src/backends/reference/RefLayerSupport.cpp diff --git a/src/backends/RefLayerSupport.hpp b/src/backends/reference/RefLayerSupport.hpp index ff2e7e387f..ff2e7e387f 100644 --- a/src/backends/RefLayerSupport.hpp +++ b/src/backends/reference/RefLayerSupport.hpp diff --git a/src/backends/RefWorkloadFactory.cpp b/src/backends/reference/RefWorkloadFactory.cpp index 689adb628a..5cefd1b6e1 100644 --- a/src/backends/RefWorkloadFactory.cpp +++ b/src/backends/reference/RefWorkloadFactory.cpp @@ -2,12 +2,12 @@ // Copyright © 2017 Arm Ltd. All rights reserved. // SPDX-License-Identifier: MIT // -#include "CpuTensorHandle.hpp" +#include <backends/CpuTensorHandle.hpp> +#include <backends/MemCopyWorkload.hpp> +#include <backends/MakeWorkloadHelper.hpp> #include "RefWorkloadFactory.hpp" -#include "RefWorkloads.hpp" +#include "workloads/RefWorkloads.hpp" #include "Layer.hpp" -#include "MemCopyWorkload.hpp" -#include "MakeWorkloadHelper.hpp" #include <boost/log/trivial.hpp> diff --git a/src/backends/RefWorkloadFactory.hpp b/src/backends/reference/RefWorkloadFactory.hpp index da0ca9b066..1a9227a978 100644 --- a/src/backends/RefWorkloadFactory.hpp +++ b/src/backends/reference/RefWorkloadFactory.hpp @@ -4,8 +4,8 @@ // #pragma once -#include "WorkloadFactory.hpp" -#include "OutputHandler.hpp" +#include <backends/WorkloadFactory.hpp> +#include <backends/OutputHandler.hpp> #include <boost/core/ignore_unused.hpp> #include <boost/optional.hpp> diff --git a/src/backends/reference/backend.cmake b/src/backends/reference/backend.cmake new file mode 100644 index 0000000000..95e72a438d --- /dev/null +++ b/src/backends/reference/backend.cmake @@ -0,0 +1,7 @@ +# +# Copyright © 2017 Arm Ltd. All rights reserved. +# SPDX-License-Identifier: MIT +# + +add_subdirectory(${PROJECT_SOURCE_DIR}/src/backends/reference) +list(APPEND armnnLibraries armnnRefBackend armnnRefBackendWorkloads) diff --git a/src/backends/reference/backend.mk b/src/backends/reference/backend.mk new file mode 100644 index 0000000000..23dab119d0 --- /dev/null +++ b/src/backends/reference/backend.mk @@ -0,0 +1,54 @@ +# +# Copyright © 2017 ARM Ltd. All rights reserved. +# SPDX-License-Identifier: MIT +# + +# BACKEND_SOURCES contains the list of files to be included +# in the Android build and it is picked up by the Android.mk +# file in the root of ArmNN + +BACKEND_SOURCES := \ + RefLayerSupport.cpp \ + RefWorkloadFactory.cpp \ + workloads/Activation.cpp \ + workloads/ArithmeticFunction.cpp \ + workloads/Broadcast.cpp \ + workloads/ConvImpl.cpp \ + workloads/FullyConnected.cpp \ + workloads/Pooling2d.cpp \ + workloads/RefActivationFloat32Workload.cpp \ + workloads/RefActivationUint8Workload.cpp \ + workloads/RefArithmeticWorkload.cpp \ + workloads/RefBaseConstantWorkload.cpp \ + workloads/RefBatchNormalizationFloat32Workload.cpp \ + workloads/RefBatchNormalizationUint8Workload.cpp \ + workloads/RefConstantFloat32Workload.cpp \ + workloads/RefConstantUint8Workload.cpp \ + workloads/RefConvertFp16ToFp32Workload.cpp \ + workloads/RefConvertFp32ToFp16Workload.cpp \ + workloads/RefConvolution2dFloat32Workload.cpp \ + workloads/RefConvolution2dUint8Workload.cpp \ + workloads/RefDepthwiseConvolution2dFloat32Workload.cpp \ + workloads/RefDepthwiseConvolution2dUint8Workload.cpp \ + workloads/RefFakeQuantizationFloat32Workload.cpp \ + workloads/RefFloorFloat32Workload.cpp \ + workloads/RefFullyConnectedFloat32Workload.cpp \ + workloads/RefFullyConnectedUint8Workload.cpp \ + workloads/RefL2NormalizationFloat32Workload.cpp \ + workloads/RefLstmFloat32Workload.cpp \ + workloads/RefMergerFloat32Workload.cpp \ + workloads/RefMergerUint8Workload.cpp \ + workloads/RefNormalizationFloat32Workload.cpp \ + workloads/RefPermuteWorkload.cpp \ + workloads/RefPooling2dFloat32Workload.cpp \ + workloads/RefPooling2dUint8Workload.cpp \ + workloads/RefReshapeFloat32Workload.cpp \ + workloads/RefReshapeUint8Workload.cpp \ + workloads/RefResizeBilinearFloat32Workload.cpp \ + workloads/RefResizeBilinearUint8Workload.cpp \ + workloads/RefSoftmaxFloat32Workload.cpp \ + workloads/RefSoftmaxUint8Workload.cpp \ + workloads/RefSplitterFloat32Workload.cpp \ + workloads/RefSplitterUint8Workload.cpp \ + workloads/ResizeBilinear.cpp \ + workloads/Softmax.cpp diff --git a/src/backends/reference/test/CMakeLists.txt b/src/backends/reference/test/CMakeLists.txt new file mode 100644 index 0000000000..f41a074999 --- /dev/null +++ b/src/backends/reference/test/CMakeLists.txt @@ -0,0 +1,4 @@ +# +# Copyright © 2017 Arm Ltd. All rights reserved. +# SPDX-License-Identifier: MIT +# diff --git a/src/backends/RefWorkloads/Activation.cpp b/src/backends/reference/workloads/Activation.cpp index ef4903074b..ef4903074b 100644 --- a/src/backends/RefWorkloads/Activation.cpp +++ b/src/backends/reference/workloads/Activation.cpp diff --git a/src/backends/RefWorkloads/Activation.hpp b/src/backends/reference/workloads/Activation.hpp index c8a23114f0..c8a23114f0 100644 --- a/src/backends/RefWorkloads/Activation.hpp +++ b/src/backends/reference/workloads/Activation.hpp diff --git a/src/backends/RefWorkloads/ArithmeticFunction.cpp b/src/backends/reference/workloads/ArithmeticFunction.cpp index fede138253..fede138253 100644 --- a/src/backends/RefWorkloads/ArithmeticFunction.cpp +++ b/src/backends/reference/workloads/ArithmeticFunction.cpp diff --git a/src/backends/RefWorkloads/ArithmeticFunction.hpp b/src/backends/reference/workloads/ArithmeticFunction.hpp index eafb6444f6..eafb6444f6 100644 --- a/src/backends/RefWorkloads/ArithmeticFunction.hpp +++ b/src/backends/reference/workloads/ArithmeticFunction.hpp diff --git a/src/backends/RefWorkloads/BatchNormImpl.hpp b/src/backends/reference/workloads/BatchNormImpl.hpp index a7579c8373..a7579c8373 100644 --- a/src/backends/RefWorkloads/BatchNormImpl.hpp +++ b/src/backends/reference/workloads/BatchNormImpl.hpp diff --git a/src/backends/RefWorkloads/Broadcast.cpp b/src/backends/reference/workloads/Broadcast.cpp index 8421a0a7ed..8421a0a7ed 100644 --- a/src/backends/RefWorkloads/Broadcast.cpp +++ b/src/backends/reference/workloads/Broadcast.cpp diff --git a/src/backends/RefWorkloads/Broadcast.hpp b/src/backends/reference/workloads/Broadcast.hpp index e92ed0598d..e92ed0598d 100644 --- a/src/backends/RefWorkloads/Broadcast.hpp +++ b/src/backends/reference/workloads/Broadcast.hpp diff --git a/src/backends/RefWorkloads/CMakeLists.txt b/src/backends/reference/workloads/CMakeLists.txt index 0f4bfe129f..7343b70daf 100644 --- a/src/backends/RefWorkloads/CMakeLists.txt +++ b/src/backends/reference/workloads/CMakeLists.txt @@ -3,7 +3,7 @@ # SPDX-License-Identifier: MIT # -list(APPEND armnnRefBackend_sources +list(APPEND armnnRefBackendWorkloads_sources Activation.cpp Activation.hpp ArithmeticFunction.cpp @@ -86,6 +86,7 @@ list(APPEND armnnRefBackend_sources RefSplitterFloat32Workload.hpp RefSplitterUint8Workload.cpp RefSplitterUint8Workload.hpp + RefWorkloads.hpp RefWorkloadUtils.hpp ResizeBilinear.cpp ResizeBilinear.hpp @@ -95,7 +96,7 @@ list(APPEND armnnRefBackend_sources TensorBufferArrayView.hpp ) -add_library(armnnRefBackend STATIC ${armnnRefBackend_sources}) -target_include_directories(armnnRefBackend PRIVATE ${PROJECT_SOURCE_DIR}/src) -target_include_directories(armnnRefBackend PRIVATE ${PROJECT_SOURCE_DIR}/src/armnn) -target_include_directories(armnnRefBackend PRIVATE ${PROJECT_SOURCE_DIR}/src/armnnUtils) +add_library(armnnRefBackendWorkloads STATIC ${armnnRefBackendWorkloads_sources}) +target_include_directories(armnnRefBackendWorkloads PRIVATE ${PROJECT_SOURCE_DIR}/src) +target_include_directories(armnnRefBackendWorkloads PRIVATE ${PROJECT_SOURCE_DIR}/src/armnn) +target_include_directories(armnnRefBackendWorkloads PRIVATE ${PROJECT_SOURCE_DIR}/src/armnnUtils) diff --git a/src/backends/RefWorkloads/ConvImpl.cpp b/src/backends/reference/workloads/ConvImpl.cpp index 8743a2bd0d..8743a2bd0d 100644 --- a/src/backends/RefWorkloads/ConvImpl.cpp +++ b/src/backends/reference/workloads/ConvImpl.cpp diff --git a/src/backends/RefWorkloads/ConvImpl.hpp b/src/backends/reference/workloads/ConvImpl.hpp index 4c9ab2a644..4c9ab2a644 100644 --- a/src/backends/RefWorkloads/ConvImpl.hpp +++ b/src/backends/reference/workloads/ConvImpl.hpp diff --git a/src/backends/RefWorkloads/FullyConnected.cpp b/src/backends/reference/workloads/FullyConnected.cpp index bf5814d2ad..bf5814d2ad 100644 --- a/src/backends/RefWorkloads/FullyConnected.cpp +++ b/src/backends/reference/workloads/FullyConnected.cpp diff --git a/src/backends/RefWorkloads/FullyConnected.hpp b/src/backends/reference/workloads/FullyConnected.hpp index 623259f8f8..623259f8f8 100644 --- a/src/backends/RefWorkloads/FullyConnected.hpp +++ b/src/backends/reference/workloads/FullyConnected.hpp diff --git a/src/backends/RefWorkloads/Merger.hpp b/src/backends/reference/workloads/Merger.hpp index 867925faa2..867925faa2 100644 --- a/src/backends/RefWorkloads/Merger.hpp +++ b/src/backends/reference/workloads/Merger.hpp diff --git a/src/backends/RefWorkloads/Pooling2d.cpp b/src/backends/reference/workloads/Pooling2d.cpp index 5812a290e7..5812a290e7 100644 --- a/src/backends/RefWorkloads/Pooling2d.cpp +++ b/src/backends/reference/workloads/Pooling2d.cpp diff --git a/src/backends/RefWorkloads/Pooling2d.hpp b/src/backends/reference/workloads/Pooling2d.hpp index da56b25c4e..da56b25c4e 100644 --- a/src/backends/RefWorkloads/Pooling2d.hpp +++ b/src/backends/reference/workloads/Pooling2d.hpp diff --git a/src/backends/RefWorkloads/RefActivationFloat32Workload.cpp b/src/backends/reference/workloads/RefActivationFloat32Workload.cpp index 3cc59be7a4..3cc59be7a4 100644 --- a/src/backends/RefWorkloads/RefActivationFloat32Workload.cpp +++ b/src/backends/reference/workloads/RefActivationFloat32Workload.cpp diff --git a/src/backends/RefWorkloads/RefActivationFloat32Workload.hpp b/src/backends/reference/workloads/RefActivationFloat32Workload.hpp index 0de33f02ff..0de33f02ff 100644 --- a/src/backends/RefWorkloads/RefActivationFloat32Workload.hpp +++ b/src/backends/reference/workloads/RefActivationFloat32Workload.hpp diff --git a/src/backends/RefWorkloads/RefActivationUint8Workload.cpp b/src/backends/reference/workloads/RefActivationUint8Workload.cpp index b95c2e22a8..b95c2e22a8 100644 --- a/src/backends/RefWorkloads/RefActivationUint8Workload.cpp +++ b/src/backends/reference/workloads/RefActivationUint8Workload.cpp diff --git a/src/backends/RefWorkloads/RefActivationUint8Workload.hpp b/src/backends/reference/workloads/RefActivationUint8Workload.hpp index f38888a9f7..f38888a9f7 100644 --- a/src/backends/RefWorkloads/RefActivationUint8Workload.hpp +++ b/src/backends/reference/workloads/RefActivationUint8Workload.hpp diff --git a/src/backends/RefWorkloads/RefArithmeticWorkload.cpp b/src/backends/reference/workloads/RefArithmeticWorkload.cpp index 6c39fa1186..6c39fa1186 100644 --- a/src/backends/RefWorkloads/RefArithmeticWorkload.cpp +++ b/src/backends/reference/workloads/RefArithmeticWorkload.cpp diff --git a/src/backends/RefWorkloads/RefArithmeticWorkload.hpp b/src/backends/reference/workloads/RefArithmeticWorkload.hpp index 7197b7a883..7197b7a883 100644 --- a/src/backends/RefWorkloads/RefArithmeticWorkload.hpp +++ b/src/backends/reference/workloads/RefArithmeticWorkload.hpp diff --git a/src/backends/RefWorkloads/RefBaseConstantWorkload.cpp b/src/backends/reference/workloads/RefBaseConstantWorkload.cpp index 647677b4fb..647677b4fb 100644 --- a/src/backends/RefWorkloads/RefBaseConstantWorkload.cpp +++ b/src/backends/reference/workloads/RefBaseConstantWorkload.cpp diff --git a/src/backends/RefWorkloads/RefBaseConstantWorkload.hpp b/src/backends/reference/workloads/RefBaseConstantWorkload.hpp index 8dc9fd6104..8dc9fd6104 100644 --- a/src/backends/RefWorkloads/RefBaseConstantWorkload.hpp +++ b/src/backends/reference/workloads/RefBaseConstantWorkload.hpp diff --git a/src/backends/RefWorkloads/RefBatchNormalizationFloat32Workload.cpp b/src/backends/reference/workloads/RefBatchNormalizationFloat32Workload.cpp index 313af9c438..313af9c438 100644 --- a/src/backends/RefWorkloads/RefBatchNormalizationFloat32Workload.cpp +++ b/src/backends/reference/workloads/RefBatchNormalizationFloat32Workload.cpp diff --git a/src/backends/RefWorkloads/RefBatchNormalizationFloat32Workload.hpp b/src/backends/reference/workloads/RefBatchNormalizationFloat32Workload.hpp index 15c843c2ca..15c843c2ca 100644 --- a/src/backends/RefWorkloads/RefBatchNormalizationFloat32Workload.hpp +++ b/src/backends/reference/workloads/RefBatchNormalizationFloat32Workload.hpp diff --git a/src/backends/RefWorkloads/RefBatchNormalizationUint8Workload.cpp b/src/backends/reference/workloads/RefBatchNormalizationUint8Workload.cpp index e248ad4b9d..e248ad4b9d 100644 --- a/src/backends/RefWorkloads/RefBatchNormalizationUint8Workload.cpp +++ b/src/backends/reference/workloads/RefBatchNormalizationUint8Workload.cpp diff --git a/src/backends/RefWorkloads/RefBatchNormalizationUint8Workload.hpp b/src/backends/reference/workloads/RefBatchNormalizationUint8Workload.hpp index d3e8e0a120..d3e8e0a120 100644 --- a/src/backends/RefWorkloads/RefBatchNormalizationUint8Workload.hpp +++ b/src/backends/reference/workloads/RefBatchNormalizationUint8Workload.hpp diff --git a/src/backends/RefWorkloads/RefConstantFloat32Workload.cpp b/src/backends/reference/workloads/RefConstantFloat32Workload.cpp index 074e8ccaae..074e8ccaae 100644 --- a/src/backends/RefWorkloads/RefConstantFloat32Workload.cpp +++ b/src/backends/reference/workloads/RefConstantFloat32Workload.cpp diff --git a/src/backends/RefWorkloads/RefConstantFloat32Workload.hpp b/src/backends/reference/workloads/RefConstantFloat32Workload.hpp index 76e3a42026..76e3a42026 100644 --- a/src/backends/RefWorkloads/RefConstantFloat32Workload.hpp +++ b/src/backends/reference/workloads/RefConstantFloat32Workload.hpp diff --git a/src/backends/RefWorkloads/RefConstantUint8Workload.cpp b/src/backends/reference/workloads/RefConstantUint8Workload.cpp index 07e4719d54..07e4719d54 100644 --- a/src/backends/RefWorkloads/RefConstantUint8Workload.cpp +++ b/src/backends/reference/workloads/RefConstantUint8Workload.cpp diff --git a/src/backends/RefWorkloads/RefConstantUint8Workload.hpp b/src/backends/reference/workloads/RefConstantUint8Workload.hpp index 02552ac80b..02552ac80b 100644 --- a/src/backends/RefWorkloads/RefConstantUint8Workload.hpp +++ b/src/backends/reference/workloads/RefConstantUint8Workload.hpp diff --git a/src/backends/RefWorkloads/RefConvertFp16ToFp32Workload.cpp b/src/backends/reference/workloads/RefConvertFp16ToFp32Workload.cpp index e148bf6a9d..e148bf6a9d 100644 --- a/src/backends/RefWorkloads/RefConvertFp16ToFp32Workload.cpp +++ b/src/backends/reference/workloads/RefConvertFp16ToFp32Workload.cpp diff --git a/src/backends/RefWorkloads/RefConvertFp16ToFp32Workload.hpp b/src/backends/reference/workloads/RefConvertFp16ToFp32Workload.hpp index 5e841ba34f..5e841ba34f 100644 --- a/src/backends/RefWorkloads/RefConvertFp16ToFp32Workload.hpp +++ b/src/backends/reference/workloads/RefConvertFp16ToFp32Workload.hpp diff --git a/src/backends/RefWorkloads/RefConvertFp32ToFp16Workload.cpp b/src/backends/reference/workloads/RefConvertFp32ToFp16Workload.cpp index efaaf8e1ad..efaaf8e1ad 100644 --- a/src/backends/RefWorkloads/RefConvertFp32ToFp16Workload.cpp +++ b/src/backends/reference/workloads/RefConvertFp32ToFp16Workload.cpp diff --git a/src/backends/RefWorkloads/RefConvertFp32ToFp16Workload.hpp b/src/backends/reference/workloads/RefConvertFp32ToFp16Workload.hpp index 0754fd5c79..0754fd5c79 100644 --- a/src/backends/RefWorkloads/RefConvertFp32ToFp16Workload.hpp +++ b/src/backends/reference/workloads/RefConvertFp32ToFp16Workload.hpp diff --git a/src/backends/RefWorkloads/RefConvolution2dFloat32Workload.cpp b/src/backends/reference/workloads/RefConvolution2dFloat32Workload.cpp index 20905646d7..20905646d7 100644 --- a/src/backends/RefWorkloads/RefConvolution2dFloat32Workload.cpp +++ b/src/backends/reference/workloads/RefConvolution2dFloat32Workload.cpp diff --git a/src/backends/RefWorkloads/RefConvolution2dFloat32Workload.hpp b/src/backends/reference/workloads/RefConvolution2dFloat32Workload.hpp index 34489e807c..34489e807c 100644 --- a/src/backends/RefWorkloads/RefConvolution2dFloat32Workload.hpp +++ b/src/backends/reference/workloads/RefConvolution2dFloat32Workload.hpp diff --git a/src/backends/RefWorkloads/RefConvolution2dUint8Workload.cpp b/src/backends/reference/workloads/RefConvolution2dUint8Workload.cpp index 881e9bf6b0..881e9bf6b0 100644 --- a/src/backends/RefWorkloads/RefConvolution2dUint8Workload.cpp +++ b/src/backends/reference/workloads/RefConvolution2dUint8Workload.cpp diff --git a/src/backends/RefWorkloads/RefConvolution2dUint8Workload.hpp b/src/backends/reference/workloads/RefConvolution2dUint8Workload.hpp index 0e2dd6aada..0e2dd6aada 100644 --- a/src/backends/RefWorkloads/RefConvolution2dUint8Workload.hpp +++ b/src/backends/reference/workloads/RefConvolution2dUint8Workload.hpp diff --git a/src/backends/RefWorkloads/RefDepthwiseConvolution2dFloat32Workload.cpp b/src/backends/reference/workloads/RefDepthwiseConvolution2dFloat32Workload.cpp index e89013b9bd..e89013b9bd 100644 --- a/src/backends/RefWorkloads/RefDepthwiseConvolution2dFloat32Workload.cpp +++ b/src/backends/reference/workloads/RefDepthwiseConvolution2dFloat32Workload.cpp diff --git a/src/backends/RefWorkloads/RefDepthwiseConvolution2dFloat32Workload.hpp b/src/backends/reference/workloads/RefDepthwiseConvolution2dFloat32Workload.hpp index 8f1227e2de..8f1227e2de 100644 --- a/src/backends/RefWorkloads/RefDepthwiseConvolution2dFloat32Workload.hpp +++ b/src/backends/reference/workloads/RefDepthwiseConvolution2dFloat32Workload.hpp diff --git a/src/backends/RefWorkloads/RefDepthwiseConvolution2dUint8Workload.cpp b/src/backends/reference/workloads/RefDepthwiseConvolution2dUint8Workload.cpp index e8e501d6ae..e8e501d6ae 100644 --- a/src/backends/RefWorkloads/RefDepthwiseConvolution2dUint8Workload.cpp +++ b/src/backends/reference/workloads/RefDepthwiseConvolution2dUint8Workload.cpp diff --git a/src/backends/RefWorkloads/RefDepthwiseConvolution2dUint8Workload.hpp b/src/backends/reference/workloads/RefDepthwiseConvolution2dUint8Workload.hpp index c615cf7880..c615cf7880 100644 --- a/src/backends/RefWorkloads/RefDepthwiseConvolution2dUint8Workload.hpp +++ b/src/backends/reference/workloads/RefDepthwiseConvolution2dUint8Workload.hpp diff --git a/src/backends/RefWorkloads/RefFakeQuantizationFloat32Workload.cpp b/src/backends/reference/workloads/RefFakeQuantizationFloat32Workload.cpp index 3e16f60b11..3e16f60b11 100644 --- a/src/backends/RefWorkloads/RefFakeQuantizationFloat32Workload.cpp +++ b/src/backends/reference/workloads/RefFakeQuantizationFloat32Workload.cpp diff --git a/src/backends/RefWorkloads/RefFakeQuantizationFloat32Workload.hpp b/src/backends/reference/workloads/RefFakeQuantizationFloat32Workload.hpp index 523fdcff50..523fdcff50 100644 --- a/src/backends/RefWorkloads/RefFakeQuantizationFloat32Workload.hpp +++ b/src/backends/reference/workloads/RefFakeQuantizationFloat32Workload.hpp diff --git a/src/backends/RefWorkloads/RefFloorFloat32Workload.cpp b/src/backends/reference/workloads/RefFloorFloat32Workload.cpp index cc1f8800dc..cc1f8800dc 100644 --- a/src/backends/RefWorkloads/RefFloorFloat32Workload.cpp +++ b/src/backends/reference/workloads/RefFloorFloat32Workload.cpp diff --git a/src/backends/RefWorkloads/RefFloorFloat32Workload.hpp b/src/backends/reference/workloads/RefFloorFloat32Workload.hpp index d7cfa50365..d7cfa50365 100644 --- a/src/backends/RefWorkloads/RefFloorFloat32Workload.hpp +++ b/src/backends/reference/workloads/RefFloorFloat32Workload.hpp diff --git a/src/backends/RefWorkloads/RefFullyConnectedFloat32Workload.cpp b/src/backends/reference/workloads/RefFullyConnectedFloat32Workload.cpp index ccaf4cd87b..ccaf4cd87b 100644 --- a/src/backends/RefWorkloads/RefFullyConnectedFloat32Workload.cpp +++ b/src/backends/reference/workloads/RefFullyConnectedFloat32Workload.cpp diff --git a/src/backends/RefWorkloads/RefFullyConnectedFloat32Workload.hpp b/src/backends/reference/workloads/RefFullyConnectedFloat32Workload.hpp index ce058690ac..ce058690ac 100644 --- a/src/backends/RefWorkloads/RefFullyConnectedFloat32Workload.hpp +++ b/src/backends/reference/workloads/RefFullyConnectedFloat32Workload.hpp diff --git a/src/backends/RefWorkloads/RefFullyConnectedUint8Workload.cpp b/src/backends/reference/workloads/RefFullyConnectedUint8Workload.cpp index cd785d786c..cd785d786c 100644 --- a/src/backends/RefWorkloads/RefFullyConnectedUint8Workload.cpp +++ b/src/backends/reference/workloads/RefFullyConnectedUint8Workload.cpp diff --git a/src/backends/RefWorkloads/RefFullyConnectedUint8Workload.hpp b/src/backends/reference/workloads/RefFullyConnectedUint8Workload.hpp index e489cc7d81..e489cc7d81 100644 --- a/src/backends/RefWorkloads/RefFullyConnectedUint8Workload.hpp +++ b/src/backends/reference/workloads/RefFullyConnectedUint8Workload.hpp diff --git a/src/backends/RefWorkloads/RefL2NormalizationFloat32Workload.cpp b/src/backends/reference/workloads/RefL2NormalizationFloat32Workload.cpp index 973c87b009..973c87b009 100644 --- a/src/backends/RefWorkloads/RefL2NormalizationFloat32Workload.cpp +++ b/src/backends/reference/workloads/RefL2NormalizationFloat32Workload.cpp diff --git a/src/backends/RefWorkloads/RefL2NormalizationFloat32Workload.hpp b/src/backends/reference/workloads/RefL2NormalizationFloat32Workload.hpp index a3f03f3060..a3f03f3060 100644 --- a/src/backends/RefWorkloads/RefL2NormalizationFloat32Workload.hpp +++ b/src/backends/reference/workloads/RefL2NormalizationFloat32Workload.hpp diff --git a/src/backends/RefWorkloads/RefLstmFloat32Workload.cpp b/src/backends/reference/workloads/RefLstmFloat32Workload.cpp index 50ff605701..50ff605701 100644 --- a/src/backends/RefWorkloads/RefLstmFloat32Workload.cpp +++ b/src/backends/reference/workloads/RefLstmFloat32Workload.cpp diff --git a/src/backends/RefWorkloads/RefLstmFloat32Workload.hpp b/src/backends/reference/workloads/RefLstmFloat32Workload.hpp index fc4f7776c6..fc4f7776c6 100644 --- a/src/backends/RefWorkloads/RefLstmFloat32Workload.hpp +++ b/src/backends/reference/workloads/RefLstmFloat32Workload.hpp diff --git a/src/backends/RefWorkloads/RefMergerFloat32Workload.cpp b/src/backends/reference/workloads/RefMergerFloat32Workload.cpp index b1f8a32ee7..b1f8a32ee7 100644 --- a/src/backends/RefWorkloads/RefMergerFloat32Workload.cpp +++ b/src/backends/reference/workloads/RefMergerFloat32Workload.cpp diff --git a/src/backends/RefWorkloads/RefMergerFloat32Workload.hpp b/src/backends/reference/workloads/RefMergerFloat32Workload.hpp index 23a523c852..23a523c852 100644 --- a/src/backends/RefWorkloads/RefMergerFloat32Workload.hpp +++ b/src/backends/reference/workloads/RefMergerFloat32Workload.hpp diff --git a/src/backends/RefWorkloads/RefMergerUint8Workload.cpp b/src/backends/reference/workloads/RefMergerUint8Workload.cpp index 47ce1cf731..47ce1cf731 100644 --- a/src/backends/RefWorkloads/RefMergerUint8Workload.cpp +++ b/src/backends/reference/workloads/RefMergerUint8Workload.cpp diff --git a/src/backends/RefWorkloads/RefMergerUint8Workload.hpp b/src/backends/reference/workloads/RefMergerUint8Workload.hpp index 65dc42120a..65dc42120a 100644 --- a/src/backends/RefWorkloads/RefMergerUint8Workload.hpp +++ b/src/backends/reference/workloads/RefMergerUint8Workload.hpp diff --git a/src/backends/RefWorkloads/RefNormalizationFloat32Workload.cpp b/src/backends/reference/workloads/RefNormalizationFloat32Workload.cpp index 5c24416624..5c24416624 100644 --- a/src/backends/RefWorkloads/RefNormalizationFloat32Workload.cpp +++ b/src/backends/reference/workloads/RefNormalizationFloat32Workload.cpp diff --git a/src/backends/RefWorkloads/RefNormalizationFloat32Workload.hpp b/src/backends/reference/workloads/RefNormalizationFloat32Workload.hpp index e30356c422..e30356c422 100644 --- a/src/backends/RefWorkloads/RefNormalizationFloat32Workload.hpp +++ b/src/backends/reference/workloads/RefNormalizationFloat32Workload.hpp diff --git a/src/backends/RefWorkloads/RefPermuteWorkload.cpp b/src/backends/reference/workloads/RefPermuteWorkload.cpp index 4093ff38f4..4093ff38f4 100644 --- a/src/backends/RefWorkloads/RefPermuteWorkload.cpp +++ b/src/backends/reference/workloads/RefPermuteWorkload.cpp diff --git a/src/backends/RefWorkloads/RefPermuteWorkload.hpp b/src/backends/reference/workloads/RefPermuteWorkload.hpp index d72cf77e74..d72cf77e74 100644 --- a/src/backends/RefWorkloads/RefPermuteWorkload.hpp +++ b/src/backends/reference/workloads/RefPermuteWorkload.hpp diff --git a/src/backends/RefWorkloads/RefPooling2dFloat32Workload.cpp b/src/backends/reference/workloads/RefPooling2dFloat32Workload.cpp index 2542756c26..2542756c26 100644 --- a/src/backends/RefWorkloads/RefPooling2dFloat32Workload.cpp +++ b/src/backends/reference/workloads/RefPooling2dFloat32Workload.cpp diff --git a/src/backends/RefWorkloads/RefPooling2dFloat32Workload.hpp b/src/backends/reference/workloads/RefPooling2dFloat32Workload.hpp index 501fb71aff..501fb71aff 100644 --- a/src/backends/RefWorkloads/RefPooling2dFloat32Workload.hpp +++ b/src/backends/reference/workloads/RefPooling2dFloat32Workload.hpp diff --git a/src/backends/RefWorkloads/RefPooling2dUint8Workload.cpp b/src/backends/reference/workloads/RefPooling2dUint8Workload.cpp index 91fdf291ee..91fdf291ee 100644 --- a/src/backends/RefWorkloads/RefPooling2dUint8Workload.cpp +++ b/src/backends/reference/workloads/RefPooling2dUint8Workload.cpp diff --git a/src/backends/RefWorkloads/RefPooling2dUint8Workload.hpp b/src/backends/reference/workloads/RefPooling2dUint8Workload.hpp index 6544f9a785..6544f9a785 100644 --- a/src/backends/RefWorkloads/RefPooling2dUint8Workload.hpp +++ b/src/backends/reference/workloads/RefPooling2dUint8Workload.hpp diff --git a/src/backends/RefWorkloads/RefReshapeFloat32Workload.cpp b/src/backends/reference/workloads/RefReshapeFloat32Workload.cpp index 99c94a49a1..99c94a49a1 100644 --- a/src/backends/RefWorkloads/RefReshapeFloat32Workload.cpp +++ b/src/backends/reference/workloads/RefReshapeFloat32Workload.cpp diff --git a/src/backends/RefWorkloads/RefReshapeFloat32Workload.hpp b/src/backends/reference/workloads/RefReshapeFloat32Workload.hpp index 9281e89cf7..9281e89cf7 100644 --- a/src/backends/RefWorkloads/RefReshapeFloat32Workload.hpp +++ b/src/backends/reference/workloads/RefReshapeFloat32Workload.hpp diff --git a/src/backends/RefWorkloads/RefReshapeUint8Workload.cpp b/src/backends/reference/workloads/RefReshapeUint8Workload.cpp index 8f475f3db3..8f475f3db3 100644 --- a/src/backends/RefWorkloads/RefReshapeUint8Workload.cpp +++ b/src/backends/reference/workloads/RefReshapeUint8Workload.cpp diff --git a/src/backends/RefWorkloads/RefReshapeUint8Workload.hpp b/src/backends/reference/workloads/RefReshapeUint8Workload.hpp index b37fb4bdeb..b37fb4bdeb 100644 --- a/src/backends/RefWorkloads/RefReshapeUint8Workload.hpp +++ b/src/backends/reference/workloads/RefReshapeUint8Workload.hpp diff --git a/src/backends/RefWorkloads/RefResizeBilinearFloat32Workload.cpp b/src/backends/reference/workloads/RefResizeBilinearFloat32Workload.cpp index 50ee7a218a..50ee7a218a 100644 --- a/src/backends/RefWorkloads/RefResizeBilinearFloat32Workload.cpp +++ b/src/backends/reference/workloads/RefResizeBilinearFloat32Workload.cpp diff --git a/src/backends/RefWorkloads/RefResizeBilinearFloat32Workload.hpp b/src/backends/reference/workloads/RefResizeBilinearFloat32Workload.hpp index 0fff7ee695..0fff7ee695 100644 --- a/src/backends/RefWorkloads/RefResizeBilinearFloat32Workload.hpp +++ b/src/backends/reference/workloads/RefResizeBilinearFloat32Workload.hpp diff --git a/src/backends/RefWorkloads/RefResizeBilinearUint8Workload.cpp b/src/backends/reference/workloads/RefResizeBilinearUint8Workload.cpp index 67ab039ef3..67ab039ef3 100644 --- a/src/backends/RefWorkloads/RefResizeBilinearUint8Workload.cpp +++ b/src/backends/reference/workloads/RefResizeBilinearUint8Workload.cpp diff --git a/src/backends/RefWorkloads/RefResizeBilinearUint8Workload.hpp b/src/backends/reference/workloads/RefResizeBilinearUint8Workload.hpp index bbaf899ca6..bbaf899ca6 100644 --- a/src/backends/RefWorkloads/RefResizeBilinearUint8Workload.hpp +++ b/src/backends/reference/workloads/RefResizeBilinearUint8Workload.hpp diff --git a/src/backends/RefWorkloads/RefSoftmaxFloat32Workload.cpp b/src/backends/reference/workloads/RefSoftmaxFloat32Workload.cpp index 1f519bda10..1f519bda10 100644 --- a/src/backends/RefWorkloads/RefSoftmaxFloat32Workload.cpp +++ b/src/backends/reference/workloads/RefSoftmaxFloat32Workload.cpp diff --git a/src/backends/RefWorkloads/RefSoftmaxFloat32Workload.hpp b/src/backends/reference/workloads/RefSoftmaxFloat32Workload.hpp index d37f2b5990..d37f2b5990 100644 --- a/src/backends/RefWorkloads/RefSoftmaxFloat32Workload.hpp +++ b/src/backends/reference/workloads/RefSoftmaxFloat32Workload.hpp diff --git a/src/backends/RefWorkloads/RefSoftmaxUint8Workload.cpp b/src/backends/reference/workloads/RefSoftmaxUint8Workload.cpp index 17114ec83a..17114ec83a 100644 --- a/src/backends/RefWorkloads/RefSoftmaxUint8Workload.cpp +++ b/src/backends/reference/workloads/RefSoftmaxUint8Workload.cpp diff --git a/src/backends/RefWorkloads/RefSoftmaxUint8Workload.hpp b/src/backends/reference/workloads/RefSoftmaxUint8Workload.hpp index b179d529da..b179d529da 100644 --- a/src/backends/RefWorkloads/RefSoftmaxUint8Workload.hpp +++ b/src/backends/reference/workloads/RefSoftmaxUint8Workload.hpp diff --git a/src/backends/RefWorkloads/RefSplitterFloat32Workload.cpp b/src/backends/reference/workloads/RefSplitterFloat32Workload.cpp index 75611dacf3..75611dacf3 100644 --- a/src/backends/RefWorkloads/RefSplitterFloat32Workload.cpp +++ b/src/backends/reference/workloads/RefSplitterFloat32Workload.cpp diff --git a/src/backends/RefWorkloads/RefSplitterFloat32Workload.hpp b/src/backends/reference/workloads/RefSplitterFloat32Workload.hpp index 12176dd277..12176dd277 100644 --- a/src/backends/RefWorkloads/RefSplitterFloat32Workload.hpp +++ b/src/backends/reference/workloads/RefSplitterFloat32Workload.hpp diff --git a/src/backends/RefWorkloads/RefSplitterUint8Workload.cpp b/src/backends/reference/workloads/RefSplitterUint8Workload.cpp index ca9f5db850..ca9f5db850 100644 --- a/src/backends/RefWorkloads/RefSplitterUint8Workload.cpp +++ b/src/backends/reference/workloads/RefSplitterUint8Workload.cpp diff --git a/src/backends/RefWorkloads/RefSplitterUint8Workload.hpp b/src/backends/reference/workloads/RefSplitterUint8Workload.hpp index e80cb1a654..e80cb1a654 100644 --- a/src/backends/RefWorkloads/RefSplitterUint8Workload.hpp +++ b/src/backends/reference/workloads/RefSplitterUint8Workload.hpp diff --git a/src/backends/RefWorkloads/RefWorkloadUtils.hpp b/src/backends/reference/workloads/RefWorkloadUtils.hpp index 616a875028..616a875028 100644 --- a/src/backends/RefWorkloads/RefWorkloadUtils.hpp +++ b/src/backends/reference/workloads/RefWorkloadUtils.hpp diff --git a/src/backends/reference/workloads/RefWorkloads.hpp b/src/backends/reference/workloads/RefWorkloads.hpp new file mode 100644 index 0000000000..e5c6e1e9d5 --- /dev/null +++ b/src/backends/reference/workloads/RefWorkloads.hpp @@ -0,0 +1,53 @@ +// +// Copyright © 2017 Arm Ltd. All rights reserved. +// SPDX-License-Identifier: MIT +// + +#pragma once + +#include "RefConstantUint8Workload.hpp" +#include "ArithmeticFunction.hpp" +#include "RefArithmeticWorkload.hpp" +#include "ConvImpl.hpp" +#include "RefBaseConstantWorkload.hpp" +#include "RefConvolution2dUint8Workload.hpp" +#include "RefSplitterUint8Workload.hpp" +#include "RefResizeBilinearUint8Workload.hpp" +#include "RefL2NormalizationFloat32Workload.hpp" +#include "RefActivationUint8Workload.hpp" +#include "RefPooling2dFloat32Workload.hpp" +#include "RefWorkloadUtils.hpp" +#include "RefMergerUint8Workload.hpp" +#include "RefFullyConnectedFloat32Workload.hpp" +#include "Softmax.hpp" +#include "RefMergerFloat32Workload.hpp" +#include "TensorBufferArrayView.hpp" +#include "RefBatchNormalizationFloat32Workload.hpp" +#include "Splitter.hpp" +#include "RefFullyConnectedUint8Workload.hpp" +#include "RefReshapeFloat32Workload.hpp" +#include "RefDepthwiseConvolution2dUint8Workload.hpp" +#include "FullyConnected.hpp" +#include "RefFloorFloat32Workload.hpp" +#include "RefSoftmaxFloat32Workload.hpp" +#include "RefSoftmaxUint8Workload.hpp" +#include "RefReshapeUint8Workload.hpp" +#include "RefResizeBilinearFloat32Workload.hpp" +#include "RefBatchNormalizationUint8Workload.hpp" +#include "ResizeBilinear.hpp" +#include "RefNormalizationFloat32Workload.hpp" +#include "RefDepthwiseConvolution2dFloat32Workload.hpp" +#include "RefPooling2dUint8Workload.hpp" +#include "BatchNormImpl.hpp" +#include "Activation.hpp" +#include "Merger.hpp" +#include "RefSplitterFloat32Workload.hpp" +#include "RefConstantFloat32Workload.hpp" +#include "RefActivationFloat32Workload.hpp" +#include "RefConvolution2dFloat32Workload.hpp" +#include "Pooling2d.hpp" +#include "RefFakeQuantizationFloat32Workload.hpp" +#include "RefPermuteWorkload.hpp" +#include "RefLstmFloat32Workload.hpp" +#include "RefConvertFp16ToFp32Workload.hpp" +#include "RefConvertFp32ToFp16Workload.hpp" diff --git a/src/backends/RefWorkloads/ResizeBilinear.cpp b/src/backends/reference/workloads/ResizeBilinear.cpp index 0bce3c7ed8..0bce3c7ed8 100644 --- a/src/backends/RefWorkloads/ResizeBilinear.cpp +++ b/src/backends/reference/workloads/ResizeBilinear.cpp diff --git a/src/backends/RefWorkloads/ResizeBilinear.hpp b/src/backends/reference/workloads/ResizeBilinear.hpp index 847b8e8bef..847b8e8bef 100644 --- a/src/backends/RefWorkloads/ResizeBilinear.hpp +++ b/src/backends/reference/workloads/ResizeBilinear.hpp diff --git a/src/backends/RefWorkloads/Softmax.cpp b/src/backends/reference/workloads/Softmax.cpp index 4f1016e86c..4f1016e86c 100644 --- a/src/backends/RefWorkloads/Softmax.cpp +++ b/src/backends/reference/workloads/Softmax.cpp diff --git a/src/backends/RefWorkloads/Softmax.hpp b/src/backends/reference/workloads/Softmax.hpp index 3b974f9e9e..3b974f9e9e 100644 --- a/src/backends/RefWorkloads/Softmax.hpp +++ b/src/backends/reference/workloads/Softmax.hpp diff --git a/src/backends/RefWorkloads/Splitter.hpp b/src/backends/reference/workloads/Splitter.hpp index e9c0379c9e..e9c0379c9e 100644 --- a/src/backends/RefWorkloads/Splitter.hpp +++ b/src/backends/reference/workloads/Splitter.hpp diff --git a/src/backends/RefWorkloads/TensorBufferArrayView.hpp b/src/backends/reference/workloads/TensorBufferArrayView.hpp index e19810ca87..e19810ca87 100644 --- a/src/backends/RefWorkloads/TensorBufferArrayView.hpp +++ b/src/backends/reference/workloads/TensorBufferArrayView.hpp diff --git a/src/backends/test/ArmComputeCl.cpp b/src/backends/test/ArmComputeCl.cpp index 9a516b6d60..5ff94c1056 100644 --- a/src/backends/test/ArmComputeCl.cpp +++ b/src/backends/test/ArmComputeCl.cpp @@ -6,11 +6,11 @@ #include "test/TensorHelpers.hpp" #include "LayerTests.hpp" -#include "backends/CpuTensorHandle.hpp" -#include "backends/ClWorkloadFactory.hpp" -#include "backends/ClWorkloads/ClWorkloadUtils.hpp" -#include "backends/RefWorkloadFactory.hpp" -#include "backends/ClLayerSupport.hpp" +#include <backends/CpuTensorHandle.hpp> +#include <backends/ClWorkloadFactory.hpp> +#include <backends/ClWorkloads/ClWorkloadUtils.hpp> +#include <backends/reference/RefWorkloadFactory.hpp> +#include <backends/ClLayerSupport.hpp> #include "ActivationFixture.hpp" #include "ClContextControlFixture.hpp" diff --git a/src/backends/test/ArmComputeNeon.cpp b/src/backends/test/ArmComputeNeon.cpp index bc3b6b5def..e8af6b32d2 100644 --- a/src/backends/test/ArmComputeNeon.cpp +++ b/src/backends/test/ArmComputeNeon.cpp @@ -7,11 +7,11 @@ #include "test/TensorHelpers.hpp" #include "LayerTests.hpp" -#include "backends/CpuTensorHandle.hpp" -#include "backends/NeonLayerSupport.hpp" -#include "backends/NeonWorkloadFactory.hpp" -#include "backends/RefWorkloadFactory.hpp" -#include "backends/test/TensorCopyUtils.hpp" +#include <backends/CpuTensorHandle.hpp> +#include <backends/NeonLayerSupport.hpp> +#include <backends/NeonWorkloadFactory.hpp> +#include <backends/reference/RefWorkloadFactory.hpp> +#include <backends/test/TensorCopyUtils.hpp> #include "ActivationFixture.hpp" #include "WorkloadTestUtils.hpp" diff --git a/src/backends/test/CreateWorkloadCl.cpp b/src/backends/test/CreateWorkloadCl.cpp index af3192cae2..39bc259940 100644 --- a/src/backends/test/CreateWorkloadCl.cpp +++ b/src/backends/test/CreateWorkloadCl.cpp @@ -2,12 +2,12 @@ // Copyright © 2017 Arm Ltd. All rights reserved. // SPDX-License-Identifier: MIT // -#include "backends/ClWorkloadFactory.hpp" -#include "backends/RefWorkloadFactory.hpp" -#include "backends/MemCopyWorkload.hpp" -#include "backends/ClWorkloads/ClWorkloadUtils.hpp" -#include "backends/ClWorkloads.hpp" -#include "backends/ClTensorHandle.hpp" +#include <backends/ClWorkloadFactory.hpp> +#include <backends/reference/RefWorkloadFactory.hpp> +#include <backends/MemCopyWorkload.hpp> +#include <backends/ClWorkloads/ClWorkloadUtils.hpp> +#include <backends/ClWorkloads.hpp> +#include <backends/ClTensorHandle.hpp> #include "ClContextControlFixture.hpp" #include "test/CreateWorkloadClNeon.hpp" diff --git a/src/backends/test/CreateWorkloadRef.cpp b/src/backends/test/CreateWorkloadRef.cpp index 41419dafd0..9313ee851f 100644 --- a/src/backends/test/CreateWorkloadRef.cpp +++ b/src/backends/test/CreateWorkloadRef.cpp @@ -2,9 +2,9 @@ // Copyright © 2017 Arm Ltd. All rights reserved. // SPDX-License-Identifier: MIT // -#include "backends/RefWorkloadFactory.hpp" -#include "backends/RefWorkloads.hpp" -#include "backends/CpuTensorHandle.hpp" +#include <backends/reference/RefWorkloadFactory.hpp> +#include <backends/reference/workloads/RefWorkloads.hpp> +#include <backends/CpuTensorHandle.hpp> #include "test/CreateWorkload.hpp" diff --git a/src/backends/test/IsLayerSupportedTest.cpp b/src/backends/test/IsLayerSupportedTest.cpp index 97d3de5e38..51bf11ebfa 100644 --- a/src/backends/test/IsLayerSupportedTest.cpp +++ b/src/backends/test/IsLayerSupportedTest.cpp @@ -7,8 +7,8 @@ #include "test/TensorHelpers.hpp" #include "LayerTests.hpp" -#include "backends/CpuTensorHandle.hpp" -#include "backends/RefWorkloadFactory.hpp" +#include <backends/CpuTensorHandle.hpp> +#include <backends/reference/RefWorkloadFactory.hpp> #include <string> #include <iostream> diff --git a/src/backends/test/MemCopyTests.cpp b/src/backends/test/MemCopyTests.cpp index 7ba55078e2..4fbe9e717e 100644 --- a/src/backends/test/MemCopyTests.cpp +++ b/src/backends/test/MemCopyTests.cpp @@ -6,7 +6,7 @@ #include <boost/multi_array.hpp> #include <armnn/ArmNN.hpp> -#include <backends/RefWorkloadFactory.hpp> +#include <backends/reference/RefWorkloadFactory.hpp> #if ARMCOMPUTECL_ENABLED #include <backends/ClWorkloadFactory.hpp> #endif diff --git a/src/backends/test/Reference.cpp b/src/backends/test/Reference.cpp index 62786a9ec4..97a209d757 100644 --- a/src/backends/test/Reference.cpp +++ b/src/backends/test/Reference.cpp @@ -7,7 +7,7 @@ #include "LayerTests.hpp" #include "test/TensorHelpers.hpp" -#include "backends/RefWorkloadFactory.hpp" +#include <backends/reference/RefWorkloadFactory.hpp> #include "test/UnitTests.hpp" diff --git a/src/backends/test/WorkloadDataValidation.cpp b/src/backends/test/WorkloadDataValidation.cpp index a5cfbd1270..7e3a90feda 100644 --- a/src/backends/test/WorkloadDataValidation.cpp +++ b/src/backends/test/WorkloadDataValidation.cpp @@ -5,8 +5,8 @@ #include <boost/test/unit_test.hpp> #include <backends/CpuTensorHandle.hpp> #include <backends/Workload.hpp> -#include <backends/RefWorkloads.hpp> -#include <backends/RefWorkloadFactory.hpp> +#include <backends/reference/workloads/RefWorkloads.hpp> +#include <backends/reference/RefWorkloadFactory.hpp> #include <armnn/Exceptions.hpp> |