From 0625168ce81c62fdf0f814dd965ae870cef3d8c1 Mon Sep 17 00:00:00 2001 From: joylvliang Date: Wed, 9 Jun 2021 11:59:16 +0800 Subject: [PATCH] clear_pclint --- .../random_normal/philox_generator.cc | 2 +- mindspore/core/abstract/prim_arrays.cc | 38 ++++++++++++------- 2 files changed, 26 insertions(+), 14 deletions(-) diff --git a/mindspore/ccsrc/pybind_api/random_normal/philox_generator.cc b/mindspore/ccsrc/pybind_api/random_normal/philox_generator.cc index 7607fe7854c..819c7d2a628 100644 --- a/mindspore/ccsrc/pybind_api/random_normal/philox_generator.cc +++ b/mindspore/ccsrc/pybind_api/random_normal/philox_generator.cc @@ -15,9 +15,9 @@ */ #include "pybind_api/random_normal/philox_generator.h" +namespace mindspore { static constexpr uint64_t kShiftNum = 32; static constexpr uint64_t kGenerateNum = 10; -namespace mindspore { void PhiloxGenerator::Jump() { if ((++counter_[0] == 0) && (++counter_[1] == 0) && (++counter_[2] == 0)) { ++counter_[3]; diff --git a/mindspore/core/abstract/prim_arrays.cc b/mindspore/core/abstract/prim_arrays.cc index 930ec6d9be1..31e3f174b2a 100644 --- a/mindspore/core/abstract/prim_arrays.cc +++ b/mindspore/core/abstract/prim_arrays.cc @@ -170,7 +170,8 @@ AbstractBasePtr InferImplPadAndShift(const AnalysisEnginePtr &, const PrimitiveP const AbstractBasePtrList &args_spec_list) { // inputs: a 1-d Tensor const std::string op_name = primitive->name(); - CheckArgsSize(op_name, args_spec_list, 3); + const size_t size_expected = 3; + CheckArgsSize(op_name, args_spec_list, size_expected); AbstractTensorPtr input = CheckArg(op_name, args_spec_list, 0); MS_EXCEPTION_IF_NULL(input); auto shape = input->shape(); @@ -191,9 +192,10 @@ AbstractBasePtr InferImplUniqueGrad(const AnalysisEnginePtr &, const PrimitivePt const AbstractBasePtrList &args_spec_list) { // inputs: a 1-d Tensor const std::string op_name = primitive->name(); - CheckArgsSize(op_name, args_spec_list, 2); + const size_t size_expected = 2; + CheckArgsSize(op_name, args_spec_list, size_expected); AbstractTuplePtr dout = CheckArg(op_name, args_spec_list, 0); - CheckArgsSize(op_name + " dout", dout->elements(), 2); + CheckArgsSize(op_name + " dout", dout->elements(), size_expected); auto ids = CheckArg(op_name, dout->elements(), 0); auto ids_idx = CheckArg(op_name, dout->elements(), 1); if (ids->shape()->shape().size() != 1) { @@ -266,7 +268,8 @@ AbstractBasePtr InferImplUnsortedSegmentSum(const AnalysisEnginePtr &, const Pri AbstractBasePtr InferImplUnsortedSegmentMax(const AnalysisEnginePtr &, const PrimitivePtr &primitive, const AbstractBasePtrList &args_spec_list) { const std::string op_name = primitive->name(); - CheckArgsSize(op_name, args_spec_list, 3); + const size_t size_expected = 3; + CheckArgsSize(op_name, args_spec_list, size_expected); auto x = CheckArg(op_name, args_spec_list, 0); MS_EXCEPTION_IF_NULL(x); MS_EXCEPTION_IF_NULL(x->shape()); @@ -317,7 +320,8 @@ AbstractBasePtr InferImplUnsortedSegmentMax(const AnalysisEnginePtr &, const Pri AbstractBasePtr InferImplUnsortedSegmentMin(const AnalysisEnginePtr &, const PrimitivePtr &primitive, const AbstractBasePtrList &args_spec_list) { const std::string op_name = primitive->name(); - CheckArgsSize(op_name, args_spec_list, 3); + const size_t size_expected = 3; + CheckArgsSize(op_name, args_spec_list, size_expected); auto x = CheckArg(op_name, args_spec_list, 0); MS_EXCEPTION_IF_NULL(x); MS_EXCEPTION_IF_NULL(x->shape()); @@ -397,7 +401,8 @@ AbstractBasePtr InferImplScatterUpdate(const AnalysisEnginePtr &, const Primitiv AbstractBasePtr InferImplMapCacheIdx(const AnalysisEnginePtr &, const PrimitivePtr &primitive, const AbstractBasePtrList &args_spec_list) { const std::string op_name = primitive->name(); - CheckArgsSize(op_name, args_spec_list, 5); + const size_t size_expected = 5; + CheckArgsSize(op_name, args_spec_list, size_expected); auto hash_map = CheckArg(op_name, args_spec_list, 0); MS_EXCEPTION_IF_NULL(hash_map); MS_EXCEPTION_IF_NULL(hash_map->shape()); @@ -435,7 +440,8 @@ AbstractBasePtr InferImplMapCacheIdx(const AnalysisEnginePtr &, const PrimitiveP AbstractBasePtr InferImplCacheSwapTable(const AnalysisEnginePtr &, const PrimitivePtr &primitive, const AbstractBasePtrList &args_spec_list) { const std::string op_name = primitive->name(); - CheckArgsSize(op_name, args_spec_list, 3); + const size_t size_expected = 3; + CheckArgsSize(op_name, args_spec_list, size_expected); auto cache_table = CheckArg(op_name, args_spec_list, 0); auto cache_table_shp = cache_table->shape(); MS_EXCEPTION_IF_NULL(cache_table); @@ -518,7 +524,8 @@ AbstractBasePtr InferImplSubAndFilter(const AnalysisEnginePtr &, const Primitive AbstractBasePtr InferImplDiv(const AnalysisEnginePtr &, const PrimitivePtr &primitive, const AbstractBasePtrList &args_spec_list) { const std::string op_name = primitive->name(); - CheckArgsSize(op_name, args_spec_list, 2); + const size_t size_expected = 2; + CheckArgsSize(op_name, args_spec_list, size_expected); auto x = CheckArg(op_name, args_spec_list, 0); auto y = CheckArg(op_name, args_spec_list, 1); MS_EXCEPTION_IF_NULL(x); @@ -534,7 +541,8 @@ AbstractBasePtr InferImplDiv(const AnalysisEnginePtr &, const PrimitivePtr &prim AbstractBasePtr InferImplRealDiv(const AnalysisEnginePtr &, const PrimitivePtr &primitive, const AbstractBasePtrList &args_spec_list) { const std::string op_name = primitive->name(); - CheckArgsSize(op_name, args_spec_list, 2); + const size_t size_expected = 2; + CheckArgsSize(op_name, args_spec_list, size_expected); auto x = CheckArg(op_name, args_spec_list, 0); auto y = CheckArg(op_name, args_spec_list, 1); MS_EXCEPTION_IF_NULL(x); @@ -613,7 +621,8 @@ AbstractBasePtr InferImplGatherV2(const AnalysisEnginePtr &, const PrimitivePtr AbstractBasePtr InferImplDynamicAssign(const AnalysisEnginePtr &, const PrimitivePtr &primitive, const AbstractBasePtrList &args_spec_list) { // Inputs: a tensor - CheckArgsSize(primitive->name(), args_spec_list, 2); + const size_t size_expected = 2; + CheckArgsSize(primitive->name(), args_spec_list, size_expected); MS_LOG(INFO) << "InferImplDynamicAssign " << args_spec_list[0]; auto type = args_spec_list[0]->BuildType(); @@ -811,7 +820,8 @@ AbstractBasePtr InferImplMapUniform(const AnalysisEnginePtr &, const PrimitivePt const AbstractBasePtrList &args_spec_list) { // Inputs: one tensor. const std::string op_name = primitive->name(); - CheckArgsSize(op_name, args_spec_list, 3); + const size_t size_expected = 3; + CheckArgsSize(op_name, args_spec_list, size_expected); return args_spec_list[0]->Broaden(); } @@ -861,7 +871,8 @@ AbstractBasePtr InferImplSplit(const AnalysisEnginePtr &, const PrimitivePtr &pr AbstractBasePtr InferImplSequenceMask(const AnalysisEnginePtr &, const PrimitivePtr &primitive, const AbstractBasePtrList &args_spec_list) { const std::string &op_name = primitive->name(); - CheckArgsSize(op_name, args_spec_list, 2); + const size_t size_expected = 2; + CheckArgsSize(op_name, args_spec_list, size_expected); AbstractTensorPtr lengths = CheckArg(op_name, args_spec_list, 0); (void)CheckTensorDType(lengths, {kInt32, kInt64}, "Input 1 (lengths) for SequenceMask should be one of: %s"); @@ -1124,7 +1135,8 @@ AbstractBasePtr InferImplSort(const AnalysisEnginePtr &, const PrimitivePtr &pri AbstractBasePtr InferImplMaskedSelect(const AnalysisEnginePtr &, const PrimitivePtr &primitive, const AbstractBasePtrList &args_spec_list) { const std::string op_name = primitive->name(); - CheckArgsSize(op_name, args_spec_list, 2); + const size_t size_expected = 2; + CheckArgsSize(op_name, args_spec_list, size_expected); AbstractTensorPtr x = CheckArg(op_name, args_spec_list, 0); AbstractTensorPtr mask = CheckArg(op_name, args_spec_list, 1);