Pre Merge pull request !624 from TangQunzhang/ge_dev

parser/common/op_parser_factory.h

@@ -159,39 +159,40 @@ class CustomParserAdapterRegistrar {
  * @param [in] op_type      Op type
  * @param [in] clazz        OpParser implementation class
  */
-#define REGISTER_OP_PARSER_CREATOR(framework, op_type, clazz)                              \
-  std::shared_ptr<OpParser> Creator_##framework##_##op_type##_Op_Parser() {                \
-    std::shared_ptr<clazz> ptr = ge::parser::MakeShared<clazz>();                                  \
-    if (ptr == nullptr) {                                                                  \
-      GELOGW("MakeShared failed, result is nullptr.");                                     \
-    }                                                                                      \
-    return std::shared_ptr<OpParser>(ptr);                                                 \
-  }                                                                                        \
-  ge::OpParserRegisterar g_##framework##_##op_type##_Op_Parser_Creator(framework, op_type, \
-                                                                       Creator_##framework##_##op_type##_Op_Parser)
+#define REGISTER_OP_PARSER_CREATOR(framework, op_type, clazz)                                    \
+  std::shared_ptr<OpParser> Creator_##framework##_##op_type##_Op_Parser() {                      \
+    std::shared_ptr<clazz> ptr = ge::parser::MakeShared<clazz>();                                \
+    if (ptr == nullptr) {                                                                        \
+      GELOGW("MakeShared failed, result is nullptr.");                                           \
+    }                                                                                            \
+    return std::shared_ptr<OpParser>(ptr);                                                       \
+  }                                                                                              \
+  const ge::OpParserRegisterar g_##framework##_##op_type##_Op_Parser_Creator(framework, op_type, \
+      Creator_##framework##_##op_type##_Op_Parser)
 
 #define REGISTER_FUSION_OP_PARSER_CREATOR(framework, op_type, clazz)               \
   std::shared_ptr<OpParser> Creator_##framework##_##op_type##_Fusion_Op_Parser() { \
-    std::shared_ptr<clazz> ptr = ge::parser::MakeShared<clazz>();                          \
+    std::shared_ptr<clazz> ptr = ge::parser::MakeShared<clazz>();                  \
     if (ptr == nullptr) {                                                          \
       GELOGW("MakeShared failed, result is nullptr.");                             \
     }                                                                              \
     return std::shared_ptr<OpParser>(ptr);                                         \
   }                                                                                \
-  OpParserRegisterar g_##framework##_##op_type##_Fusion_Op_Parser_Creator(         \
-    framework, op_type, Creator_##framework##_##op_type##_Fusion_Op_Parser, true)
+  const OpParserRegisterar g_##framework##_##op_type##_Fusion_Op_Parser_Creator(   \
+      framework, op_type, Creator_##framework##_##op_type##_Fusion_Op_Parser, true)
 
 /// @brief xxxCustomParserAdapter Registration Macro
 /// @param [in] framework    Framework type
 /// @param [in] clazz        CaffeCustomParserAdapter adaptation class
-#define REGISTER_CUSTOM_PARSER_ADAPTER_CREATOR(framework, clazz)         \
+#define REGISTER_CUSTOM_PARSER_ADAPTER_CREATOR(framework, clazz)        \
   std::shared_ptr<OpParser> Creator_##framework##_Op_Parser_Adapter() { \
-    std::shared_ptr<clazz> ptr = ge::parser::MakeShared<clazz>();               \
+    std::shared_ptr<clazz> ptr = ge::parser::MakeShared<clazz>();       \
     if (ptr == nullptr) {                                               \
       GELOGW("MakeShared failed, result is nullptr.");                  \
     }                                                                   \
     return std::shared_ptr<OpParser>(ptr);                              \
   }                                                                     \
-  CustomParserAdapterRegistrar g_##framework##_Op_Parser_Creator(framework, Creator_##framework##_Op_Parser_Adapter)
+  const CustomParserAdapterRegistrar g_##framework##_Op_Parser_Creator( \
+      framework, Creator_##framework##_Op_Parser_Adapter)
 }  // namespace ge
 #endif  // PARSER_COMMON_OP_PARSER_FACTORY_H_

parser/tensorflow/tensorflow_constant_parser.cc

@@ -1,5 +1,5 @@
 /**
- * Copyright 2020 Huawei Technologies Co., Ltd
+ * Copyright (c) Huawei Technologies Co., Ltd. 2022. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

parser/tensorflow/tensorflow_constant_parser.h

@@ -1,5 +1,5 @@
 /**
- * Copyright 2020 Huawei Technologies Co., Ltd
+ * Copyright (c) Huawei Technologies Co., Ltd. 2022. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,7 +17,6 @@
 #ifndef GE_PARSER_TENSORFLOW_TENSORFLOW_CONSTANT_PARSER_H_
 #define GE_PARSER_TENSORFLOW_TENSORFLOW_CONSTANT_PARSER_H_
 
-#include <string>
 #include "common/op_def/constant_op.h"
 #include "parser/common/data_op_parser.h"
 #include "parser/tensorflow/tensorflow_op_parser.h"

parser/tensorflow/tensorflow_custom_parser_adapter.cc

@@ -1,5 +1,5 @@
 /**
- * Copyright 2020 Huawei Technologies Co., Ltd
+ * Copyright (c) Huawei Technologies Co., Ltd. 2022. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -48,7 +48,7 @@ Status TensorFlowCustomParserAdapter::ParseParams(const Message *op_src, ge::OpD
   return SUCCESS;
 }
 
-Status TensorFlowCustomParserAdapter::ParseParams(const Operator &op_src, ge::OpDescPtr &op_dest) {
+Status TensorFlowCustomParserAdapter::ParseParams(const Operator &op_src, ge::OpDescPtr &op_dest) const {
   GELOGI("Tensorflow custom op begin to parse params: op node name = %s, op type = %s.",
          ParserUtils::GetOperatorName(op_src).c_str(), ParserUtils::GetOperatorType(op_src).c_str());
   GE_CHECK_NOTNULL(op_dest);

parser/tensorflow/tensorflow_custom_parser_adapter.h

@@ -1,5 +1,5 @@
 /**
- * Copyright 2020 Huawei Technologies Co., Ltd
+ * Copyright (c) Huawei Technologies Co., Ltd. 2022. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -42,7 +42,7 @@ class PARSER_FUNC_VISIBILITY TensorFlowCustomParserAdapter : public TensorFlowOp
    * @return FAILED parse failed
    * @author
    */
-   Status ParseParams(const Operator &op_src, ge::OpDescPtr &op_dest);
+   Status ParseParams(const Operator &op_src, ge::OpDescPtr &op_dest) const;
 };
 }  // namespace ge
 

parser/tensorflow/tensorflow_data_parser.cc

@@ -1,5 +1,5 @@
 /**
- * Copyright 2020 Huawei Technologies Co., Ltd
+ * Copyright (c) Huawei Technologies Co., Ltd. 2022. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

parser/tensorflow/tensorflow_data_parser.h

@@ -1,5 +1,5 @@
 /**
- * Copyright 2020 Huawei Technologies Co., Ltd
+ * Copyright (c) Huawei Technologies Co., Ltd. 2022. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

parser/tensorflow/tensorflow_enter_parser.cc

@@ -1,5 +1,5 @@
 /**
- * Copyright 2020 Huawei Technologies Co., Ltd
+ * Copyright (c) Huawei Technologies Co., Ltd. 2022. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

parser/tensorflow/tensorflow_enter_parser.h

@@ -1,5 +1,5 @@
 /**
- * Copyright 2020 Huawei Technologies Co., Ltd
+ * Copyright (c) Huawei Technologies Co., Ltd. 2022. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

parser/tensorflow/tensorflow_fill_parser.cc

@@ -1,5 +1,5 @@
 /**
- * Copyright 2020 Huawei Technologies Co., Ltd
+ * Copyright (c) Huawei Technologies Co., Ltd. 2022. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

parser/tensorflow/tensorflow_frameworkop_parser.cc

@@ -1,5 +1,5 @@
 /**
- * Copyright 2020 Huawei Technologies Co., Ltd
+ * Copyright (c) Huawei Technologies Co., Ltd. 2022. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -102,7 +102,8 @@ Status ParseParams(const Message *op_src, FrameworkOpOperator *op) {
                   REPORT_CALL_ERROR("E19999", "Trans NodeDef:%s(%s) to string failed",
                                     pkg_node->name().c_str(), pkg_node->op().c_str());
                   GELOGE(PARAM_INVALID, "In FrameworkOp trans NodeDef to string failed.");
-                  GE_DELETE_NEW_SINGLE(pkg_node); return PARAM_INVALID);
+                  GE_DELETE_NEW_SINGLE(pkg_node);
+                  return PARAM_INVALID);
 
   op->NodeDefPkg(serialized_node);
 

parser/tensorflow/tensorflow_fusion_custom_parser_adapter.cc

@@ -1,5 +1,5 @@
 /**
- * Copyright 2020 Huawei Technologies Co., Ltd
+ * Copyright (c) Huawei Technologies Co., Ltd. 2022. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

parser/tensorflow/tensorflow_fusion_custom_parser_adapter.h

@@ -1,5 +1,5 @@
 /**
- * Copyright 2020 Huawei Technologies Co., Ltd
+ * Copyright (c) Huawei Technologies Co., Ltd. 2022. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

parser/tensorflow/tensorflow_fusion_op_parser.cc

@@ -1,5 +1,5 @@
 /**
- * Copyright 2020 Huawei Technologies Co., Ltd
+ * Copyright (c) Huawei Technologies Co., Ltd. 2022. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

parser/tensorflow/tensorflow_fusion_op_parser.h

@@ -1,5 +1,5 @@
 /**
- * Copyright 2020 Huawei Technologies Co., Ltd
+ * Copyright (c) Huawei Technologies Co., Ltd. 2022. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

parser/tensorflow/tensorflow_identity_parser.cc

@@ -1,5 +1,5 @@
 /**
- * Copyright 2020 Huawei Technologies Co., Ltd
+ * Copyright (c) Huawei Technologies Co., Ltd. 2022. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

parser/tensorflow/tensorflow_identity_parser.h

@@ -1,5 +1,5 @@
 /**
- * Copyright 2020 Huawei Technologies Co., Ltd
+ * Copyright (c) Huawei Technologies Co., Ltd. 2022. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

parser/tensorflow/tensorflow_merge_parser.cc

@@ -1,5 +1,5 @@
 /**
- * Copyright 2020 Huawei Technologies Co., Ltd
+ * Copyright (c) Huawei Technologies Co., Ltd. 2022. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

parser/tensorflow/tensorflow_merge_parser.h

@@ -1,5 +1,5 @@
 /**
- * Copyright 2020 Huawei Technologies Co., Ltd
+ * Copyright (c) Huawei Technologies Co., Ltd. 2022. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

parser/tensorflow/tensorflow_no_op_parser.cc

@@ -1,5 +1,5 @@
 /**
- * Copyright 2020 Huawei Technologies Co., Ltd
+ * Copyright (c) Huawei Technologies Co., Ltd. 2022. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

parser/tensorflow/tensorflow_no_op_parser.h

@@ -1,5 +1,5 @@
 /**
- * Copyright 2020 Huawei Technologies Co., Ltd
+ * Copyright (c) Huawei Technologies Co., Ltd. 2022. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

parser/tensorflow/tensorflow_op_parser.h

@@ -1,5 +1,5 @@
 /**
- * Copyright 2020 Huawei Technologies Co., Ltd
+ * Copyright (c) Huawei Technologies Co., Ltd. 2022. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

parser/tensorflow/tensorflow_parser.cc

@@ -1,5 +1,5 @@
 /**
- * Copyright 2020 Huawei Technologies Co., Ltd
+ * Copyright (c) Huawei Technologies Co., Ltd. 2022. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -430,7 +430,7 @@ Status TensorFlowModelParser::DefunToPartitionedCall(const domi::tensorflow::Nod
 }
 
 Status TensorFlowModelParser::TransNodeToOpDesc(const domi::tensorflow::NodeDef *node_def, ge::OpDescPtr &op,
-                                                const string &op_type) {
+                                                const string &op_type) const {
   GE_CHECK_NOTNULL(node_def);
   string node_name = node_def->name();
   ge::Operator op_factory = ge::OperatorFactory::CreateOperator(node_name.c_str(), op_type.c_str());

parser/tensorflow/tensorflow_parser.h

@@ -1,5 +1,5 @@
 /**
- * Copyright 2020 Huawei Technologies Co., Ltd
+ * Copyright (c) Huawei Technologies Co., Ltd. 2022. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -486,7 +486,7 @@ class PARSER_FUNC_VISIBILITY TensorFlowModelParser : public domi::ModelParser {
                          const size_t input_tensor_num);
   static void UpdateOutputTensor(ge::OpDescPtr &op_desc, const std::vector<ge::GeTensorDesc> &output_desc,
                           size_t output_tensor_num);
-  Status TransNodeToOpDesc(const domi::tensorflow::NodeDef *node_def, ge::OpDescPtr &op, const string &op_type);
+  Status TransNodeToOpDesc(const domi::tensorflow::NodeDef *node_def, ge::OpDescPtr &op, const string &op_type) const;
 
   Status UppdateInputMap(shared_ptr<ge::ScopeGraph> &scope_graph, const ge::ScopeFusionOpInfo &info,
                          OpNodeContext &fusion_op_node_context, OpNodeContext &normal_op_node_context);

parser/tensorflow/tensorflow_parser_register.h

@@ -1,5 +1,5 @@
 /**
- * Copyright 2020 Huawei Technologies Co., Ltd
+ * Copyright (c) Huawei Technologies Co., Ltd. 2022. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -40,7 +40,7 @@ class PARSER_FUNC_VISIBILITY TensorflowFinalizeable {
 
 class PARSER_FUNC_VISIBILITY TensorflowReceiver {
  public:
-  TensorflowReceiver(TensorflowFinalizeable &f) { f.Finalize(); }
+ TensorflowReceiver(TensorflowFinalizeable &f) noexcept { f.Finalize(); }
   ~TensorflowReceiver() {}
 };
 

parser/tensorflow/tensorflow_ref_switch_parser.cc

@@ -1,5 +1,5 @@
 /**
- * Copyright 2020 Huawei Technologies Co., Ltd
+ * Copyright (c) Huawei Technologies Co., Ltd. 2022. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

parser/tensorflow/tensorflow_ref_switch_parser.h

@@ -1,5 +1,5 @@
 /**
- * Copyright 2020 Huawei Technologies Co., Ltd
+ * Copyright (c) Huawei Technologies Co., Ltd. 2022. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

parser/tensorflow/tensorflow_reshape_parser.cc

@@ -1,5 +1,5 @@
 /**
- * Copyright 2020 Huawei Technologies Co., Ltd
+ * Copyright (c) Huawei Technologies Co., Ltd. 2022. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

parser/tensorflow/tensorflow_reshape_parser.h

@@ -1,5 +1,5 @@
 /**
- * Copyright 2020 Huawei Technologies Co., Ltd
+ * Copyright (c) Huawei Technologies Co., Ltd. 2022. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

parser/tensorflow/tensorflow_shape_n_parser.cc

@@ -1,5 +1,5 @@
 /**
- * Copyright 2020 Huawei Technologies Co., Ltd
+ * Copyright (c) Huawei Technologies Co., Ltd. 2022. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

parser/tensorflow/tensorflow_shape_n_parser.h

@@ -1,5 +1,5 @@
 /**
- * Copyright 2020 Huawei Technologies Co., Ltd
+ * Copyright (c) Huawei Technologies Co., Ltd. 2022. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

parser/tensorflow/tensorflow_squeeze_parser.cc

@@ -1,5 +1,5 @@
 /**
- * Copyright 2020 Huawei Technologies Co., Ltd
+ * Copyright (c) Huawei Technologies Co., Ltd. 2022. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

parser/tensorflow/tensorflow_squeeze_parser.h

@@ -1,5 +1,5 @@
 /**
- * Copyright 2020 Huawei Technologies Co., Ltd
+ * Copyright (c) Huawei Technologies Co., Ltd. 2022. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

parser/tensorflow/tensorflow_util.cc

@@ -1,5 +1,5 @@
 /**
- * Copyright 2020 Huawei Technologies Co., Ltd
+ * Copyright (c) Huawei Technologies Co., Ltd. 2022. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

parser/tensorflow/tensorflow_util.h

@@ -1,5 +1,5 @@
 /**
- * Copyright 2020 Huawei Technologies Co., Ltd
+ * Copyright (c) Huawei Technologies Co., Ltd. 2022. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

parser/tensorflow/tensorflow_var_is_initialized_op_parser.cc

@@ -1,5 +1,5 @@
 /**
- * Copyright 2020 Huawei Technologies Co., Ltd
+ * Copyright (c) Huawei Technologies Co., Ltd. 2022. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

parser/tensorflow/tensorflow_variable_v2_parser.cc

@@ -1,5 +1,5 @@
 /**
- * Copyright 2020 Huawei Technologies Co., Ltd
+ * Copyright (c) Huawei Technologies Co., Ltd. 2022. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.