From 1474d1c4d9ba2b0cf3faa062aa67f437923f933b Mon Sep 17 00:00:00 2001 From: zhuyuxiao Date: Thu, 29 Apr 2021 11:40:59 +0800 Subject: [PATCH] codex: cherry-pick from master --- .../cpu/eltwise_grad_cpu_kernel.cc | 27 +++++++++---------- .../cpu/eltwise_grad_cpu_kernel.h | 24 ++++++++--------- .../kernel_compiler/cpu/pack_cpu_kernel.cc | 2 +- .../kernel_compiler/cpu/pack_cpu_kernel.h | 2 +- .../cpu/tensoradd_cpu_kernel.cc | 2 +- .../gpu/nn/adagrad_gpu_kernel.h | 2 +- 6 files changed, 29 insertions(+), 30 deletions(-) diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/eltwise_grad_cpu_kernel.cc b/mindspore/ccsrc/backend/kernel_compiler/cpu/eltwise_grad_cpu_kernel.cc index 4af0934278..b63afc2b13 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/eltwise_grad_cpu_kernel.cc +++ b/mindspore/ccsrc/backend/kernel_compiler/cpu/eltwise_grad_cpu_kernel.cc @@ -21,9 +21,8 @@ namespace mindspore { namespace kernel { - template -void EltWiseGradCPUKernel::ReluGrad(const T *input1, const T *input2, T *out, size_t start, size_t end) { +void EltWiseGradCPUKernel::ReluGrad(const T *input1, const T *input2, T *out, size_t start, size_t end) const { for (size_t i = start; i < end; i++) { if (input2[i] > 0) { out[i] = input1[i]; @@ -34,7 +33,7 @@ void EltWiseGradCPUKernel::ReluGrad(const T *input1, const T *input2, T *out, } template -void EltWiseGradCPUKernel::ReLU6Grad(const T *input1, const T *input2, T *out, size_t start, size_t end) { +void EltWiseGradCPUKernel::ReLU6Grad(const T *input1, const T *input2, T *out, size_t start, size_t end) const { for (size_t i = start; i < end; i++) { if (input2[i] > 0 && input2[i] <= 6) { out[i] = input1[i]; @@ -45,7 +44,7 @@ void EltWiseGradCPUKernel::ReLU6Grad(const T *input1, const T *input2, T *out } template -void EltWiseGradCPUKernel::AbsGrad(const T *input1, const T *input2, T *out, size_t start, size_t end) { +void EltWiseGradCPUKernel::AbsGrad(const T *input1, const T *input2, T *out, size_t start, size_t end) const { for (size_t i = start; i < end; i++) { if (input1[i] > 0) { out[i] = input2[i]; @@ -58,21 +57,21 @@ void EltWiseGradCPUKernel::AbsGrad(const T *input1, const T *input2, T *out, } template -void EltWiseGradCPUKernel::SigmoidGrad(const T *input1, const T *input2, T *out, size_t start, size_t end) { +void EltWiseGradCPUKernel::SigmoidGrad(const T *input1, const T *input2, T *out, size_t start, size_t end) const { for (size_t i = start; i < end; i++) { out[i] = input2[i] * input1[i] * (1 - input1[i]); } } template -void EltWiseGradCPUKernel::SqrtGrad(const T *input1, const T *input2, T *out, size_t start, size_t end) { +void EltWiseGradCPUKernel::SqrtGrad(const T *input1, const T *input2, T *out, size_t start, size_t end) const { for (size_t i = start; i < end; i++) { out[i] = input2[i] / (input1[i] * 2); } } template -void EltWiseGradCPUKernel::TanhGrad(const T *input1, const T *input2, T *out, size_t start, size_t end) { +void EltWiseGradCPUKernel::TanhGrad(const T *input1, const T *input2, T *out, size_t start, size_t end) const { for (size_t i = start; i < end; i++) { T tmp = input1[i] * input1[i]; out[i] = input2[i] * (1 - tmp); @@ -80,7 +79,7 @@ void EltWiseGradCPUKernel::TanhGrad(const T *input1, const T *input2, T *out, } template -void EltWiseGradCPUKernel::GeluGrad(const T *input1, const T *input2, T *out, size_t start, size_t end) { +void EltWiseGradCPUKernel::GeluGrad(const T *input1, const T *input2, T *out, size_t start, size_t end) const { for (size_t i = start; i < end; i++) { T x = input2[i]; auto double_x = static_cast(x); @@ -92,7 +91,7 @@ void EltWiseGradCPUKernel::GeluGrad(const T *input1, const T *input2, T *out, } template -void EltWiseGradCPUKernel::AsinGrad(const T *input1, const T *input2, T *out, size_t start, size_t end) { +void EltWiseGradCPUKernel::AsinGrad(const T *input1, const T *input2, T *out, size_t start, size_t end) const { for (size_t i = start; i < end; i++) { T dividend = input2[i]; T divisor = sqrt(1 - input1[i] * input1[i]); @@ -113,7 +112,7 @@ void EltWiseGradCPUKernel::AsinGrad(const T *input1, const T *input2, T *out, } template -void EltWiseGradCPUKernel::ACosGrad(const T *input1, const T *input2, T *out, size_t start, size_t end) { +void EltWiseGradCPUKernel::ACosGrad(const T *input1, const T *input2, T *out, size_t start, size_t end) const { for (size_t i = start; i < end; i++) { T dividend = -input2[i]; T divisor = sqrt(1 - input1[i] * input1[i]); @@ -134,7 +133,7 @@ void EltWiseGradCPUKernel::ACosGrad(const T *input1, const T *input2, T *out, } template -void EltWiseGradCPUKernel::AtanGrad(const T *input1, const T *input2, T *out, size_t start, size_t end) { +void EltWiseGradCPUKernel::AtanGrad(const T *input1, const T *input2, T *out, size_t start, size_t end) const { for (size_t i = start; i < end; i++) { T dividend = input2[i]; const T divisor = 1 + input1[i] * input1[i]; @@ -155,7 +154,7 @@ void EltWiseGradCPUKernel::AtanGrad(const T *input1, const T *input2, T *out, } template -void EltWiseGradCPUKernel::AsinhGrad(const T *input1, const T *input2, T *out, size_t start, size_t end) { +void EltWiseGradCPUKernel::AsinhGrad(const T *input1, const T *input2, T *out, size_t start, size_t end) const { for (size_t i = start; i < end; i++) { T dividend = input2[i]; T divisor = sqrt(1 + input1[i] * input1[i]); @@ -176,7 +175,7 @@ void EltWiseGradCPUKernel::AsinhGrad(const T *input1, const T *input2, T *out } template -void EltWiseGradCPUKernel::AcoshGrad(const T *input1, const T *input2, T *out, size_t start, size_t end) { +void EltWiseGradCPUKernel::AcoshGrad(const T *input1, const T *input2, T *out, size_t start, size_t end) const { for (size_t i = start; i < end; i++) { T dividend = input2[i]; T divisor = sqrt(input1[i] * input1[i] - 1); @@ -204,7 +203,7 @@ void EltWiseGradCPUKernel::InitKernel(const CNodePtr &kernel_node) { template bool EltWiseGradCPUKernel::Launch(const std::vector &inputs, - const std::vector & /*workspace*/, + const std::vector &, const std::vector &outputs) { static const std::map> diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/eltwise_grad_cpu_kernel.h b/mindspore/ccsrc/backend/kernel_compiler/cpu/eltwise_grad_cpu_kernel.h index 89917e44f9..f085a9a80d 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/eltwise_grad_cpu_kernel.h +++ b/mindspore/ccsrc/backend/kernel_compiler/cpu/eltwise_grad_cpu_kernel.h @@ -36,18 +36,18 @@ class EltWiseGradCPUKernel : public CPUKernel { const std::vector &outputs) override; private: - void ReluGrad(const T *input1, const T *input2, T *out, size_t start, size_t end); - void ReLU6Grad(const T *input1, const T *input2, T *out, size_t start, size_t end); - void AbsGrad(const T *input1, const T *input2, T *out, size_t start, size_t end); - void SigmoidGrad(const T *input1, const T *input2, T *out, size_t start, size_t end); - void SqrtGrad(const T *input1, const T *input2, T *out, size_t start, size_t end); - void TanhGrad(const T *input1, const T *input2, T *out, size_t start, size_t end); - void GeluGrad(const T *input1, const T *input2, T *out, size_t start, size_t end); - void AsinGrad(const T *input1, const T *input2, T *out, size_t start, size_t end); - void ACosGrad(const T *input1, const T *input2, T *out, size_t start, size_t end); - void AtanGrad(const T *input1, const T *input2, T *out, size_t start, size_t end); - void AsinhGrad(const T *input1, const T *input2, T *out, size_t start, size_t end); - void AcoshGrad(const T *input1, const T *input2, T *out, size_t start, size_t end); + void ReluGrad(const T *input1, const T *input2, T *out, size_t start, size_t end) const; + void ReLU6Grad(const T *input1, const T *input2, T *out, size_t start, size_t end) const; + void AbsGrad(const T *input1, const T *input2, T *out, size_t start, size_t end) const; + void SigmoidGrad(const T *input1, const T *input2, T *out, size_t start, size_t end) const; + void SqrtGrad(const T *input1, const T *input2, T *out, size_t start, size_t end) const; + void TanhGrad(const T *input1, const T *input2, T *out, size_t start, size_t end) const; + void GeluGrad(const T *input1, const T *input2, T *out, size_t start, size_t end) const; + void AsinGrad(const T *input1, const T *input2, T *out, size_t start, size_t end) const; + void ACosGrad(const T *input1, const T *input2, T *out, size_t start, size_t end) const; + void AtanGrad(const T *input1, const T *input2, T *out, size_t start, size_t end) const; + void AsinhGrad(const T *input1, const T *input2, T *out, size_t start, size_t end) const; + void AcoshGrad(const T *input1, const T *input2, T *out, size_t start, size_t end) const; std::string kernel_name_ = ""; }; diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/pack_cpu_kernel.cc b/mindspore/ccsrc/backend/kernel_compiler/cpu/pack_cpu_kernel.cc index 9431f88578..a00e5629a8 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/pack_cpu_kernel.cc +++ b/mindspore/ccsrc/backend/kernel_compiler/cpu/pack_cpu_kernel.cc @@ -90,7 +90,7 @@ bool PackCpuFwdKernel::Launch(const std::vector &inputs, const st } template -bool PackCpuFwdKernel::CheckParam(const std::vector &outputs) { +bool PackCpuFwdKernel::CheckParam(const std::vector &outputs) const { if (outputs.size() != 1) { MS_LOG(EXCEPTION) << "Output number is " << outputs.size() << ", but PackGpuFwdKernel needs 1 output."; return false; diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/pack_cpu_kernel.h b/mindspore/ccsrc/backend/kernel_compiler/cpu/pack_cpu_kernel.h index 8cb500574c..d43be2c0a9 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/pack_cpu_kernel.h +++ b/mindspore/ccsrc/backend/kernel_compiler/cpu/pack_cpu_kernel.h @@ -34,7 +34,7 @@ class PackCpuFwdKernel : public CPUKernel { const std::vector &outputs) override; private: - bool CheckParam(const std::vector &outputs); + bool CheckParam(const std::vector &outputs) const; void PackTensor(T *output, size_t start, size_t end); int axis_; diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/tensoradd_cpu_kernel.cc b/mindspore/ccsrc/backend/kernel_compiler/cpu/tensoradd_cpu_kernel.cc index ae78bcb419..05770cc682 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/tensoradd_cpu_kernel.cc +++ b/mindspore/ccsrc/backend/kernel_compiler/cpu/tensoradd_cpu_kernel.cc @@ -30,7 +30,7 @@ void TensorAddCPUKernel::InitKernel(const CNodePtr &kernel_node) { template bool TensorAddCPUKernel::Launch(const std::vector &inputs, - const std::vector & /*workspace*/, + const std::vector &, const std::vector &outputs) { T *input_addr_a = reinterpret_cast(inputs[0]->addr); T *input_addr_b = reinterpret_cast(inputs[1]->addr); diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/adagrad_gpu_kernel.h b/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/adagrad_gpu_kernel.h index e875e2fd02..ef86888174 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/adagrad_gpu_kernel.h +++ b/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/adagrad_gpu_kernel.h @@ -36,7 +36,7 @@ class AdagradGpuKernel : public GpuKernel { const std::vector &GetOutputSizeList() const override { return output_size_list_; } const std::vector &GetWorkspaceSizeList() const override { return workspace_size_list_; } - bool Launch(const std::vector &inputs, const std::vector & /*workspace*/, + bool Launch(const std::vector &inputs, const std::vector &, const std::vector &outputs, void *stream_ptr) override { T *variable = GetDeviceAddress(inputs, 0); T *accumulation = GetDeviceAddress(inputs, 1);