Fix code check in core/utils

mindspore/core/utils/check_convert_utils.cc

@@ -146,51 +146,55 @@ static std::map<std::string, std::map<std::string, AttrConverterPair>> PrimAttrC
 
 bool CheckAndConvertUtils::GetDataFormatEnumValue(const ValuePtr &value, int64_t *enum_value) {
   MS_EXCEPTION_IF_NULL(value);
-  if (value->isa<StringImm>()) {
-    auto attr_value_str = GetValue<std::string>(value);
-    if (DataFormatToEnumMap.find(attr_value_str) == DataFormatToEnumMap.end()) {
-      MS_LOG(DEBUG) << "The data format " << attr_value_str << " not be converted to enum.";
-      return false;
-    }
-    *enum_value = DataFormatToEnumMap[attr_value_str];
-    return true;
-  } else {
+  if (!value->isa<StringImm>()) {
     *enum_value = GetValue<int64_t>(value);
     return true;
   }
+  auto attr_value_str = GetValue<std::string>(value);
+  auto iter = DataFormatToEnumMap.find(attr_value_str);
+  if (iter == DataFormatToEnumMap.end()) {
+    MS_LOG(DEBUG) << "The data format " << attr_value_str << " not be converted to enum.";
+    return false;
+  }
+  *enum_value = iter->second;
+  return true;
 }
 
 void CheckAndConvertUtils::GetPadModEnumValue(const ValuePtr &value, int64_t *enum_value, bool is_upper) {
   MS_EXCEPTION_IF_NULL(value);
-  if (value->isa<StringImm>()) {
-    auto attr_value_str = GetValue<std::string>(value);
+  if (!value->isa<StringImm>()) {
+    *enum_value = GetValue<int64_t>(value);
+    return;
+  }
+  auto attr_value_str = GetValue<std::string>(value);
 
-    std::map<std::string, int64_t> pad_map = PadModToEnumMap;
-    if (is_upper) {
-      pad_map = PadModToEnumUpperMap;
-    }
-    if (pad_map.find(attr_value_str) == pad_map.end()) {
+  if (is_upper) {
+    auto iter = PadModToEnumUpperMap.find(attr_value_str);
+    if (iter == PadModToEnumUpperMap.end()) {
       MS_LOG(EXCEPTION) << "Invalid pad mode " << attr_value_str << " use pad, valid or same";
     }
-    *enum_value = pad_map[attr_value_str];
-  } else {
-    *enum_value = GetValue<int64_t>(value);
+    *enum_value = iter->second;
+    return;
   }
+  auto iter = PadModToEnumMap.find(attr_value_str);
+  if (iter == PadModToEnumMap.end()) {
+    MS_LOG(EXCEPTION) << "Invalid pad mode " << attr_value_str << " use pad, valid or same";
+  }
+  *enum_value = iter->second;
 }
 
 void CheckAndConvertUtils::GetReductionEnumValue(const ValuePtr &value, int64_t *enum_value) {
   MS_EXCEPTION_IF_NULL(value);
-  if (value->isa<StringImm>()) {
-    auto attr_value_str = GetValue<std::string>(value);
-
-    std::map<std::string, int64_t> pad_map = ReductionToEnumMap;
-    if (pad_map.find(attr_value_str) == pad_map.end()) {
-      MS_LOG(EXCEPTION) << "Invalid pad mode " << attr_value_str << " use pad, valid or same";
-    }
-    *enum_value = pad_map[attr_value_str];
-  } else {
+  if (!value->isa<StringImm>()) {
     *enum_value = GetValue<int64_t>(value);
+    return;
+  }
+  auto attr_value_str = GetValue<std::string>(value);
+  auto iter = ReductionToEnumMap.find(attr_value_str);
+  if (iter == ReductionToEnumMap.end()) {
+    MS_LOG(EXCEPTION) << "Invalid pad mode " << attr_value_str << " use pad, valid or same";
   }
+  *enum_value = iter->second;
 }
 
 AttrConverterPair CheckAndConvertUtils::GetAttrConvertPair(const std::string &op_type, const std::string &attr_name) {

mindspore/core/utils/log_adapter.cc

@@ -462,8 +462,8 @@ MS_CORE_API void common_log_init(void) {
       exit(EXIT_FAILURE);
     } else {
       // Set log dir from GLOG_log_dir with RANK_ID or OMPI_COMM_WORLD_RANK.
-      std::string rank_id = mindspore::GetEnv("RANK_ID");
-      std::string gpu_rank_id = mindspore::GetEnv("OMPI_COMM_WORLD_RANK");
+      const std::string rank_id = mindspore::GetEnv("RANK_ID");
+      const std::string gpu_rank_id = mindspore::GetEnv("OMPI_COMM_WORLD_RANK");
       std::string rank = "0";
       if ((!rank_id.empty() && gpu_rank_id.empty()) || (!rank_id.empty() && !gpu_rank_id.empty())) {
         rank = rank_id;

mindspore/core/utils/status.cc

@@ -142,9 +142,8 @@ std::vector<char> Status::ToCString() const {
   }
   if (!data_->status_msg.empty()) {
     return StringToChar(data_->status_msg);
-  } else {
-    return CodeAsCString(data_->status_code);
   }
+  return CodeAsCString(data_->status_code);
 }
 
 int Status::GetLineOfCode() const {

mindspore/core/utils/tensor_construct_utils.cc

@@ -65,12 +65,11 @@ tensor::TensorPtr TensorConstructUtils::CreateOnesTensor(const TypePtr &type_ptr
   };
 
   const auto &tensor_type = tensor->data_type();
-  if (type_dict.count(tensor_type)) {
-    type_dict[tensor_type]();
-    return tensor;
-  } else {
+  if (!type_dict.count(tensor_type)) {
     MS_LOG(EXCEPTION) << "unsupported data type: " << tensor_type;
   }
+  type_dict[tensor_type]();
+  return tensor;
 }
 
 tensor::TensorPtr TensorConstructUtils::CreateTensor(const TypePtr &type_ptr, const std::vector<int64_t> &shape,