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/validation/fixtures | |
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/validation/fixtures')
-rw-r--r-- | tests/validation/fixtures/DepthConcatenateLayerFixture.h | 2 | ||||
-rw-r--r-- | tests/validation/fixtures/DepthConvertLayerFixture.h (renamed from tests/validation/fixtures/DepthConvertFixture.h) | 12 | ||||
-rw-r--r-- | tests/validation/fixtures/DepthwiseConvolutionLayerFixture.h (renamed from tests/validation/fixtures/DepthwiseConvolutionFixture.h) | 16 | ||||
-rw-r--r-- | tests/validation/fixtures/L2NormalizeLayerFixture.h (renamed from tests/validation/fixtures/L2NormalizeFixture.h) | 4 |
4 files changed, 17 insertions, 17 deletions
diff --git a/tests/validation/fixtures/DepthConcatenateLayerFixture.h b/tests/validation/fixtures/DepthConcatenateLayerFixture.h index 633dba23e0..103c73e4ea 100644 --- a/tests/validation/fixtures/DepthConcatenateLayerFixture.h +++ b/tests/validation/fixtures/DepthConcatenateLayerFixture.h @@ -43,7 +43,7 @@ namespace test namespace validation { template <typename TensorType, typename ITensorType, typename AccessorType, typename FunctionType, typename T> -class DepthConcatenateValidationFixture : public framework::Fixture +class DepthConcatenateLayerValidationFixture : public framework::Fixture { public: template <typename...> diff --git a/tests/validation/fixtures/DepthConvertFixture.h b/tests/validation/fixtures/DepthConvertLayerFixture.h index b132a9341d..c2fdc75bb4 100644 --- a/tests/validation/fixtures/DepthConvertFixture.h +++ b/tests/validation/fixtures/DepthConvertLayerFixture.h @@ -31,7 +31,7 @@ #include "tests/IAccessor.h" #include "tests/framework/Asserts.h" #include "tests/framework/Fixture.h" -#include "tests/validation/CPP/DepthConvert.h" +#include "tests/validation/CPP/DepthConvertLayer.h" #include "tests/validation/Helpers.h" namespace arm_compute @@ -41,7 +41,7 @@ namespace test namespace validation { template <typename TensorType, typename AccessorType, typename FunctionType, typename T1, typename T2> -class DepthConvertValidationFixedPointFixture : public framework::Fixture +class DepthConvertLayerValidationFixedPointFixture : public framework::Fixture { public: template <typename...> @@ -106,23 +106,23 @@ protected: int _shift{}; }; template <typename TensorType, typename AccessorType, typename FunctionType, typename T1, typename T2> -class DepthConvertValidationFixture : public DepthConvertValidationFixedPointFixture<TensorType, AccessorType, FunctionType, T1, T2> +class DepthConvertLayerValidationFixture : public DepthConvertLayerValidationFixedPointFixture<TensorType, AccessorType, FunctionType, T1, T2> { public: template <typename...> void setup(TensorShape shape, DataType dt_in, DataType dt_out, ConvertPolicy policy, uint32_t shift) { - DepthConvertValidationFixedPointFixture<TensorType, AccessorType, FunctionType, T1, T2>::setup(shape, dt_in, dt_out, policy, shift, 0); + DepthConvertLayerValidationFixedPointFixture<TensorType, AccessorType, FunctionType, T1, T2>::setup(shape, dt_in, dt_out, policy, shift, 0); } }; template <typename TensorType, typename AccessorType, typename FunctionType, typename T1, typename T2> -class DepthConvertValidationFractionalBitsFixture : public DepthConvertValidationFixedPointFixture<TensorType, AccessorType, FunctionType, T1, T2> +class DepthConvertLayerValidationFractionalBitsFixture : public DepthConvertLayerValidationFixedPointFixture<TensorType, AccessorType, FunctionType, T1, T2> { public: template <typename...> void setup(TensorShape shape, DataType dt_in, DataType dt_out, ConvertPolicy policy, uint32_t fractional_bits) { - DepthConvertValidationFixedPointFixture<TensorType, AccessorType, FunctionType, T1, T2>::setup(shape, dt_in, dt_out, policy, 0, fractional_bits); + DepthConvertLayerValidationFixedPointFixture<TensorType, AccessorType, FunctionType, T1, T2>::setup(shape, dt_in, dt_out, policy, 0, fractional_bits); } }; } // namespace validation diff --git a/tests/validation/fixtures/DepthwiseConvolutionFixture.h b/tests/validation/fixtures/DepthwiseConvolutionLayerFixture.h index b1d31d657a..0af3fdf6c4 100644 --- a/tests/validation/fixtures/DepthwiseConvolutionFixture.h +++ b/tests/validation/fixtures/DepthwiseConvolutionLayerFixture.h @@ -31,7 +31,7 @@ #include "tests/IAccessor.h" #include "tests/framework/Asserts.h" #include "tests/framework/Fixture.h" -#include "tests/validation/CPP/DepthwiseConvolution.h" +#include "tests/validation/CPP/DepthwiseConvolutionLayer.h" #include "tests/validation/Helpers.h" #include <random> @@ -43,7 +43,7 @@ namespace test namespace validation { template <typename TensorType, typename AccessorType, typename FunctionType, typename T> -class DepthwiseConvolutionValidationGenericFixture : public framework::Fixture +class DepthwiseConvolutionLayerValidationGenericFixture : public framework::Fixture { public: using TBias = typename std::conditional<std::is_same<typename std::decay<T>::type, uint8_t>::value, int32_t, T>::type; @@ -151,26 +151,26 @@ protected: }; template <typename TensorType, typename AccessorType, typename FunctionType, typename T> -class DepthwiseConvolutionValidationFixture : public DepthwiseConvolutionValidationGenericFixture<TensorType, AccessorType, FunctionType, T> +class DepthwiseConvolutionLayerValidationFixture : public DepthwiseConvolutionLayerValidationGenericFixture<TensorType, AccessorType, FunctionType, T> { public: template <typename...> void setup(TensorShape in_shape, TensorShape weights_shape, TensorShape biases_shape, TensorShape out_shape, PadStrideInfo pad_stride_info, DataType data_type) { - DepthwiseConvolutionValidationGenericFixture<TensorType, AccessorType, FunctionType, T>::setup(in_shape, weights_shape, biases_shape, out_shape, pad_stride_info, - data_type, QuantizationInfo()); + DepthwiseConvolutionLayerValidationGenericFixture<TensorType, AccessorType, FunctionType, T>::setup(in_shape, weights_shape, biases_shape, out_shape, pad_stride_info, + data_type, QuantizationInfo()); } }; template <typename TensorType, typename AccessorType, typename FunctionType, typename T> -class DepthwiseConvolutionValidationQuantizedFixture : public DepthwiseConvolutionValidationGenericFixture<TensorType, AccessorType, FunctionType, T> +class DepthwiseConvolutionLayerValidationQuantizedFixture : public DepthwiseConvolutionLayerValidationGenericFixture<TensorType, AccessorType, FunctionType, T> { public: template <typename...> void setup(TensorShape in_shape, TensorShape weights_shape, TensorShape biases_shape, TensorShape out_shape, PadStrideInfo pad_stride_info, DataType data_type, QuantizationInfo quantization_info) { - DepthwiseConvolutionValidationGenericFixture<TensorType, AccessorType, FunctionType, T>::setup(in_shape, weights_shape, biases_shape, out_shape, pad_stride_info, - data_type, quantization_info); + DepthwiseConvolutionLayerValidationGenericFixture<TensorType, AccessorType, FunctionType, T>::setup(in_shape, weights_shape, biases_shape, out_shape, pad_stride_info, + data_type, quantization_info); } }; } // namespace validation diff --git a/tests/validation/fixtures/L2NormalizeFixture.h b/tests/validation/fixtures/L2NormalizeLayerFixture.h index e6113937f1..7bb95883f7 100644 --- a/tests/validation/fixtures/L2NormalizeFixture.h +++ b/tests/validation/fixtures/L2NormalizeLayerFixture.h @@ -32,7 +32,7 @@ #include "tests/IAccessor.h" #include "tests/framework/Asserts.h" #include "tests/framework/Fixture.h" -#include "tests/validation/CPP/L2Normalize.h" +#include "tests/validation/CPP/L2NormalizeLayer.h" namespace arm_compute { @@ -41,7 +41,7 @@ namespace test namespace validation { template <typename TensorType, typename AccessorType, typename FunctionType, typename T> -class L2NormalizeValidationFixture : public framework::Fixture +class L2NormalizeLayerValidationFixture : public framework::Fixture { public: template <typename...> |