diff options
| author | Joel Liang <joel.liang@arm.com> | 2017-11-10 09:59:19 +0800 |
|---|---|---|
| committer | Anthony Barbier <anthony.barbier@arm.com> | 2018-11-02 16:35:24 +0000 |
| commit | f1f3ebd517089e934cf3f06e64d90619a395ad87 (patch) | |
| tree | 8dac05909b5f522a1c78e0ac4423cb6f65254391 /src/core/GLES_COMPUTE/kernels/GCCol2ImKernel.cpp | |
| parent | 283c1790da45ab562ecfb2aa7741297191886d85 (diff) | |
| download | ComputeLibrary-f1f3ebd517089e934cf3f06e64d90619a395ad87.tar.gz | |
APPBROWSER-298, APPBROWSER-306: Reimplement the common code of compute shader
The new common code of compute shader is in file helpers_cs.h
Rewrite the direct_convolution1x1.cs and softmax_layer.cs to use the new common code.
It will also remove the dependence of the token pasting operator (##).
We'll remove the "##" support after we rewrite all of the compute shader code.
Change-Id: Icd8553ef6b61ad484a8507590ac8ed499bd47061
Reviewed-on: http://mpd-gerrit.cambridge.arm.com/95455
Tested-by: Kaizen <jeremy.johnson+kaizengerrit@arm.com>
Reviewed-by: Georgios Pinitas <georgios.pinitas@arm.com>
Reviewed-by: Frank Lei <frank.lei@arm.com>
(cherry picked from commit 0a4f83570d261f839d9866b68979efe8d7a95883)
Reviewed-on: http://mpd-gerrit.cambridge.arm.com/95601
Reviewed-by: Jim He <jim.he@arm.com>
Diffstat (limited to 'src/core/GLES_COMPUTE/kernels/GCCol2ImKernel.cpp')
| -rw-r--r-- | src/core/GLES_COMPUTE/kernels/GCCol2ImKernel.cpp | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/src/core/GLES_COMPUTE/kernels/GCCol2ImKernel.cpp b/src/core/GLES_COMPUTE/kernels/GCCol2ImKernel.cpp index 10716232c9..492f708a98 100644 --- a/src/core/GLES_COMPUTE/kernels/GCCol2ImKernel.cpp +++ b/src/core/GLES_COMPUTE/kernels/GCCol2ImKernel.cpp @@ -46,8 +46,6 @@ void GCCol2ImKernel::configure(const IGCTensor *input, IGCTensor *output, ARM_COMPUTE_ERROR_ON_DATA_TYPE_CHANNEL_NOT_IN(input, 1, DataType::F32); ARM_COMPUTE_ERROR_ON_MISMATCHING_DATA_TYPES(input, output); - _kernel.clear_params(); - _input = input; _output = output; _convolved_dims = convolved_dims; @@ -63,7 +61,7 @@ void GCCol2ImKernel::configure(const IGCTensor *input, IGCTensor *output, // Set static kernel arguments unsigned int idx = num_arguments_per_2D_tensor() + num_arguments_per_3D_tensor(); - _kernel.set_params(idx++, _convolved_dims.first); + _kernel.set_argument(idx++, _convolved_dims.first); // Configure window Window win = calculate_max_window(*input->info(), Steps()); @@ -71,9 +69,6 @@ void GCCol2ImKernel::configure(const IGCTensor *input, IGCTensor *output, // The GCCol2ImKernel doesn't need padding so update_window_and_padding() can be skipped output->info()->set_valid_region(ValidRegion(Coordinates(), output->info()->tensor_shape())); - // set shader params binding point - _kernel.set_shader_params_binding_point(0); - IGCKernel::configure(win); } |