From e8c5aaa69d8877630dc09afb9266ccb9c443f497 Mon Sep 17 00:00:00 2001 From: TangQunzhang Date: Fri, 19 Aug 2022 13:57:46 +0800 Subject: [PATCH] Fix codecheck --- parser/tensorflow/tensorflow_arg_parser.cc | 2 +- parser/tensorflow/tensorflow_fill_parser.cc | 2 +- parser/tensorflow/tensorflow_frameworkop_parser.cc | 2 +- parser/tensorflow/tensorflow_parser_register.h | 20 ++++++++++---------- .../tensorflow_var_is_initialized_op_parser.cc | 4 ++-- parser/tensorflow/tensorflow_variable_v2_parser.cc | 6 +++--- 6 files changed, 18 insertions(+), 18 deletions(-) diff --git a/parser/tensorflow/tensorflow_arg_parser.cc b/parser/tensorflow/tensorflow_arg_parser.cc index 4f9996c..afa6097 100644 --- a/parser/tensorflow/tensorflow_arg_parser.cc +++ b/parser/tensorflow/tensorflow_arg_parser.cc @@ -64,5 +64,5 @@ Status ParseParams(const Message *op_src, ArgOpOperator *const op) { return SUCCESS; } -DOMI_REGISTER_TENSORFLOW_PARSER(ge::parser::ARG, ArgOpOperator).SetParseParamsFn(ParseParams); +DOMI_REGISTER_TENSORFLOW_PARSER(ge::parser::ARG, ArgOpOperator, ParseParams); } // namespace ge diff --git a/parser/tensorflow/tensorflow_fill_parser.cc b/parser/tensorflow/tensorflow_fill_parser.cc index d8ea4ce..886dcdb 100644 --- a/parser/tensorflow/tensorflow_fill_parser.cc +++ b/parser/tensorflow/tensorflow_fill_parser.cc @@ -63,5 +63,5 @@ domi::Status ParseParams(const domi::tensorflow::NodeDef *node, FillOperator *op return domi::SUCCESS; } -DOMI_REGISTER_TENSORFLOW_PARSER(FILL, FillOperator).SetParseParamsFn(ParseParams); +DOMI_REGISTER_TENSORFLOW_PARSER(FILL, FillOperator, ParseParams); } // namespace ge diff --git a/parser/tensorflow/tensorflow_frameworkop_parser.cc b/parser/tensorflow/tensorflow_frameworkop_parser.cc index 5ad5c75..36883c7 100644 --- a/parser/tensorflow/tensorflow_frameworkop_parser.cc +++ b/parser/tensorflow/tensorflow_frameworkop_parser.cc @@ -132,5 +132,5 @@ Status ParseParams(const Message *op_src, FrameworkOpOperator *op) { return SUCCESS; } -DOMI_REGISTER_TENSORFLOW_PARSER(FRAMEWORKOP, FrameworkOpOperator).SetParseParamsFn(ParseParams); +DOMI_REGISTER_TENSORFLOW_PARSER(FRAMEWORKOP, FrameworkOpOperator, ParseParams); } // namespace ge diff --git a/parser/tensorflow/tensorflow_parser_register.h b/parser/tensorflow/tensorflow_parser_register.h index 100d21a..cf2abd1 100644 --- a/parser/tensorflow/tensorflow_parser_register.h +++ b/parser/tensorflow/tensorflow_parser_register.h @@ -34,13 +34,13 @@ namespace ge { class PARSER_FUNC_VISIBILITY TensorflowFinalizeable { public: - virtual bool Finalize() = 0; + virtual bool Finalize() const = 0; virtual ~TensorflowFinalizeable() {} }; class PARSER_FUNC_VISIBILITY TensorflowReceiver { public: - TensorflowReceiver(TensorflowFinalizeable &f) noexcept { f.Finalize(); } + explicit TensorflowReceiver(const TensorflowFinalizeable &f) noexcept { f.Finalize(); } ~TensorflowReceiver() {} }; @@ -70,7 +70,7 @@ class PARSER_FUNC_VISIBILITY TensorflowParserBuilder : public TensorflowWeightPa return *this; } - bool Finalize() override { + bool Finalize() const override { auto op_parser_adapter = ge::parser::MakeShared>(*this); if (op_parser_adapter == nullptr) { GELOGE(FAILED, "Op parser adapter is null."); @@ -124,13 +124,13 @@ class PARSER_FUNC_VISIBILITY TensorflowOpParserAdapter : public TensorFlowOpPars }; } // namespace tensorflow_parser -#define DOMI_REGISTER_TENSORFLOW_PARSER(name, param_clazz) \ - DOMI_REGISTER_TENSORFLOW_PARSER_UNIQ_HELPER(__COUNTER__, name, param_clazz) -#define DOMI_REGISTER_TENSORFLOW_PARSER_UNIQ_HELPER(ctr, name, param_clazz) \ - DOMI_REGISTER_TENSORFLOW_PARSER_UNIQ(ctr, name, param_clazz) -#define DOMI_REGISTER_TENSORFLOW_PARSER_UNIQ(ctr, name, param_clazz) \ - static TensorflowReceiver register_tensorflow_parser##ctr __attribute__((unused)) = \ - tensorflow_parser::TensorflowParserBuilder(name) +#define DOMI_REGISTER_TENSORFLOW_PARSER(name, param_clazz, func) \ + DOMI_REGISTER_TENSORFLOW_PARSER_UNIQ_HELPER(__COUNTER__, name, param_clazz, func) +#define DOMI_REGISTER_TENSORFLOW_PARSER_UNIQ_HELPER(ctr, name, param_clazz, func) \ + DOMI_REGISTER_TENSORFLOW_PARSER_UNIQ(ctr, name, param_clazz, func) +#define DOMI_REGISTER_TENSORFLOW_PARSER_UNIQ(ctr, name, param_clazz, func) \ + const TensorflowReceiver register_tensorflow_parser##ctr( \ + tensorflow_parser::TensorflowParserBuilder(name).SetParseParamsFn(func)) } // namespace ge #endif // PARSER_TENSORFLOW_TENSORFLOW_PARSER_REGISTER_H_ diff --git a/parser/tensorflow/tensorflow_var_is_initialized_op_parser.cc b/parser/tensorflow/tensorflow_var_is_initialized_op_parser.cc index 937c6ac..577bbca 100644 --- a/parser/tensorflow/tensorflow_var_is_initialized_op_parser.cc +++ b/parser/tensorflow/tensorflow_var_is_initialized_op_parser.cc @@ -33,7 +33,7 @@ Status ParseParams(const Message *op_src, VarIsInitializedOpOperator *const op) return SUCCESS; } -DOMI_REGISTER_TENSORFLOW_PARSER(VARISINITIALIZEDOP, VarIsInitializedOpOperator).SetParseParamsFn(ParseParams); +DOMI_REGISTER_TENSORFLOW_PARSER(VARISINITIALIZEDOP, VarIsInitializedOpOperator, ParseParams); -DOMI_REGISTER_TENSORFLOW_PARSER(ISVARIABLEINITIALIZED, VarIsInitializedOpOperator).SetParseParamsFn(ParseParams); +DOMI_REGISTER_TENSORFLOW_PARSER(ISVARIABLEINITIALIZED, VarIsInitializedOpOperator, ParseParams); } // namespace ge diff --git a/parser/tensorflow/tensorflow_variable_v2_parser.cc b/parser/tensorflow/tensorflow_variable_v2_parser.cc index d265547..2b14280 100644 --- a/parser/tensorflow/tensorflow_variable_v2_parser.cc +++ b/parser/tensorflow/tensorflow_variable_v2_parser.cc @@ -273,9 +273,9 @@ Status ParseParams(const Message *op_src, VariableOperator *op) { return SUCCESS; } -DOMI_REGISTER_TENSORFLOW_PARSER(VARIABLE, VariableOperator).SetParseParamsFn(ParseParams); +DOMI_REGISTER_TENSORFLOW_PARSER(VARIABLE, VariableOperator, ParseParams); -DOMI_REGISTER_TENSORFLOW_PARSER(VARHANDLEOP, VariableOperator).SetParseParamsFn(ParseParams); +DOMI_REGISTER_TENSORFLOW_PARSER(VARHANDLEOP, VariableOperator, ParseParams); -DOMI_REGISTER_TENSORFLOW_PARSER(TEMPORARYVARIABLE, VariableOperator).SetParseParamsFn(ParseParams); +DOMI_REGISTER_TENSORFLOW_PARSER(TEMPORARYVARIABLE, VariableOperator, ParseParams); } // namespace ge