From 00b93f52f328d3cf77a50a1ae7a46213f5b1f4c2 Mon Sep 17 00:00:00 2001 From: Giorgio Arena Date: Thu, 28 Jun 2018 17:18:50 +0100 Subject: COMPMID-1325 Add data layout suffix to the config_id on OpenCL kernels Change-Id: I78d7b4a53fe6525cc19fd49c5d555a4334e6de3b Reviewed-on: https://eu-gerrit-1.euhpc.arm.com/137903 Tested-by: Jenkins Reviewed-by: Michele DiGiorgio --- src/core/CL/kernels/CLBatchNormalizationLayerKernel.cpp | 2 ++ src/core/CL/kernels/CLIm2ColKernel.cpp | 2 ++ src/core/CL/kernels/CLPoolingLayerKernel.cpp | 2 ++ 3 files changed, 6 insertions(+) (limited to 'src/core/CL') diff --git a/src/core/CL/kernels/CLBatchNormalizationLayerKernel.cpp b/src/core/CL/kernels/CLBatchNormalizationLayerKernel.cpp index d37aa8e211..391baef96a 100644 --- a/src/core/CL/kernels/CLBatchNormalizationLayerKernel.cpp +++ b/src/core/CL/kernels/CLBatchNormalizationLayerKernel.cpp @@ -206,6 +206,8 @@ void CLBatchNormalizationLayerKernel::configure(ICLTensor *input, ICLTensor *out _config_id += support::cpp11::to_string(input->info()->dimension(1)); _config_id += "_"; _config_id += support::cpp11::to_string(input->info()->dimension(2)); + _config_id += "_"; + _config_id += lower_string(string_from_data_layout(input->info()->data_layout())); } Status CLBatchNormalizationLayerKernel::validate(const ITensorInfo *input, const ITensorInfo *output, diff --git a/src/core/CL/kernels/CLIm2ColKernel.cpp b/src/core/CL/kernels/CLIm2ColKernel.cpp index 21deb9217c..91aa181c52 100644 --- a/src/core/CL/kernels/CLIm2ColKernel.cpp +++ b/src/core/CL/kernels/CLIm2ColKernel.cpp @@ -319,6 +319,8 @@ void CLIm2ColKernel::configure(const ICLTensor *input, ICLTensor *output, const _config_id += support::cpp11::to_string(output->info()->dimension(0)); _config_id += "_"; _config_id += support::cpp11::to_string(output->info()->dimension(1)); + _config_id += "_"; + _config_id += lower_string(string_from_data_layout(input->info()->data_layout())); } Status CLIm2ColKernel::validate(const ITensorInfo *input, const ITensorInfo *output, const Size2D &kernel_dims, const PadStrideInfo &conv_info, bool has_bias, const Size2D &dilation) diff --git a/src/core/CL/kernels/CLPoolingLayerKernel.cpp b/src/core/CL/kernels/CLPoolingLayerKernel.cpp index b242c5550c..81c52ed53b 100644 --- a/src/core/CL/kernels/CLPoolingLayerKernel.cpp +++ b/src/core/CL/kernels/CLPoolingLayerKernel.cpp @@ -295,6 +295,8 @@ void CLPoolingLayerKernel::configure(const ICLTensor *input, ICLTensor *output, _config_id += support::cpp11::to_string(output->info()->dimension(idx_height)); _config_id += "_"; _config_id += support::cpp11::to_string(output->info()->dimension(idx_channel)); + _config_id += "_"; + _config_id += lower_string(string_from_data_layout(input->info()->data_layout())); } Status CLPoolingLayerKernel::validate(const ITensorInfo *input, const ITensorInfo *output, const PoolingLayerInfo &pool_info) -- cgit v1.2.1