已合并
【质量加固】修复10个代码规范问题:枚举类改造 #1730
【质量加固】修复10个代码规范问题:枚举类改造 #1730
已合并
西山枫叶创建于 8月13日
共 9 个文件变更+30-30
@@ -38,7 +38,7 @@ using ge::SymbolicUtils;
38 38 
39namespace att {39namespace att {
40using Expr = af::Expression;40using Expr = af::Expression;
41-enum SolverType : uint32_t { SEARCH_TILE, ERROR };41+enum class SolverType : uint32_t { SEARCH_TILE, ERROR };
42 42 
43enum class HardwareDef {43enum class HardwareDef {
44 GM = 0,44 GM = 0,
@@ -68,27 +68,27 @@ std::string PrintArgs(const std::vector<SymEngineExprPtr> &args, const std::stri
68std::string DefaultCeilPrinter(const std::vector<SymEngineExprPtr> &args, StrType type) {68std::string DefaultCeilPrinter(const std::vector<SymEngineExprPtr> &args, StrType type) {
69 return kPrintCeil + kPrintBracket_L + PrintArgs(args, kPrintDelim, type) + kPrintBracket_R;69 return kPrintCeil + kPrintBracket_L + PrintArgs(args, kPrintDelim, type) + kPrintBracket_R;
70}70}
71-REGISTER_EXPR_DEFAULT_PRINTER(kOpCeil, DefaultCeilPrinter);71+REGISTER_EXPR_DEFAULT_PRINTER(OperationType::kOpCeil, DefaultCeilPrinter);
72 72 
73std::string DefaultFloorPrinter(const std::vector<SymEngineExprPtr> &args, StrType type) {73std::string DefaultFloorPrinter(const std::vector<SymEngineExprPtr> &args, StrType type) {
74 return kPrintFloor + kPrintBracket_L + PrintArgs(args, kPrintDelim, type) + kPrintBracket_R;74 return kPrintFloor + kPrintBracket_L + PrintArgs(args, kPrintDelim, type) + kPrintBracket_R;
75}75}
76-REGISTER_EXPR_DEFAULT_PRINTER(kOpFloor, DefaultFloorPrinter);76+REGISTER_EXPR_DEFAULT_PRINTER(OperationType::kOpFloor, DefaultFloorPrinter);
77 77 
78std::string DefaultAbsPrinter(const std::vector<SymEngineExprPtr> &args, StrType type) {78std::string DefaultAbsPrinter(const std::vector<SymEngineExprPtr> &args, StrType type) {
79 return kPrintAbs + kPrintBracket_L + PrintArgs(args, kPrintDelim, type) + kPrintBracket_R;79 return kPrintAbs + kPrintBracket_L + PrintArgs(args, kPrintDelim, type) + kPrintBracket_R;
80}80}
81-REGISTER_EXPR_DEFAULT_PRINTER(kOpAbs, DefaultAbsPrinter);81+REGISTER_EXPR_DEFAULT_PRINTER(OperationType::kOpAbs, DefaultAbsPrinter);
82 82 
83std::string DefaultLogicalAndPrinter(const std::vector<SymEngineExprPtr> &args, StrType type) {83std::string DefaultLogicalAndPrinter(const std::vector<SymEngineExprPtr> &args, StrType type) {
84 return kPrintLogicalAnd + kPrintBracket_L + PrintArgs(args, kPrintDelim, type) + kPrintBracket_R;84 return kPrintLogicalAnd + kPrintBracket_L + PrintArgs(args, kPrintDelim, type) + kPrintBracket_R;
85}85}
86-REGISTER_EXPR_DEFAULT_PRINTER(kOpLogicalAnd, DefaultLogicalAndPrinter);86+REGISTER_EXPR_DEFAULT_PRINTER(OperationType::kOpLogicalAnd, DefaultLogicalAndPrinter);
87 87 
88std::string DefaultLogicalOrPrinter(const std::vector<SymEngineExprPtr> &args, StrType type) {88std::string DefaultLogicalOrPrinter(const std::vector<SymEngineExprPtr> &args, StrType type) {
89 return kPrintLogicalOr + kPrintBracket_L + PrintArgs(args, kPrintDelim, type) + kPrintBracket_R;89 return kPrintLogicalOr + kPrintBracket_L + PrintArgs(args, kPrintDelim, type) + kPrintBracket_R;
90}90}
91-REGISTER_EXPR_DEFAULT_PRINTER(kOpLogicalOr, DefaultLogicalOrPrinter);91+REGISTER_EXPR_DEFAULT_PRINTER(OperationType::kOpLogicalOr, DefaultLogicalOrPrinter);
92 92 
93std::string DefaultAddPrinter(const std::vector<SymEngineExprPtr> &args, StrType type) {93std::string DefaultAddPrinter(const std::vector<SymEngineExprPtr> &args, StrType type) {
94 std::vector<SymEngineExprPtr> positive_args;94 std::vector<SymEngineExprPtr> positive_args;
@@ -112,7 +112,7 @@ std::string DefaultAddPrinter(const std::vector<SymEngineExprPtr> &args, StrType
112 res_str += kPrintBracket_R;112 res_str += kPrintBracket_R;
113 return res_str;113 return res_str;
114}114}
115-REGISTER_EXPR_DEFAULT_PRINTER(kOpAdd, DefaultAddPrinter);115+REGISTER_EXPR_DEFAULT_PRINTER(OperationType::kOpAdd, DefaultAddPrinter);
116 116 
117std::string DefaultMulPrinter(const std::vector<SymEngineExprPtr> &args, StrType type) {117std::string DefaultMulPrinter(const std::vector<SymEngineExprPtr> &args, StrType type) {
118 // split mul to num and dens118 // split mul to num and dens
@@ -141,7 +141,7 @@ std::string DefaultMulPrinter(const std::vector<SymEngineExprPtr> &args, StrType
141 res_str += kPrintBracket_R;141 res_str += kPrintBracket_R;
142 return res_str;142 return res_str;
143}143}
144-REGISTER_EXPR_DEFAULT_PRINTER(kOpMul, DefaultMulPrinter);144+REGISTER_EXPR_DEFAULT_PRINTER(OperationType::kOpMul, DefaultMulPrinter);
145 145 
146std::string DefaultMaxPrinter(const std::vector<SymEngineExprPtr> &args, StrType type) {146std::string DefaultMaxPrinter(const std::vector<SymEngineExprPtr> &args, StrType type) {
147 std::string res_str;147 std::string res_str;
@@ -155,7 +155,7 @@ std::string DefaultMaxPrinter(const std::vector<SymEngineExprPtr> &args, StrType
155 }155 }
156 return res_str;156 return res_str;
157}157}
158-REGISTER_EXPR_DEFAULT_PRINTER(kOpMax, DefaultMaxPrinter);158+REGISTER_EXPR_DEFAULT_PRINTER(OperationType::kOpMax, DefaultMaxPrinter);
159 159 
160std::string DefaultMinPrinter(const std::vector<SymEngineExprPtr> &args, StrType type) {160std::string DefaultMinPrinter(const std::vector<SymEngineExprPtr> &args, StrType type) {
161 std::string res_str;161 std::string res_str;
@@ -169,7 +169,7 @@ std::string DefaultMinPrinter(const std::vector<SymEngineExprPtr> &args, StrType
169 }169 }
170 return res_str;170 return res_str;
171}171}
172-REGISTER_EXPR_DEFAULT_PRINTER(kOpMin, DefaultMinPrinter);172+REGISTER_EXPR_DEFAULT_PRINTER(OperationType::kOpMin, DefaultMinPrinter);
173 173 
174std::string PrintIntExpPow(const SymEngineExprPtr &base, const uint32_t exp, StrType type) {174std::string PrintIntExpPow(const SymEngineExprPtr &base, const uint32_t exp, StrType type) {
175 std::string res_str = "(";175 std::string res_str = "(";
@@ -212,7 +212,7 @@ std::string DefaultPowPrinter(const std::vector<SymEngineExprPtr> &args, StrType
212 }212 }
213 return GetDefaultPowPrint(args, type);213 return GetDefaultPowPrint(args, type);
214}214}
215-REGISTER_EXPR_DEFAULT_PRINTER(kOpPow, DefaultPowPrinter);215+REGISTER_EXPR_DEFAULT_PRINTER(OperationType::kOpPow, DefaultPowPrinter);
216 216 
217std::string GetDefaultModPrint(const std::vector<SymEngineExprPtr> &base_args, StrType type) {217std::string GetDefaultModPrint(const std::vector<SymEngineExprPtr> &base_args, StrType type) {
218 constexpr const size_t mod_args_num = 2UL;218 constexpr const size_t mod_args_num = 2UL;
@@ -223,25 +223,25 @@ std::string GetDefaultModPrint(const std::vector<SymEngineExprPtr> &base_args, S
223 return kPrintMod + "(" + ExpressionImpl::SymExprToExpressionImplRef(base_args[dividend_idx]).Str(type) + ", " +223 return kPrintMod + "(" + ExpressionImpl::SymExprToExpressionImplRef(base_args[dividend_idx]).Str(type) + ", " +
224 ExpressionImpl::SymExprToExpressionImplRef(base_args[divisor_idx]).Str(type) + ")";224 ExpressionImpl::SymExprToExpressionImplRef(base_args[divisor_idx]).Str(type) + ")";
225}225}
226-REGISTER_EXPR_DEFAULT_PRINTER(kOpMod, GetDefaultModPrint);226+REGISTER_EXPR_DEFAULT_PRINTER(OperationType::kOpMod, GetDefaultModPrint);
227 227 
228std::string DefaultLogPrinter(const std::vector<SymEngineExprPtr> &args, StrType type) {228std::string DefaultLogPrinter(const std::vector<SymEngineExprPtr> &args, StrType type) {
229 return kPrintLog + kPrintBracket_L + PrintArgs(args, kPrintDelim, type) + kPrintBracket_R;229 return kPrintLog + kPrintBracket_L + PrintArgs(args, kPrintDelim, type) + kPrintBracket_R;
230}230}
231-REGISTER_EXPR_DEFAULT_PRINTER(kOpLog, DefaultLogPrinter);231+REGISTER_EXPR_DEFAULT_PRINTER(OperationType::kOpLog, DefaultLogPrinter);
232 232 
233std::string DefaultEqualPrinter(const std::vector<SymEngineExprPtr> &args, StrType type) {233std::string DefaultEqualPrinter(const std::vector<SymEngineExprPtr> &args, StrType type) {
234 GE_ASSERT_TRUE(args.size() == kRelationArgsNum, "Equal operator args size should be 2, but get %zu", args.size());234 GE_ASSERT_TRUE(args.size() == kRelationArgsNum, "Equal operator args size should be 2, but get %zu", args.size());
235 235 
236 return kPrintEq + kPrintBracket_L + PrintArgs(args, kPrintDelim, type) + kPrintBracket_R;236 return kPrintEq + kPrintBracket_L + PrintArgs(args, kPrintDelim, type) + kPrintBracket_R;
237}237}
238-REGISTER_EXPR_DEFAULT_PRINTER(kOpEq, DefaultEqualPrinter);238+REGISTER_EXPR_DEFAULT_PRINTER(OperationType::kOpEq, DefaultEqualPrinter);
239 239 
240std::string DefaultUnEqualPrinter(const std::vector<SymEngineExprPtr> &args, StrType type) {240std::string DefaultUnEqualPrinter(const std::vector<SymEngineExprPtr> &args, StrType type) {
241 GE_ASSERT_TRUE(args.size() == kRelationArgsNum, "Unequal operator args size should be 2, but get %zu", args.size());241 GE_ASSERT_TRUE(args.size() == kRelationArgsNum, "Unequal operator args size should be 2, but get %zu", args.size());
242 return kPrintNe + kPrintBracket_L + PrintArgs(args, kPrintDelim, type) + kPrintBracket_R;242 return kPrintNe + kPrintBracket_L + PrintArgs(args, kPrintDelim, type) + kPrintBracket_R;
243}243}
244-REGISTER_EXPR_DEFAULT_PRINTER(kOpNe, DefaultUnEqualPrinter);244+REGISTER_EXPR_DEFAULT_PRINTER(OperationType::kOpNe, DefaultUnEqualPrinter);
245 245 
246std::string DefaultStrictLessThanPrinter(const std::vector<SymEngineExprPtr> &args, StrType type) {246std::string DefaultStrictLessThanPrinter(const std::vector<SymEngineExprPtr> &args, StrType type) {
247 GE_ASSERT_TRUE(args.size() == kRelationArgsNum, "StrictLessThan operator args size should be 2, but get %zu",247 GE_ASSERT_TRUE(args.size() == kRelationArgsNum, "StrictLessThan operator args size should be 2, but get %zu",
@@ -249,13 +249,13 @@ std::string DefaultStrictLessThanPrinter(const std::vector<SymEngineExprPtr> &ar
249 return kPrintLt + kPrintBracket_L + ExpressionImpl::SymExprToExpressionImplRef(args[0]).Str(type) + kPrintDelim +249 return kPrintLt + kPrintBracket_L + ExpressionImpl::SymExprToExpressionImplRef(args[0]).Str(type) + kPrintDelim +
250 ExpressionImpl::SymExprToExpressionImplRef(args[1]).Str(type) + kPrintBracket_R;250 ExpressionImpl::SymExprToExpressionImplRef(args[1]).Str(type) + kPrintBracket_R;
251}251}
252-REGISTER_EXPR_DEFAULT_PRINTER(kOpLt, DefaultStrictLessThanPrinter);252+REGISTER_EXPR_DEFAULT_PRINTER(OperationType::kOpLt, DefaultStrictLessThanPrinter);
253 253 
254std::string DefaultLessThanPrinter(const std::vector<SymEngineExprPtr> &args, StrType type) {254std::string DefaultLessThanPrinter(const std::vector<SymEngineExprPtr> &args, StrType type) {
255 GE_ASSERT_TRUE(args.size() == kRelationArgsNum, "LessThan operator args size should be 2, but get %zu", args.size());255 GE_ASSERT_TRUE(args.size() == kRelationArgsNum, "LessThan operator args size should be 2, but get %zu", args.size());
256 return kPrintLe + kPrintBracket_L + ExpressionImpl::SymExprToExpressionImplRef(args[0]).Str(type) + kPrintDelim +256 return kPrintLe + kPrintBracket_L + ExpressionImpl::SymExprToExpressionImplRef(args[0]).Str(type) + kPrintDelim +
257 ExpressionImpl::SymExprToExpressionImplRef(args[1]).Str(type) + kPrintBracket_R;257 ExpressionImpl::SymExprToExpressionImplRef(args[1]).Str(type) + kPrintBracket_R;
258}258}
259-REGISTER_EXPR_DEFAULT_PRINTER(kOpLe, DefaultLessThanPrinter);259+REGISTER_EXPR_DEFAULT_PRINTER(OperationType::kOpLe, DefaultLessThanPrinter);
260} // namespace260} // namespace
261} // namespace af261} // namespace af
@@ -30,7 +30,7 @@ using ExpressionImplPtr = std::unique_ptr<ExpressionImpl>;
30using RelationalFunc = std::function<SymEngine::RCP<const SymEngine::Basic>(30using RelationalFunc = std::function<SymEngine::RCP<const SymEngine::Basic>(
31 const SymEngine::RCP<const SymEngine::Basic> &, const SymEngine::RCP<const SymEngine::Basic> &)>;31 const SymEngine::RCP<const SymEngine::Basic> &, const SymEngine::RCP<const SymEngine::Basic> &)>;
32 32 
33-enum OperationType : size_t {33+enum class OperationType : size_t {
34 kOpAdd = 0,34 kOpAdd = 0,
35 kOpMax,35 kOpMax,
36 kOpMin,36 kOpMin,
@@ -38,7 +38,7 @@ extern "C" {
38#define GE_MODULE_NAME static_cast<int32_t>(GE)38#define GE_MODULE_NAME static_cast<int32_t>(GE)
39#define GE_MODULE_NAME_U16 static_cast<uint16_t>(GE)39#define GE_MODULE_NAME_U16 static_cast<uint16_t>(GE)
40 40 
41-enum TraceStatus { TRACE_INIT = 0, TRACE_RUNNING, TRACE_WAITING, TRACE_STOP };41+enum class TraceStatus { TRACE_INIT = 0, TRACE_RUNNING, TRACE_WAITING, TRACE_STOP };
42 42 
43class GE_FUNC_VISIBILITY GeLog {43class GE_FUNC_VISIBILITY GeLog {
44 public:44 public:
@@ -20,7 +20,7 @@
20#include "register/graph_optimizer/fusion_common/op_slice_info.h"20#include "register/graph_optimizer/fusion_common/op_slice_info.h"
21 21 
22namespace fe {22namespace fe {
23-enum BufferFusionPassType {23+enum class BufferFusionPassType {
24 BUILT_IN_AI_CORE_BUFFER_FUSION_PASS,24 BUILT_IN_AI_CORE_BUFFER_FUSION_PASS,
25 BUILT_IN_VECTOR_CORE_BUFFER_FUSION_PASS,25 BUILT_IN_VECTOR_CORE_BUFFER_FUSION_PASS,
26 CUSTOM_AI_CORE_BUFFER_FUSION_PASS,26 CUSTOM_AI_CORE_BUFFER_FUSION_PASS,
@@ -28,9 +28,9 @@ extern const int64_t TBE_OUTPUT_BRANCH_MULTI;
28extern const int64_t TBE_PATTERN_GROUPID_INVALID;28extern const int64_t TBE_PATTERN_GROUPID_INVALID;
29extern const int32_t TBE_OUTPUT_MAX_NUM_LIMIT;29extern const int32_t TBE_OUTPUT_MAX_NUM_LIMIT;
30 30 
31-enum SkipStatus { DISABLED = 0, AVAILABLE = 1, SKIPPED = 2 };31+enum class SkipStatus { DISABLED = 0, AVAILABLE = 1, SKIPPED = 2 };
32 32 
33-enum ShapeTypeRule { IGNORE_SHAPE_TYPE = 0, ONLY_SUPPORT_STATIC, ONLY_SUPPORT_DYNAMIC };33+enum class ShapeTypeRule { IGNORE_SHAPE_TYPE = 0, ONLY_SUPPORT_STATIC, ONLY_SUPPORT_DYNAMIC };
34 34 
35enum class PatternRelation { RELATIVE_POSITION_CONSISTENT = 0 };35enum class PatternRelation { RELATIVE_POSITION_CONSISTENT = 0 };
36 36 
@@ -82,7 +82,7 @@ class BufferFusionPattern {
82 const int64_t repeat_min = TBE_PATTERN_NUM_DEFAULT,82 const int64_t repeat_min = TBE_PATTERN_NUM_DEFAULT,
83 const int64_t repeat_max = TBE_PATTERN_NUM_DEFAULT,83 const int64_t repeat_max = TBE_PATTERN_NUM_DEFAULT,
84 const int64_t group_id = TBE_PATTERN_GROUPID_INVALID,84 const int64_t group_id = TBE_PATTERN_GROUPID_INVALID,
85- const ShapeTypeRule shape_type_rule = ONLY_SUPPORT_STATIC,85+ const ShapeTypeRule shape_type_rule = ShapeTypeRule::ONLY_SUPPORT_STATIC,
86 const bool not_pattern = false, const bool is_allow_series = true);86 const bool not_pattern = false, const bool is_allow_series = true);
87 87 
88 /**88 /**
@@ -22,7 +22,7 @@
22#include "register/graph_optimizer/fusion_common/fusion_turbo_utils.h"22#include "register/graph_optimizer/fusion_common/fusion_turbo_utils.h"
23 23 
24namespace fe {24namespace fe {
25-enum TensorUptType {25+enum class TensorUptType {
26 UPDATE_NONE = 0,26 UPDATE_NONE = 0,
27 UPDATE_THIS = 1,27 UPDATE_THIS = 1,
28 UPDATE_PEER,28 UPDATE_PEER,
@@ -161,10 +161,10 @@ class FusionTurbo {
161 const int32_t &output_index = 0) const;161 const int32_t &output_index = 0) const;
162 162 
163 static Status LinkInput(Relations &input_relations, const ge::NodePtr &dst_node,163 static Status LinkInput(Relations &input_relations, const ge::NodePtr &dst_node,
164- const TensorUptType &update_tensor = UPDATE_THIS);164+ const TensorUptType &update_tensor = TensorUptType::UPDATE_THIS);
165 165 
166 static Status LinkOutput(Relations &output_relations, const ge::NodePtr &src_node,166 static Status LinkOutput(Relations &output_relations, const ge::NodePtr &src_node,
167- const TensorUptType &update_tensor = UPDATE_THIS);167+ const TensorUptType &update_tensor = TensorUptType::UPDATE_THIS);
168 168 
169 static ge::NodePtr GetPeerOutNode(const ge::NodePtr &node, const int32_t &this_node_input_index);169 static ge::NodePtr GetPeerOutNode(const ge::NodePtr &node, const int32_t &this_node_input_index);
170 170 
@@ -23,7 +23,7 @@
23 } while (0)23 } while (0)
24 24 
25namespace fe {25namespace fe {
26-enum Direction {26+enum class Direction {
27 CURRENT = 0, /* 表示NodeIndex指示的是当前节点的对应输入输出。 */27 CURRENT = 0, /* 表示NodeIndex指示的是当前节点的对应输入输出。 */
28 /* 当连接输入的场景,PEER模式下会获取<node, index>的对端输出节点和对端index。 */28 /* 当连接输入的场景,PEER模式下会获取<node, index>的对端输出节点和对端index。 */
29 /* 当连接输出的场景,PEER模式下会获取<node, index>的所有对端输入节点和所有对端index。 */29 /* 当连接输出的场景,PEER模式下会获取<node, index>的所有对端输入节点和所有对端index。 */
@@ -36,7 +36,7 @@ enum Direction {
36struct NodeIndex {36struct NodeIndex {
37 ge::NodePtr node;37 ge::NodePtr node;
38 int32_t index;38 int32_t index;
39- Direction direction = CURRENT;39+ Direction direction = Direction::CURRENT;
40 NodeIndex() {40 NodeIndex() {
41 node = nullptr;41 node = nullptr;
42 index = -1;42 index = -1;
@@ -16,8 +16,8 @@
16#include <memory>16#include <memory>
17 17 
18namespace fe {18namespace fe {
19-enum OpReduceType { REDUCE_MEAN = 0, REDUCE_ADD, REDUCE_MAX, REDUCE_MIN };19+enum class OpReduceType { REDUCE_MEAN = 0, REDUCE_ADD, REDUCE_MAX, REDUCE_MIN };
20-enum OpL1FusionType { L1FUSION_DISABLE = 0, L1FUSION_BASIC, L1FUSION_INPUT_CTR };20+enum class OpL1FusionType { L1FUSION_DISABLE = 0, L1FUSION_BASIC, L1FUSION_INPUT_CTR };
21 21 
22class InputSplitInfoImpl;22class InputSplitInfoImpl;
23using InputSplitInfoImplPtr = std::shared_ptr<InputSplitInfoImpl>;23using InputSplitInfoImplPtr = std::shared_ptr<InputSplitInfoImpl>;