From 8a8aaacd32a636ae018327aca2976c510ce0a38e Mon Sep 17 00:00:00 2001 From: yujianfeng Date: Mon, 21 Mar 2022 20:08:42 +0800 Subject: [PATCH] Clean code --- .../include/common/utils/config_manager.h | 2 +- .../ccsrc/include/common/utils/contract.h | 6 ++--- .../include/common/utils/convert_utils.h | 1 - .../include/common/utils/philox_generator.h | 5 +++-- .../common/utils/scoped_long_running.h | 2 +- .../pybind_api/gil_scoped_long_running.h | 2 +- mindspore/ccsrc/utils/callbacks_ge.cc | 8 +++---- mindspore/ccsrc/utils/comm_manager.cc | 8 +++---- mindspore/ccsrc/utils/convert_utils.cc | 22 +++++++++++-------- mindspore/ccsrc/utils/convert_utils_py.cc | 10 ++++----- mindspore/ccsrc/utils/philox_generator.cc | 3 ++- 11 files changed, 37 insertions(+), 32 deletions(-) diff --git a/mindspore/ccsrc/include/common/utils/config_manager.h b/mindspore/ccsrc/include/common/utils/config_manager.h index 73ad90cc874..4d288b05da7 100644 --- a/mindspore/ccsrc/include/common/utils/config_manager.h +++ b/mindspore/ccsrc/include/common/utils/config_manager.h @@ -95,7 +95,7 @@ class COMMON_EXPORT ConfigManager { void set_iter_num(const std::string &queue_name, const int64_t num) { queue_name_ = queue_name; iter_num_ = num; - queue_info_map[queue_name_] = num; + queue_info_map[queue_name_] = static_cast(num); } std::string dataset_phase() const { return dataset_phase_; } diff --git a/mindspore/ccsrc/include/common/utils/contract.h b/mindspore/ccsrc/include/common/utils/contract.h index 1e641ccb874..a44a04e0917 100644 --- a/mindspore/ccsrc/include/common/utils/contract.h +++ b/mindspore/ccsrc/include/common/utils/contract.h @@ -81,11 +81,11 @@ class EnsuresAccess }; template -struct IsSharedPtr : std::false_type {}; +struct IsSharedPtr : public std::false_type {}; template -struct IsSharedPtr> : std::true_type {}; +struct IsSharedPtr> : public std::true_type {}; template -struct IsSharedPtr &> : std::true_type {}; +struct IsSharedPtr &> : public std::true_type {}; template class EnsuresAccess::value>> { diff --git a/mindspore/ccsrc/include/common/utils/convert_utils.h b/mindspore/ccsrc/include/common/utils/convert_utils.h index 136f7cf3796..3062ff0efaa 100644 --- a/mindspore/ccsrc/include/common/utils/convert_utils.h +++ b/mindspore/ccsrc/include/common/utils/convert_utils.h @@ -38,7 +38,6 @@ namespace mindspore { namespace tensor { class Tensor; -using TensorPtr = std::shared_ptr; } // namespace tensor COMMON_EXPORT bool BaseRefToBool(const BaseRef &in, bool *out); diff --git a/mindspore/ccsrc/include/common/utils/philox_generator.h b/mindspore/ccsrc/include/common/utils/philox_generator.h index 105001b45ba..8de0654afe1 100644 --- a/mindspore/ccsrc/include/common/utils/philox_generator.h +++ b/mindspore/ccsrc/include/common/utils/philox_generator.h @@ -20,6 +20,7 @@ #include #include #include "utils/log_adapter.h" +#include "utils/convert_utils_base.h" #include "include/common/visible.h" namespace mindspore { @@ -65,7 +66,7 @@ template bool FillRandoms(PhiloxGenerator generator, float *output, int64_t vet_size, int64_t thread_Id) { T distribution; errno_t mem_ret; - generator.JumpStep((vet_size * thread_Id + kResultNum - 1) / kResultNum); + generator.JumpStep(LongToSize((vet_size * thread_Id + kResultNum - 1) / kResultNum)); for (int32_t i = 0; i < vet_size; i += kResultNum) { auto outputResult = distribution(&generator); size_t max_length = 0; @@ -73,7 +74,7 @@ bool FillRandoms(PhiloxGenerator generator, float *output, int64_t vet_size, int max_length = kResultNum * sizeof(float); mem_ret = memcpy_s(&output[i], max_length, &outputResult[0], max_length); } else { - max_length = (vet_size - i) * sizeof(float); + max_length = LongToSize((vet_size - i) * sizeof(float)); mem_ret = memcpy_s(&output[i], max_length, &outputResult[0], max_length); } if (mem_ret != EOK) { diff --git a/mindspore/ccsrc/include/common/utils/scoped_long_running.h b/mindspore/ccsrc/include/common/utils/scoped_long_running.h index d68ec08547a..b7a2c59f4ca 100644 --- a/mindspore/ccsrc/include/common/utils/scoped_long_running.h +++ b/mindspore/ccsrc/include/common/utils/scoped_long_running.h @@ -30,7 +30,7 @@ class ScopedLongRunningHook { ScopedLongRunningHook() = default; virtual ~ScopedLongRunningHook() = default; virtual void Enter() = 0; - virtual void Leave() = 0; + virtual void Leave() noexcept = 0; }; using ScopedLongRunningHookPtr = std::unique_ptr; diff --git a/mindspore/ccsrc/pybind_api/gil_scoped_long_running.h b/mindspore/ccsrc/pybind_api/gil_scoped_long_running.h index bb647fb8216..a3f23a484e8 100644 --- a/mindspore/ccsrc/pybind_api/gil_scoped_long_running.h +++ b/mindspore/ccsrc/pybind_api/gil_scoped_long_running.h @@ -33,7 +33,7 @@ class GilScopedLongRunningHook : public ScopedLongRunningHook { release_ = std::make_unique(); } } - void Leave() override { release_ = nullptr; } + void Leave() noexcept override { release_ = nullptr; } private: std::unique_ptr release_; diff --git a/mindspore/ccsrc/utils/callbacks_ge.cc b/mindspore/ccsrc/utils/callbacks_ge.cc index 51f571d49cb..512c38722a8 100644 --- a/mindspore/ccsrc/utils/callbacks_ge.cc +++ b/mindspore/ccsrc/utils/callbacks_ge.cc @@ -109,9 +109,9 @@ uint32_t CheckpointSaveCallback(uint32_t graph_id, const std::map(ret); - uint32_t status = Status::SUCCESS; + uint32_t status = IntToUint(Status::SUCCESS); if (!bool_ret) { - status = Status::FAILED; + status = IntToUint(Status::FAILED); MS_LOG(ERROR) << "Python checkpoint return false during callback"; } return status; @@ -178,10 +178,10 @@ uint32_t SummarySaveCallback(uint32_t graph_id, const std::map(ret); if (!bool_ret) { MS_LOG(ERROR) << "Python checkpoint return false during callback"; - return Status::FAILED; + return IntToUint(Status::FAILED); } MS_LOG(DEBUG) << "End the summary save callback function."; - return Status::SUCCESS; + return IntToUint(Status::SUCCESS); } } // namespace callbacks } // namespace mindspore diff --git a/mindspore/ccsrc/utils/comm_manager.cc b/mindspore/ccsrc/utils/comm_manager.cc index 9bfb540aa0e..58216859ddd 100644 --- a/mindspore/ccsrc/utils/comm_manager.cc +++ b/mindspore/ccsrc/utils/comm_manager.cc @@ -35,13 +35,13 @@ class DefaultCommManager : public CommManager { ~DefaultCommManager() override = default; bool CreateGroupSync(const string &, const std::vector &) const override { return true; } - bool GetRankID(const string &group, unsigned int *rank_id) const override { return true; } - bool GetRankSize(const string &group, unsigned int *rank_size) const override { + bool GetRankID(const string &, unsigned int *) const override { return true; } + bool GetRankSize(const string &, unsigned int *rank_size) const override { *rank_size = kNoCommDlibRankSize; return true; } - bool DestroyGroup(const string &group) const override { return true; } + bool DestroyGroup(const string &) const override { return true; } uint32_t GetRank() override { return 0; } }; @@ -53,7 +53,7 @@ bool CommManager::Register(const std::string &name, const std::shared_ptrisa() && a2->isa()) { + return a1->cast()->name() == a2->cast()->name(); + } else if (a1->isa() && a2->isa()) { + return a1->cast()->ValueEqual(*(a2->cast())); + } + return *a1 == *a2; +} + bool SameNodeShallow(const AnfNodePtr &node1, const AnfNodePtr &node2, FuncGraphPairMapEquiv *equiv_func_graph, NodeMapEquiv *const equiv_node) { if (equiv_node == nullptr) { @@ -122,15 +134,7 @@ bool SameNodeShallow(const AnfNodePtr &node1, const AnfNodePtr &node2, FuncGraph equiv_node); } if (node1->isa() && node2->isa()) { - auto a1 = GetValueNode(node1); - auto a2 = GetValueNode(node2); - if (a1->isa() && a2->isa()) { - return a1->cast()->name() == a2->cast()->name(); - } else if (a1->isa() && a2->isa()) { - return a1->cast()->ValueEqual(*(a2->cast())); - } else { - return *a1 == *a2; - } + return SameValueNode(node1, node2); } if (node1->isa() && node2->isa()) { auto para1 = node1->cast(); diff --git a/mindspore/ccsrc/utils/convert_utils_py.cc b/mindspore/ccsrc/utils/convert_utils_py.cc index 41ed445fa95..88a18096e75 100644 --- a/mindspore/ccsrc/utils/convert_utils_py.cc +++ b/mindspore/ccsrc/utils/convert_utils_py.cc @@ -233,15 +233,15 @@ static ValueNameToConverterVector value_name_to_converter = { return interpreted_object->obj(); }}, // None - {None::kTypeId, [](const ValuePtr &value) -> py::object { return py::none(); }}, + {None::kTypeId, [](const ValuePtr &) -> py::object { return py::none(); }}, // AnyValue - {AnyValue::kTypeId, [](const ValuePtr &value) -> py::object { return py::none(); }}, + {AnyValue::kTypeId, [](const ValuePtr &) -> py::object { return py::none(); }}, // FuncGraph - {FuncGraph::kTypeId, [](const ValuePtr &value) -> py::object { return py::none(); }}, + {FuncGraph::kTypeId, [](const ValuePtr &) -> py::object { return py::none(); }}, // Monad - {Monad::kTypeId, [](const ValuePtr &value) -> py::object { return py::none(); }}, + {Monad::kTypeId, [](const ValuePtr &) -> py::object { return py::none(); }}, // Ellipsis - {Ellipsis::kTypeId, [](const ValuePtr &value) -> py::object { return py::ellipsis(); }}}; + {Ellipsis::kTypeId, [](const ValuePtr &) -> py::object { return py::ellipsis(); }}}; py::object ValueToPyData(const ValuePtr &value) { if (value == nullptr) { diff --git a/mindspore/ccsrc/utils/philox_generator.cc b/mindspore/ccsrc/utils/philox_generator.cc index a6ac2e1ea24..54f57556882 100644 --- a/mindspore/ccsrc/utils/philox_generator.cc +++ b/mindspore/ccsrc/utils/philox_generator.cc @@ -47,7 +47,8 @@ std::array PhiloxGenerator::Compute(const std::array &key_var) const { std::array min_value; std::array max_value; - for (size_t i = 0; i < kResultNum; i += 2) { + constexpr auto step = 2; + for (size_t i = 0; i < kResultNum; i += step) { uint64_t temp = static_cast(keyConstant[i]) * counter[i]; min_value[i] = static_cast(temp); max_value[i] = static_cast(temp >> kShiftNum);