diff options
| author | Georgios Pinitas <georgios.pinitas@arm.com> | 2018-03-13 10:29:13 +0000 |
|---|---|---|
| committer | Anthony Barbier <anthony.barbier@arm.com> | 2018-11-02 16:49:16 +0000 |
| commit | 6727f12b7d5e29a98e42e846ca012a56e930fd33 (patch) | |
| tree | ba8c14af3a1dc01fba74f6090c5ae9314194bdb5 /src/core | |
| parent | 7e1944d7073a0e2eccaf2c1dce5daa197e6dedf5 (diff) | |
| download | ComputeLibrary-6727f12b7d5e29a98e42e846ca012a56e930fd33.tar.gz | |
Revert "COMPMID-959: Fix valid region for Scale by always setting full shape"
This reverts commit 77fdc0420dfd3c5009370650f963748a73f0db58.
Change-Id: I1440f56f29637821e20ad2edf1055196bb69a0e2
Reviewed-on: https://eu-gerrit-1.euhpc.arm.com/124290
Tested-by: Jenkins <bsgcomp@arm.com>
Reviewed-by: Isabella Gottardi <isabella.gottardi@arm.com>
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/CL/kernels/CLScaleKernel.cpp | 2 | ||||
| -rw-r--r-- | src/core/GLES_COMPUTE/kernels/GCScaleKernel.cpp | 3 | ||||
| -rw-r--r-- | src/core/Helpers.cpp | 12 | ||||
| -rw-r--r-- | src/core/NEON/kernels/NEScaleKernel.cpp | 6 |
4 files changed, 4 insertions, 19 deletions
diff --git a/src/core/CL/kernels/CLScaleKernel.cpp b/src/core/CL/kernels/CLScaleKernel.cpp index 9b8a582349..f3d918514e 100644 --- a/src/core/CL/kernels/CLScaleKernel.cpp +++ b/src/core/CL/kernels/CLScaleKernel.cpp @@ -102,7 +102,7 @@ void CLScaleKernel::configure(const ICLTensor *input, ICLTensor *output, Interpo output_access.set_valid_region(win, calculate_valid_region_scale(*(input->info()), output->info()->tensor_shape(), policy, - sampling_policy, + border, border_undefined)); ICLKernel::configure(win); diff --git a/src/core/GLES_COMPUTE/kernels/GCScaleKernel.cpp b/src/core/GLES_COMPUTE/kernels/GCScaleKernel.cpp index f87615a27c..46d7ff9172 100644 --- a/src/core/GLES_COMPUTE/kernels/GCScaleKernel.cpp +++ b/src/core/GLES_COMPUTE/kernels/GCScaleKernel.cpp @@ -51,6 +51,7 @@ void GCScaleKernel::configure(const IGCTensor *input, IGCTensor *output, Interpo ARM_COMPUTE_ERROR_ON_MISMATCHING_DATA_TYPES(input, output); ARM_COMPUTE_ERROR_ON(output == input); ARM_COMPUTE_ERROR_ON(policy != InterpolationPolicy::NEAREST_NEIGHBOR); + ARM_COMPUTE_UNUSED(sampling_policy); _input = input; _output = output; @@ -122,7 +123,7 @@ void GCScaleKernel::configure(const IGCTensor *input, IGCTensor *output, Interpo output_access.set_valid_region(win, calculate_valid_region_scale(*(input->info()), output->info()->tensor_shape(), policy, - sampling_policy, + border, border_undefined)); IGCKernel::configure(win); diff --git a/src/core/Helpers.cpp b/src/core/Helpers.cpp index cbebf8a163..0e7cd99eab 100644 --- a/src/core/Helpers.cpp +++ b/src/core/Helpers.cpp @@ -173,15 +173,3 @@ Window arm_compute::calculate_max_window_horizontal(const ValidRegion &valid_reg return window; } - -ValidRegion arm_compute::calculate_valid_region_scale(const ITensorInfo &src_info, const TensorShape &dst_shape, - InterpolationPolicy interpolate_policy, SamplingPolicy sampling_policy, bool border_undefined) -{ - /* TODO (COMPMID-959) : Fix scale valid region */ - arm_compute::utility::ignore_unused(src_info, interpolate_policy, sampling_policy, border_undefined); - - // Setup output valid region - ValidRegion valid_region{ Coordinates(), dst_shape }; - - return valid_region; -}
\ No newline at end of file diff --git a/src/core/NEON/kernels/NEScaleKernel.cpp b/src/core/NEON/kernels/NEScaleKernel.cpp index 852ec3e023..b5677dedac 100644 --- a/src/core/NEON/kernels/NEScaleKernel.cpp +++ b/src/core/NEON/kernels/NEScaleKernel.cpp @@ -142,11 +142,7 @@ void NEScaleKernel::configure(const ITensor *input, const ITensor *dx, const ITe dy_access, output_access); - output_access.set_valid_region(win, calculate_valid_region_scale(*(input->info()), - output->info()->tensor_shape(), - policy, - sampling_policy, - border_undefined)); + output_access.set_valid_region(win, calculate_valid_region_scale(*(input->info()), output->info()->tensor_shape(), policy, border_size(), border_undefined)); INEKernel::configure(win); } |