From c86e27cdfd4fb7240504fbbccd2cf3f68be16173 Mon Sep 17 00:00:00 2001 From: huangbo77 Date: Thu, 5 Aug 2021 11:09:22 +0800 Subject: [PATCH] fix pclint --- .../cpu/searchsorted_cpu_kernel.cc | 14 +++++++------- .../cpu/searchsorted_cpu_kernel.h | 4 +--- .../kernel_compiler/cpu/sgd_cpu_kernel.cc | 18 ++++++++++-------- .../kernel_compiler/cpu/sgd_cpu_kernel.h | 4 ++-- 4 files changed, 20 insertions(+), 20 deletions(-) diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/searchsorted_cpu_kernel.cc b/mindspore/ccsrc/backend/kernel_compiler/cpu/searchsorted_cpu_kernel.cc index 5ba93e43fc..2a987be45d 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/searchsorted_cpu_kernel.cc +++ b/mindspore/ccsrc/backend/kernel_compiler/cpu/searchsorted_cpu_kernel.cc @@ -39,7 +39,7 @@ void SearchSortedCPUKernel::InitKernel(const CNodePtr &kernel_node) { template const S *SearchSortedCPUKernel::CustomizedLowerBound(const S *seq_start, const S *seq_end, const S key) { while (seq_start < seq_end) { - const S *mid = seq_start + ((seq_end - seq_start) >> 1); + const S *mid = seq_start + ((seq_end - seq_start) / 2); if (!(key <= *mid)) { seq_start = mid + 1; } else { @@ -61,11 +61,12 @@ bool SearchSortedCPUKernel::Launch(const std::vector & size_t seq_dim = sequence_shape_.size(); size_t search_repeat = values_shape_.back(); - auto task = [&](size_t start, size_t end) { + auto task = [this, &sequence, &values, &output, seq_dim, search_repeat](size_t start, size_t end) { for (size_t i = start; i < end; i++) { auto seq_start = (seq_dim == 1) ? sequence : sequence + (i / search_repeat) * search_len; - output[i] = right_ ? std::upper_bound(seq_start, seq_start + search_len, values[i]) - seq_start - : CustomizedLowerBound(seq_start, seq_start + search_len, values[i]) - seq_start; + auto result = right_ ? std::upper_bound(seq_start, seq_start + search_len, values[i]) - seq_start + : CustomizedLowerBound(seq_start, seq_start + search_len, values[i]) - seq_start; + output[i] = static_cast(result); } }; CPUKernelUtils::ParallelFor(task, elem_num); @@ -92,8 +93,8 @@ void SearchSortedCPUKernel::CheckParam(const std::vector &inpu } auto sequence = reinterpret_cast(inputs[0]->addr); - size_t list_count = accumulate(sequence_shape_.begin(), sequence_shape_.end() - 1, 1, std::multiplies()); - auto task = [&](size_t start, size_t end) { + int list_count = accumulate(sequence_shape_.begin(), sequence_shape_.end() - 1, 1, std::multiplies()); + auto task = [this, &sequence](size_t start, size_t end) { for (size_t i = start; i < end; i++) { for (size_t j = 0; j < search_len - 1; j++) { if (sequence[i * search_len + j] > sequence[i * search_len + j + 1]) { @@ -104,6 +105,5 @@ void SearchSortedCPUKernel::CheckParam(const std::vector &inpu }; CPUKernelUtils::ParallelFor(task, list_count); } - } // namespace kernel } // namespace mindspore diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/searchsorted_cpu_kernel.h b/mindspore/ccsrc/backend/kernel_compiler/cpu/searchsorted_cpu_kernel.h index 87cea83a5e..9333e72dc9 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/searchsorted_cpu_kernel.h +++ b/mindspore/ccsrc/backend/kernel_compiler/cpu/searchsorted_cpu_kernel.h @@ -42,7 +42,7 @@ class SearchSortedCPUKernel : public CPUKernel { std::vector sequence_shape_; std::vector values_shape_; std::vector output_shape_; - size_t search_len; + size_t search_len{0}; }; MS_REG_CPU_KERNEL_T_S( @@ -104,8 +104,6 @@ MS_REG_CPU_KERNEL_T_S( SearchSorted, KernelAttr().AddInputAttr(kNumberTypeInt8).AddInputAttr(kNumberTypeInt8).AddOutputAttr(kNumberTypeInt64), SearchSortedCPUKernel, int8_t, int64_t); - } // namespace kernel } // namespace mindspore - #endif // MINDSPORE_CCSRC_BACKEND_KERNEL_COMPILER_CPU_SEARCHSORTED_CPU_KERNEL_H_ diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/sgd_cpu_kernel.cc b/mindspore/ccsrc/backend/kernel_compiler/cpu/sgd_cpu_kernel.cc index 40814707d1..32606a9a4e 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/sgd_cpu_kernel.cc +++ b/mindspore/ccsrc/backend/kernel_compiler/cpu/sgd_cpu_kernel.cc @@ -35,12 +35,12 @@ void SGDCPUKernel::InitKernel(const CNodePtr &kernel_node) { template void SGDCPUKernel::CheckParam(const std::vector &inputs, const std::vector &outputs) { - // inputs: params, grad, lr, accum, momentum, stat + // inputs: param, grad, lr, accum, momentum, stat if (inputs.size() != kInputSize) { MS_LOG(EXCEPTION) << "Input number is " << inputs.size() << ", but SGD needs 6 inputs."; } - // output: param + // output: output_param if (outputs.size() != kOutputSize) { MS_LOG(EXCEPTION) << "Output number is " << outputs.size() << ", but SGD needs 1 outputs."; } @@ -60,18 +60,20 @@ bool SGDCPUKernel::Launch(const std::vector &inputs, const std::v auto output_param = reinterpret_cast(outputs[0]->addr); size_t elem_num = inputs[0]->size / sizeof(T); - auto task = [&](size_t start, size_t end) { + auto task = [this, ¶m, &grad, &lr, &accum, &momentum, &stat, &output_param](size_t start, size_t end) { + T ZERO = static_cast(0); + T ONE = static_cast(1); for (size_t i = start; i < end; i++) { T grad_new = grad[i]; - if (weight_decay_ > 0) { + if (weight_decay_ > static_cast(0.0)) { grad_new += param[i] * static_cast(weight_decay_); } - if (momentum[0] > static_cast(0)) { - if (stat[i] > static_cast(0)) { + if (momentum[0] > ZERO) { + if (stat[i] > ZERO) { accum[i] = grad_new; - stat[i] = static_cast(0); + stat[i] = ZERO; } else { - accum[i] = accum[i] * momentum[0] + static_cast(1.0 - dampening_) * grad_new; + accum[i] = accum[i] * momentum[0] + (ONE - static_cast(dampening_)) * grad_new; } if (nesterov_) { grad_new += accum[i] * momentum[0]; diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/sgd_cpu_kernel.h b/mindspore/ccsrc/backend/kernel_compiler/cpu/sgd_cpu_kernel.h index 93f25d1b65..95fb461f44 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/sgd_cpu_kernel.h +++ b/mindspore/ccsrc/backend/kernel_compiler/cpu/sgd_cpu_kernel.h @@ -36,8 +36,8 @@ class SGDCPUKernel : public CPUKernel { private: static void CheckParam(const std::vector &inputs, const std::vector &outputs); - float dampening_; - float weight_decay_; + float dampening_{0.0}; + float weight_decay_{0.0}; bool nesterov_{true}; };