diff options
author | Moritz Pflanzer <moritz.pflanzer@arm.com> | 2017-07-04 12:08:41 +0100 |
---|---|---|
committer | Anthony Barbier <anthony.barbier@arm.com> | 2018-09-17 14:15:39 +0100 |
commit | 05da6dd102c988081c7d5eccb227f559f740ceef (patch) | |
tree | e84d06ef734f7ee5b468b1213d0e55f37b4caaf4 /src/core/CL/kernels/CLConvolutionKernel.cpp | |
parent | 221f38176b0d4dbc212441779d9bbac3cc0eecfa (diff) | |
download | ComputeLibrary-05da6dd102c988081c7d5eccb227f559f740ceef.tar.gz |
COMPMID-417: Remove val_to_string
The function was a duplicate of the to_string function we have in
support/ToolchainSupport.h
Change-Id: If1eff674333248f7d189824ced717310afec19b0
Reviewed-on: http://mpd-gerrit.cambridge.arm.com/79634
Reviewed-by: Georgios Pinitas <georgios.pinitas@arm.com>
Tested-by: Kaizen <jeremy.johnson+kaizengerrit@arm.com>
Diffstat (limited to 'src/core/CL/kernels/CLConvolutionKernel.cpp')
-rw-r--r-- | src/core/CL/kernels/CLConvolutionKernel.cpp | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/core/CL/kernels/CLConvolutionKernel.cpp b/src/core/CL/kernels/CLConvolutionKernel.cpp index bdfe398a1d..fd64dc4fe0 100644 --- a/src/core/CL/kernels/CLConvolutionKernel.cpp +++ b/src/core/CL/kernels/CLConvolutionKernel.cpp @@ -79,7 +79,7 @@ void CLConvolutionKernel<matrix_size>::configure(const ICLTensor *input, ICLTens options.insert(mat_str.str()); } - options.insert("-DSCALE=" + val_to_string(scale)); + options.insert("-DSCALE=" + support::cpp11::to_string(scale)); DataType data_type = data_type_for_convolution_matrix(conv, matrix_size * matrix_size); options.insert("-DDATA_TYPE=" + get_cl_type_from_data_type(data_type)); @@ -143,7 +143,7 @@ void CLSeparableConvolutionHorKernel<matrix_size>::configure(const ICLTensor *in for(unsigned int j = 0; j < matrix_size * matrix_size; j++) { - build_opts.insert("-DMAT" + val_to_string(j) + "=" + val_to_string(mat[j])); + build_opts.insert("-DMAT" + support::cpp11::to_string(j) + "=" + support::cpp11::to_string(mat[j])); } build_opts.insert("-DSCALE=0"); @@ -151,7 +151,7 @@ void CLSeparableConvolutionHorKernel<matrix_size>::configure(const ICLTensor *in build_opts.insert("-DDATA_TYPE=" + get_cl_type_from_data_type(output->info()->data_type())); // Create kernel - _kernel = static_cast<cl::Kernel>(CLKernelLibrary::get().create_kernel("convolution_separable1x" + val_to_string(matrix_size) + "_static", build_opts)); + _kernel = static_cast<cl::Kernel>(CLKernelLibrary::get().create_kernel("convolution_separable1x" + support::cpp11::to_string(matrix_size) + "_static", build_opts)); // Configure kernel window constexpr unsigned int num_elems_processed_per_iteration = 8; @@ -195,10 +195,10 @@ void CLSeparableConvolutionVertKernel<matrix_size>::configure(const ICLTensor *i for(unsigned int j = 0; j < matrix_size * matrix_size; j++) { - build_opts.insert("-DMAT" + val_to_string(j) + "=" + val_to_string(mat[j])); + build_opts.insert("-DMAT" + support::cpp11::to_string(j) + "=" + support::cpp11::to_string(mat[j])); } - build_opts.insert("-DSCALE=" + val_to_string(scale)); + build_opts.insert("-DSCALE=" + support::cpp11::to_string(scale)); build_opts.insert("-DDATA_TYPE=" + get_cl_type_from_data_type(input->info()->data_type())); @@ -209,7 +209,7 @@ void CLSeparableConvolutionVertKernel<matrix_size>::configure(const ICLTensor *i build_opts.insert(out_type.str()); // Create kernel - _kernel = static_cast<cl::Kernel>(CLKernelLibrary::get().create_kernel("convolution_separable" + val_to_string(matrix_size) + "x1_static", build_opts)); + _kernel = static_cast<cl::Kernel>(CLKernelLibrary::get().create_kernel("convolution_separable" + support::cpp11::to_string(matrix_size) + "x1_static", build_opts)); // Configure kernel window constexpr unsigned int num_elems_processed_per_iteration = 8; @@ -270,16 +270,16 @@ void CLConvolutionRectangleKernel::configure(const ICLTensor *input, ICLTensor * for(unsigned int j = 0; j < MAX_MATRIX_SIZE; j++) { - options.insert("-DMAT" + val_to_string(j) + "=" + val_to_string(mat[j])); + options.insert("-DMAT" + support::cpp11::to_string(j) + "=" + support::cpp11::to_string(mat[j])); } - options.insert("-DSCALE=" + val_to_string(scale)); + options.insert("-DSCALE=" + support::cpp11::to_string(scale)); DataType data_type = data_type_for_convolution_matrix(conv, matrix_size); options.insert("-DDATA_TYPE=" + get_cl_type_from_data_type(data_type)); - options.insert("-DMATRIX_WIDTH=" + val_to_string(width)); - options.insert("-DMATRIX_HEIGHT=" + val_to_string(height)); + options.insert("-DMATRIX_WIDTH=" + support::cpp11::to_string(width)); + options.insert("-DMATRIX_HEIGHT=" + support::cpp11::to_string(height)); _kernel = static_cast<cl::Kernel>(CLKernelLibrary::get().create_kernel("convolution_rectangle", options)); |