diff options
author | Giorgio Arena <giorgio.arena@arm.com> | 2017-11-23 11:45:24 +0000 |
---|---|---|
committer | Anthony Barbier <anthony.barbier@arm.com> | 2018-11-02 16:41:58 +0000 |
commit | 04a8f8c4994f1c32b3f16a832c0e6f2599364c02 (patch) | |
tree | bb96843720896c60f8876a753b0a61b1efcab73b /tests/benchmark/CL | |
parent | 58c5794b917dae10ff115dd85ec69e2ca41136c1 (diff) | |
download | ComputeLibrary-04a8f8c4994f1c32b3f16a832c0e6f2599364c02.tar.gz |
COMPMID-692 Consistent names for the interfaces
Change-Id: I4b1f3f0da9ff5342c7de7083736fe91871d14e5b
Reviewed-on: https://eu-gerrit-1.euhpc.arm.com/110351
Tested-by: BSG Visual Compute Jenkins server to access repositories on http://mpd-gerrit.cambridge.arm.com <bsgcomp@arm.com>
Reviewed-by: Georgios Pinitas <georgios.pinitas@arm.com>
Reviewed-by: Anthony Barbier <anthony.barbier@arm.com>
Diffstat (limited to 'tests/benchmark/CL')
-rw-r--r-- | tests/benchmark/CL/DepthwiseConvolutionLayer.cpp (renamed from tests/benchmark/CL/DepthwiseConvolution.cpp) | 14 | ||||
-rw-r--r-- | tests/benchmark/CL/SYSTEM/MobileNet.cpp | 4 | ||||
-rw-r--r-- | tests/benchmark/CL/SYSTEM/MobileNetV1.cpp | 6 |
3 files changed, 12 insertions, 12 deletions
diff --git a/tests/benchmark/CL/DepthwiseConvolution.cpp b/tests/benchmark/CL/DepthwiseConvolutionLayer.cpp index 40412da6f9..be6fba0a90 100644 --- a/tests/benchmark/CL/DepthwiseConvolution.cpp +++ b/tests/benchmark/CL/DepthwiseConvolutionLayer.cpp @@ -25,10 +25,10 @@ #include "arm_compute/core/Types.h" #include "arm_compute/runtime/CL/CLTensor.h" #include "arm_compute/runtime/CL/CLTensorAllocator.h" -#include "arm_compute/runtime/CL/functions/CLDepthwiseConvolution.h" +#include "arm_compute/runtime/CL/functions/CLDepthwiseConvolutionLayer.h" #include "tests/CL/CLAccessor.h" -#include "tests/benchmark/fixtures/DepthwiseConvolutionFixture.h" -#include "tests/datasets/MobileNetDepthwiseConvolutionDataset.h" +#include "tests/benchmark/fixtures/DepthwiseConvolutionLayerFixture.h" +#include "tests/datasets/MobileNetDepthwiseConvolutionLayerDataset.h" #include "tests/framework/Macros.h" #include "tests/framework/datasets/Datasets.h" #include "utils/TypePrinter.h" @@ -37,13 +37,13 @@ namespace arm_compute { namespace test { -const auto data_types = framework::dataset::make("DataType", { DataType::F32 }); -using CLDepthwiseConvolutionFixture = DepthwiseConvolutionFixture<CLTensor, CLDepthwiseConvolution, CLAccessor>; +const auto data_types = framework::dataset::make("DataType", { DataType::F32 }); +using CLDepthwiseConvolutionLayerFixture = DepthwiseConvolutionLayerFixture<CLTensor, CLDepthwiseConvolutionLayer, CLAccessor>; TEST_SUITE(CL) -REGISTER_FIXTURE_DATA_TEST_CASE(MobileNetDepthwiseConvolution, CLDepthwiseConvolutionFixture, framework::DatasetMode::ALL, - framework::dataset::combine(framework::dataset::combine(datasets::MobileNetDepthwiseConvolutionDataset(), data_types), +REGISTER_FIXTURE_DATA_TEST_CASE(MobileNetDepthwiseConvolutionLayer, CLDepthwiseConvolutionLayerFixture, framework::DatasetMode::ALL, + framework::dataset::combine(framework::dataset::combine(datasets::MobileNetDepthwiseConvolutionLayerDataset(), data_types), framework::dataset::make("Batches", { 1 }))); TEST_SUITE_END() diff --git a/tests/benchmark/CL/SYSTEM/MobileNet.cpp b/tests/benchmark/CL/SYSTEM/MobileNet.cpp index c745a0acab..4712bc0c80 100644 --- a/tests/benchmark/CL/SYSTEM/MobileNet.cpp +++ b/tests/benchmark/CL/SYSTEM/MobileNet.cpp @@ -27,7 +27,7 @@ #include "arm_compute/runtime/CL/CLTensorAllocator.h" #include "arm_compute/runtime/CL/functions/CLActivationLayer.h" #include "arm_compute/runtime/CL/functions/CLConvolutionLayer.h" -#include "arm_compute/runtime/CL/functions/CLDepthwiseConvolution.h" +#include "arm_compute/runtime/CL/functions/CLDepthwiseConvolutionLayer.h" #include "arm_compute/runtime/CL/functions/CLDirectConvolutionLayer.h" #include "arm_compute/runtime/CL/functions/CLPoolingLayer.h" #include "arm_compute/runtime/CL/functions/CLReshapeLayer.h" @@ -46,7 +46,7 @@ using CLMobileNetFixture = MobileNetFixture<CLTensor, CLActivationLayer, CLConvolutionLayer, CLDirectConvolutionLayer, - CLDepthwiseConvolution, + CLDepthwiseConvolutionLayer, CLReshapeLayer, CLPoolingLayer>; diff --git a/tests/benchmark/CL/SYSTEM/MobileNetV1.cpp b/tests/benchmark/CL/SYSTEM/MobileNetV1.cpp index 66be3231cf..851148a860 100644 --- a/tests/benchmark/CL/SYSTEM/MobileNetV1.cpp +++ b/tests/benchmark/CL/SYSTEM/MobileNetV1.cpp @@ -28,7 +28,7 @@ #include "arm_compute/runtime/CL/functions/CLActivationLayer.h" #include "arm_compute/runtime/CL/functions/CLBatchNormalizationLayer.h" #include "arm_compute/runtime/CL/functions/CLConvolutionLayer.h" -#include "arm_compute/runtime/CL/functions/CLDepthwiseConvolution.h" +#include "arm_compute/runtime/CL/functions/CLDepthwiseConvolutionLayer.h" #include "arm_compute/runtime/CL/functions/CLDirectConvolutionLayer.h" #include "arm_compute/runtime/CL/functions/CLPoolingLayer.h" #include "arm_compute/runtime/CL/functions/CLReshapeLayer.h" @@ -49,7 +49,7 @@ using CLMobileNetV1_224_Fixture = MobileNetV1Fixture<CLTensor, CLBatchNormalizationLayer, CLConvolutionLayer, CLDirectConvolutionLayer, - CLDepthwiseConvolution3x3, + CLDepthwiseConvolutionLayer3x3, CLReshapeLayer, CLPoolingLayer, CLSoftmaxLayer, @@ -61,7 +61,7 @@ using CLMobileNetV1_128_Fixture = MobileNetV1Fixture<CLTensor, CLBatchNormalizationLayer, CLConvolutionLayer, CLDirectConvolutionLayer, - CLDepthwiseConvolution3x3, + CLDepthwiseConvolutionLayer3x3, CLReshapeLayer, CLPoolingLayer, CLSoftmaxLayer, |