From 7c9541ccd4c98d7e9a456ee67c3ceecce8531ffb Mon Sep 17 00:00:00 2001 From: Michalis Spyrou Date: Thu, 20 Sep 2018 17:40:04 +0100 Subject: COMPMID-1596 Create UpsampleLayer for NEON Change-Id: I82d95c4f1c5fed13b213a2591cc2b4e0d0e02a54 Reviewed-on: https://eu-gerrit-1.euhpc.arm.com/149676 Reviewed-by: Georgios Pinitas Reviewed-by: Pablo Tello Tested-by: bsgcomp --- tests/validation/fixtures/UpsampleLayerFixture.h | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'tests/validation/fixtures') diff --git a/tests/validation/fixtures/UpsampleLayerFixture.h b/tests/validation/fixtures/UpsampleLayerFixture.h index 8fc3565e18..40229e2866 100644 --- a/tests/validation/fixtures/UpsampleLayerFixture.h +++ b/tests/validation/fixtures/UpsampleLayerFixture.h @@ -45,12 +45,12 @@ class UpsampleLayerFixture : public framework::Fixture public: template void setup(TensorShape input_shape, DataType data_type, DataLayout data_layout, - Size2D info, const InterpolationPolicy &upsampling_policy) + Size2D info, const InterpolationPolicy &policy) { _data_type = data_type; - _target = compute_target(input_shape, info, upsampling_policy, data_type, data_layout); - _reference = compute_reference(input_shape, info, upsampling_policy, data_type); + _target = compute_target(input_shape, info, policy, data_type, data_layout); + _reference = compute_reference(input_shape, info, policy, data_type); } protected: @@ -61,7 +61,7 @@ protected: } TensorType compute_target(TensorShape input_shape, - const Size2D &info, const InterpolationPolicy &upsampling_policy, DataType data_type, DataLayout data_layout) + const Size2D &info, const InterpolationPolicy &policy, DataType data_type, DataLayout data_layout) { if(data_layout == DataLayout::NHWC) { @@ -74,7 +74,7 @@ protected: // Create and configure function FunctionType upsample; - upsample.configure(&src, &dst, info, upsampling_policy); + upsample.configure(&src, &dst, info, policy); ARM_COMPUTE_EXPECT(src.info()->is_resizable(), framework::LogLevel::ERRORS); ARM_COMPUTE_EXPECT(dst.info()->is_resizable(), framework::LogLevel::ERRORS); @@ -96,7 +96,7 @@ protected: } SimpleTensor compute_reference(const TensorShape &input_shape, - const Size2D &info, const InterpolationPolicy &upsampling_policy, DataType data_type) + const Size2D &info, const InterpolationPolicy &policy, DataType data_type) { // Create reference SimpleTensor src{ input_shape, data_type }; @@ -104,7 +104,7 @@ protected: // Fill reference fill(src, 0); - return reference::upsample_layer(src, info, upsampling_policy); + return reference::upsample_layer(src, info, policy); } TensorType _target{}; -- cgit v1.2.1