diff options
| author | Moritz Pflanzer <moritz.pflanzer@arm.com> | 2017-06-30 12:48:43 +0100 |
|---|---|---|
| committer | Anthony Barbier <anthony.barbier@arm.com> | 2018-09-17 14:15:39 +0100 |
| commit | 94450f1fc91a89778354c2e1c07a328ba86d9cfc (patch) | |
| tree | 9a84b1b86f5361027492b6698ea946d2e321baba /tests/benchmark/NEON | |
| parent | d4f8c27f08c968f608a9e0e9b88df1871f62cdd3 (diff) | |
| download | ComputeLibrary-94450f1fc91a89778354c2e1c07a328ba86d9cfc.tar.gz | |
COMPMID-417: Use a common create_tensor function
Change-Id: I6b0511484a5b433ebec3fd62d778e64dcb4f89b5
Reviewed-on: http://mpd-gerrit.cambridge.arm.com/79362
Reviewed-by: Georgios Pinitas <georgios.pinitas@arm.com>
Tested-by: Kaizen <jeremy.johnson+kaizengerrit@arm.com>
Diffstat (limited to 'tests/benchmark/NEON')
| -rw-r--r-- | tests/benchmark/NEON/ActivationLayer.cpp | 1 | ||||
| -rw-r--r-- | tests/benchmark/NEON/BitwiseAnd.cpp | 8 | ||||
| -rw-r--r-- | tests/benchmark/NEON/ConvolutionLayer.cpp | 1 | ||||
| -rw-r--r-- | tests/benchmark/NEON/ConvolutionLayerDirect.cpp | 1 | ||||
| -rw-r--r-- | tests/benchmark/NEON/FullyConnectedLayer.cpp | 1 | ||||
| -rw-r--r-- | tests/benchmark/NEON/GEMM.cpp | 1 | ||||
| -rw-r--r-- | tests/benchmark/NEON/GEMM.h | 8 | ||||
| -rw-r--r-- | tests/benchmark/NEON/NormalizationLayer.cpp | 1 | ||||
| -rw-r--r-- | tests/benchmark/NEON/PoolingLayer.cpp | 1 |
9 files changed, 8 insertions, 15 deletions
diff --git a/tests/benchmark/NEON/ActivationLayer.cpp b/tests/benchmark/NEON/ActivationLayer.cpp index 8faed9f831..9ea675e515 100644 --- a/tests/benchmark/NEON/ActivationLayer.cpp +++ b/tests/benchmark/NEON/ActivationLayer.cpp @@ -22,7 +22,6 @@ * SOFTWARE. */ #include "Globals.h" -#include "NEON/Helper.h" #include "NEON/NEAccessor.h" #include "TensorLibrary.h" #include "benchmark/Datasets.h" diff --git a/tests/benchmark/NEON/BitwiseAnd.cpp b/tests/benchmark/NEON/BitwiseAnd.cpp index dba3d1ebea..be68fd39e4 100644 --- a/tests/benchmark/NEON/BitwiseAnd.cpp +++ b/tests/benchmark/NEON/BitwiseAnd.cpp @@ -22,7 +22,6 @@ * SOFTWARE. */ #include "Globals.h" -#include "NEON/Helper.h" #include "NEON/NEAccessor.h" #include "TensorLibrary.h" #include "benchmark/Datasets.h" @@ -56,11 +55,12 @@ public: profiler.add(std::make_shared<WallClockTimer>()); const std::string image_name = *(DataSet().begin() + state.range(0)); + const RawTensor &raw = library->get(image_name); // Create tensors - src1 = create_tensor(image_name, DataType::U8); - src2 = create_tensor(image_name, DataType::U8); - dst = create_tensor(image_name, DataType::U8); + src1 = create_tensor<Tensor>(raw.shape(), DataType::U8); + src2 = create_tensor<Tensor>(raw.shape(), DataType::U8); + dst = create_tensor<Tensor>(raw.shape(), DataType::U8); // Create and configure function band.configure(&src1, &src2, &dst); diff --git a/tests/benchmark/NEON/ConvolutionLayer.cpp b/tests/benchmark/NEON/ConvolutionLayer.cpp index 0cfff8494b..a0b1236177 100644 --- a/tests/benchmark/NEON/ConvolutionLayer.cpp +++ b/tests/benchmark/NEON/ConvolutionLayer.cpp @@ -22,7 +22,6 @@ * SOFTWARE. */ #include "Globals.h" -#include "NEON/Helper.h" #include "NEON/NEAccessor.h" #include "TensorLibrary.h" #include "benchmark/Datasets.h" diff --git a/tests/benchmark/NEON/ConvolutionLayerDirect.cpp b/tests/benchmark/NEON/ConvolutionLayerDirect.cpp index bc56e844d8..bbe5707e41 100644 --- a/tests/benchmark/NEON/ConvolutionLayerDirect.cpp +++ b/tests/benchmark/NEON/ConvolutionLayerDirect.cpp @@ -22,7 +22,6 @@ * SOFTWARE. */ #include "Globals.h" -#include "NEON/Helper.h" #include "NEON/NEAccessor.h" #include "TensorLibrary.h" #include "benchmark/Datasets.h" diff --git a/tests/benchmark/NEON/FullyConnectedLayer.cpp b/tests/benchmark/NEON/FullyConnectedLayer.cpp index 85979203ac..15c2a407e6 100644 --- a/tests/benchmark/NEON/FullyConnectedLayer.cpp +++ b/tests/benchmark/NEON/FullyConnectedLayer.cpp @@ -22,7 +22,6 @@ * SOFTWARE. */ #include "Globals.h" -#include "NEON/Helper.h" #include "NEON/NEAccessor.h" #include "TensorLibrary.h" #include "benchmark/Datasets.h" diff --git a/tests/benchmark/NEON/GEMM.cpp b/tests/benchmark/NEON/GEMM.cpp index 50131b4998..1655c32e2b 100644 --- a/tests/benchmark/NEON/GEMM.cpp +++ b/tests/benchmark/NEON/GEMM.cpp @@ -22,7 +22,6 @@ * SOFTWARE. */ #include "Globals.h" -#include "NEON/Helper.h" #include "NEON/NEAccessor.h" #include "TensorLibrary.h" #include "benchmark/Datasets.h" diff --git a/tests/benchmark/NEON/GEMM.h b/tests/benchmark/NEON/GEMM.h index 24d196523f..4f0557d610 100644 --- a/tests/benchmark/NEON/GEMM.h +++ b/tests/benchmark/NEON/GEMM.h @@ -63,10 +63,10 @@ public: TensorShape shape_d = gemm_obj.shape_d; // Create tensors - a = create_tensor(shape_a, data_type, 1, 4); - b = create_tensor(shape_b, data_type, 1, 4); - c = create_tensor(shape_c, data_type, 1, 4); - d = create_tensor(shape_d, data_type, 1, 4); + a = create_tensor<Tensor>(shape_a, data_type, 1, 4); + b = create_tensor<Tensor>(shape_b, data_type, 1, 4); + c = create_tensor<Tensor>(shape_c, data_type, 1, 4); + d = create_tensor<Tensor>(shape_d, data_type, 1, 4); // Create and configure function gemm_layer = std::unique_ptr<Function>(new Function()); diff --git a/tests/benchmark/NEON/NormalizationLayer.cpp b/tests/benchmark/NEON/NormalizationLayer.cpp index 46dc56b84d..8ea8c95cda 100644 --- a/tests/benchmark/NEON/NormalizationLayer.cpp +++ b/tests/benchmark/NEON/NormalizationLayer.cpp @@ -22,7 +22,6 @@ * SOFTWARE. */ #include "Globals.h" -#include "NEON/Helper.h" #include "NEON/NEAccessor.h" #include "TensorLibrary.h" #include "benchmark/Datasets.h" diff --git a/tests/benchmark/NEON/PoolingLayer.cpp b/tests/benchmark/NEON/PoolingLayer.cpp index 9b071317b4..dfa75497cd 100644 --- a/tests/benchmark/NEON/PoolingLayer.cpp +++ b/tests/benchmark/NEON/PoolingLayer.cpp @@ -22,7 +22,6 @@ * SOFTWARE. */ #include "Globals.h" -#include "NEON/Helper.h" #include "NEON/NEAccessor.h" #include "TensorLibrary.h" #include "benchmark/Datasets.h" |