diff options
author | Georgios Pinitas <georgios.pinitas@arm.com> | 2018-06-19 13:09:53 +0100 |
---|---|---|
committer | Anthony Barbier <anthony.barbier@arm.com> | 2018-11-02 16:53:34 +0000 |
commit | 19ea419e7f14d02aeb208c2fbd5a4ac55f4cb101 (patch) | |
tree | fe04ed9d40ebb8b717f63490f672a28c5b27d01e /src/core/CL/kernels/CLWeightsReshapeKernel.cpp | |
parent | bb71fe50930f5669a7a325e0fa95fee559856793 (diff) | |
download | ComputeLibrary-19ea419e7f14d02aeb208c2fbd5a4ac55f4cb101.tar.gz |
COMPMID-809: Add NHWC data format on CLGEMMConvolutionLayer.
Change-Id: I50e4f5e7d47e21c300f754bee2c216863075b5cf
Reviewed-on: https://eu-gerrit-1.euhpc.arm.com/136191
Tested-by: Jenkins <bsgcomp@arm.com>
Reviewed-by: Giorgio Arena <giorgio.arena@arm.com>
Reviewed-by: Gian Marco Iodice <gianmarco.iodice@arm.com>
Diffstat (limited to 'src/core/CL/kernels/CLWeightsReshapeKernel.cpp')
-rw-r--r-- | src/core/CL/kernels/CLWeightsReshapeKernel.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/core/CL/kernels/CLWeightsReshapeKernel.cpp b/src/core/CL/kernels/CLWeightsReshapeKernel.cpp index c0a4517ad3..b012d58d59 100644 --- a/src/core/CL/kernels/CLWeightsReshapeKernel.cpp +++ b/src/core/CL/kernels/CLWeightsReshapeKernel.cpp @@ -85,7 +85,8 @@ void CLWeightsReshapeKernel::configure(const ICLTensor *input, const ICLTensor * (biases != nullptr) ? biases->info() : nullptr, output->info())); - const DataType data_type = input->info()->data_type(); + const DataType data_type = input->info()->data_type(); + const DataLayout data_layout = input->info()->data_layout(); _biases = biases; _output = output; @@ -98,7 +99,8 @@ void CLWeightsReshapeKernel::configure(const ICLTensor *input, const ICLTensor * build_opts.add_option_if(is_data_type_fixed_point(data_type), "-DFIXED_POINT_POSITION=" + support::cpp11::to_string(input->info()->fixed_point_position())); // Create kernel - _kernel = static_cast<cl::Kernel>(CLKernelLibrary::get().create_kernel("reshape_to_columns", build_opts.options())); + std::string kernel_name = std::string("reshape_to_columns_") + lower_string(string_from_data_layout(data_layout)); + _kernel = static_cast<cl::Kernel>(CLKernelLibrary::get().create_kernel(kernel_name, build_opts.options())); // Set static arguments unsigned int idx = num_arguments_per_3D_tensor() + num_arguments_per_2D_tensor(); |