diff options
author | Sang-Hoon Park <sang-hoon.park@arm.com> | 2020-06-09 12:09:24 +0100 |
---|---|---|
committer | Sang-Hoon Park <sang-hoon.park@arm.com> | 2020-06-12 14:51:37 +0000 |
commit | ccd94966cc58ef5148577e71ba1a4ff5aae1f3bb (patch) | |
tree | 17efa87eff3cee7d5c2f0cfe04614b2c6d87a8fc /tests/benchmark/fixtures | |
parent | e1536a82dd872651551e3ce25b2bae5da8abaf14 (diff) | |
download | ComputeLibrary-ccd94966cc58ef5148577e71ba1a4ff5aae1f3bb.tar.gz |
COMPMID-3364: use ScaleKernelInfo for Scale on OpenCL and GLES
- Make Scale and ScaleKernel (on CL and GLES) use ScaleKernelInfo
- Deprecate previous configure/validate functions on NEON, CL and GLES
- Make adjustments required by deprecation
Change-Id: I7e81f4ee9ae919392137b92f91e9bc002b7ae277
Signed-off-by: Sang-Hoon Park <sang-hoon.park@arm.com>
Reviewed-on: https://review.mlplatform.org/c/ml/ComputeLibrary/+/3317
Comments-Addressed: Arm Jenkins <bsgcomp@arm.com>
Tested-by: Arm Jenkins <bsgcomp@arm.com>
Reviewed-by: Michele Di Giorgio <michele.digiorgio@arm.com>
Diffstat (limited to 'tests/benchmark/fixtures')
-rw-r--r-- | tests/benchmark/fixtures/ScaleFixture.h | 4 | ||||
-rw-r--r-- | tests/benchmark/fixtures/ScaleLayerFixture.h | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/tests/benchmark/fixtures/ScaleFixture.h b/tests/benchmark/fixtures/ScaleFixture.h index b2fbd9c3b6..4f2948331b 100644 --- a/tests/benchmark/fixtures/ScaleFixture.h +++ b/tests/benchmark/fixtures/ScaleFixture.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017-2018 ARM Limited. + * Copyright (c) 2017-2020 ARM Limited. * * SPDX-License-Identifier: MIT * @@ -75,7 +75,7 @@ public: dst = create_tensor<TensorType>(shape_scaled, data_type); // Create and configure function - scale_func.configure(&src, &dst, policy, border_mode, constant_border_value, sampling_policy); + scale_func.configure(&src, &dst, ScaleKernelInfo{ policy, border_mode, constant_border_value, sampling_policy }); // Allocate tensors src.allocator()->allocate(); diff --git a/tests/benchmark/fixtures/ScaleLayerFixture.h b/tests/benchmark/fixtures/ScaleLayerFixture.h index 10568ea531..dcfe5e223f 100644 --- a/tests/benchmark/fixtures/ScaleLayerFixture.h +++ b/tests/benchmark/fixtures/ScaleLayerFixture.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017-2018 ARM Limited. + * Copyright (c) 2017-2020 ARM Limited. * * SPDX-License-Identifier: MIT * @@ -61,7 +61,7 @@ public: shape_scaled.set(1, shape[1] * scale_y); dst = create_tensor<TensorType>(shape_scaled, data_type); - scale_layer.configure(&src, &dst, policy, border_mode, constant_border_value, sampling_policy); + scale_layer.configure(&src, &dst, ScaleKernelInfo{ policy, border_mode, constant_border_value, sampling_policy }); ARM_COMPUTE_EXPECT(src.info()->is_resizable(), framework::LogLevel::ERRORS); ARM_COMPUTE_EXPECT(dst.info()->is_resizable(), framework::LogLevel::ERRORS); |