From 49b6ec5c64822d209c77d6104872f7ca27fe83e5 Mon Sep 17 00:00:00 2001 From: Unknown Date: Thu, 29 Mar 2018 20:03:38 +0800 Subject: [PATCH] conflicts --- mace/kernels/opencl/depth_to_space_opencl.cc | 7 ++++--- mace/kernels/opencl/space_to_batch_opencl.cc | 3 ++- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/mace/kernels/opencl/depth_to_space_opencl.cc b/mace/kernels/opencl/depth_to_space_opencl.cc index c22a6e4c..74e66467 100644 --- a/mace/kernels/opencl/depth_to_space_opencl.cc +++ b/mace/kernels/opencl/depth_to_space_opencl.cc @@ -53,13 +53,14 @@ void DepthToSpaceOpFunctor::operator()( kernel_name_ss << "-D" << kernel_name << "=" << obfuscated_kernel_name; built_options.emplace(kernel_name_ss.str()); auto dt = DataTypeToEnum::value; - built_options.emplace("-DDATA_TYPE=" + DtToUpstreamCLDt(dt)); - built_options.emplace("-DCMD_DATA_TYPE=" + DtToUpstreamCLCMDDt(dt)); + built_options.emplace("-DDATA_TYPE=" + DtToCLDt(dt)); + built_options.emplace("-DCMD_DATA_TYPE=" + DtToCLCMDDt(dt)); if (runtime->IsNonUniformWorkgroupsSupported()) { built_options.emplace("-DNON_UNIFORM_WORK_GROUP"); } kernel_ = - runtime->BuildKernel("depth_to_space", kernel_name, built_options); + runtime->BuildKernel("depth_to_space", + obfuscated_kernel_name, built_options); kwg_size_ = static_cast(runtime->GetKernelMaxWorkGroupSize(kernel_)); diff --git a/mace/kernels/opencl/space_to_batch_opencl.cc b/mace/kernels/opencl/space_to_batch_opencl.cc index 31b5013b..b4ae998a 100644 --- a/mace/kernels/opencl/space_to_batch_opencl.cc +++ b/mace/kernels/opencl/space_to_batch_opencl.cc @@ -51,7 +51,8 @@ void SpaceToBatchFunctor::operator()( built_options.emplace("-DNON_UNIFORM_WORK_GROUP"); } kernel_ = - runtime->BuildKernel("space_to_batch", kernel_name, built_options); + runtime->BuildKernel("space_to_batch", + obfuscated_kernel_name, built_options); kwg_size_ = static_cast(runtime->GetKernelMaxWorkGroupSize(kernel_)); -- GitLab