Pre Merge pull request !628 from TangQunzhang/ge_dev

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

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

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

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<TensorflowOpParserAdapter<Param>>(*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<param_clazz>(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<param_clazz>(name).SetParseParamsFn(func))
 }  // namespace ge
 
 #endif  // PARSER_TENSORFLOW_TENSORFLOW_PARSER_REGISTER_H_

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

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