From a534e0a320bdf5c81bed705c5e3a9108a60d4d41 Mon Sep 17 00:00:00 2001 From: baihuawei Date: Thu, 15 Oct 2020 11:05:26 +0800 Subject: [PATCH] cpu conv2d support tuple pad --- .../ccsrc/backend/kernel_compiler/cpu/cpu_kernel.h | 1 + .../kernel_compiler/cpu/mkldnn/mkl_cpu_kernel.cc | 10 +++++----- ...rse_softmax_cross_entropy_with_logits_cpu_kernel.cc | 2 +- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/cpu_kernel.h b/mindspore/ccsrc/backend/kernel_compiler/cpu/cpu_kernel.h index ad219c7a4c..f318eaa2cd 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/cpu_kernel.h +++ b/mindspore/ccsrc/backend/kernel_compiler/cpu/cpu_kernel.h @@ -34,6 +34,7 @@ const char STRIDE[] = "stride"; const char STRIDES[] = "strides"; const char DILATION[] = "dilation"; const char PAD[] = "pad"; +const char PAD_LIST[] = "pad_list"; const char PAD_MODE[] = "pad_mode"; const char PADDING[] = "padding"; const char PAD_MODE_LOWER_SAME[] = "same"; diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/mkldnn/mkl_cpu_kernel.cc b/mindspore/ccsrc/backend/kernel_compiler/cpu/mkldnn/mkl_cpu_kernel.cc index 9e0311921b..33a9ff9010 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/mkldnn/mkl_cpu_kernel.cc +++ b/mindspore/ccsrc/backend/kernel_compiler/cpu/mkldnn/mkl_cpu_kernel.cc @@ -52,11 +52,11 @@ void MKLCPUKernel::GetPadding(const CNodePtr &kernel_node, const std::string &pa padding_r->emplace_back(0); padding_r->emplace_back(0); } else { - int pad = AnfAlgo::GetNodeAttr(kernel_node, PAD); - padding_l->emplace_back(pad); - padding_l->emplace_back(pad); - padding_r->emplace_back(pad); - padding_r->emplace_back(pad); + std::vector pad = AnfAlgo::GetNodeAttr>(kernel_node, PAD_LIST); + padding_l->emplace_back(pad[0]); + padding_l->emplace_back(pad[1]); + padding_r->emplace_back(pad[2]); + padding_r->emplace_back(pad[3]); } } diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/mkldnn/sparse_softmax_cross_entropy_with_logits_cpu_kernel.cc b/mindspore/ccsrc/backend/kernel_compiler/cpu/mkldnn/sparse_softmax_cross_entropy_with_logits_cpu_kernel.cc index c34fd17046..6ae797a826 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/mkldnn/sparse_softmax_cross_entropy_with_logits_cpu_kernel.cc +++ b/mindspore/ccsrc/backend/kernel_compiler/cpu/mkldnn/sparse_softmax_cross_entropy_with_logits_cpu_kernel.cc @@ -37,7 +37,7 @@ void SparseSoftmaxCrossEntropyWithLogitsCPUKernel::InitKernel(const CNodePtr &ke std::vector shape = AnfAlgo::GetInputDeviceShape(kernel_node, 0); std::vector label_shape = AnfAlgo::GetInputDeviceShape(kernel_node, 1); if (label_shape.size() > 1) { - MS_LOG(EXCEPTION) << "label shape should be 1D"; + MS_LOG(EXCEPTION) << "Labels shape length should be equal to Logits shape length minus 1"; } dnnl::memory::dims mem_dims; mem_dims.insert(mem_dims.end(), shape.begin(), shape.end());