clean code

parser/CMakeLists.txt

@@ -22,18 +22,18 @@ set(SRC_LIST
     "caffe/caffe_custom_parser_adapter.cc"
     "caffe/caffe_op_parser.cc"
     "tensorflow/scope/scope_pass_manager.cc"
-    "tensorflow/graph_functiondef.cc"
-    "tensorflow/graph_optimizer.cc"
+    "tensorflow/graph_to_function_def.cc"
+    "tensorflow/parser_graph_optimizer.cc"
     "tensorflow/iterator_fusion_pass.cc"
     "common/op_def/arg_op_operator.cc"
     "common/op_def/constant_operator.cc"
-    "common/op_def/fill_op.cc"
-    "common/op_def/frameworkop_op.cc"
-    "common/op_def/no_op_op.cc"
-    "common/op_def/ref_switch_op.cc"
-    "common/op_def/shape_n_op.cc"
-    "common/op_def/var_is_initialized_op_op.cc"
-    "common/op_def/variable_op.cc"
+    "common/op_def/fill_operator.cc"
+    "common/op_def/framework_op_operator.cc"
+    "common/op_def/no_op_operator.cc"
+    "common/op_def/ref_switch_operator.cc"
+    "common/op_def/shape_n_operator.cc"
+    "common/op_def/var_is_initialized_op_operator.cc"
+    "common/op_def/variable_operator.cc"
 )
 
 ############ libfmk_parser.so ############

parser/common/op_def/fill_op.cc → parser/common/op_def/fill_operator.cc

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include "common/op_def/fill_op.h"
+#include "common/op_def/fill_operator.h"
 #include "framework/common/fmk_types.h"
 
 namespace ge {

parser/common/op_def/frameworkop_op.cc → parser/common/op_def/framework_op_operator.cc

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include "common/op_def/frameworkop_op.h"
+#include "common/op_def/framework_op_operator.h"
 #include <string>
 #include "framework/common/fmk_types.h"
 

parser/common/op_def/no_op_op.cc → parser/common/op_def/no_op_operator.cc

@@ -15,7 +15,7 @@
  */
 
 // AUTO GEN PLEASE DO NOT MODIFY IT
-#include "common/op_def/no_op_op.h"
+#include "common/op_def/no_op_operator.h"
 #include <string>
 
 namespace ge {

parser/common/op_def/ref_switch_op.cc → parser/common/op_def/ref_switch_operator.cc

@@ -15,7 +15,7 @@
  */
 
 // AUTO GEN PLEASE DO NOT MODIFY IT
-#include "common/op_def/ref_switch_op.h"
+#include "common/op_def/ref_switch_operator.h"
 
 namespace ge {
 FMK_FUNC_HOST_VISIBILITY FMK_FUNC_DEV_VISIBILITY RefSwitchOperator::RefSwitchOperator() : ParserOperator("RefSwitch") {}

parser/common/op_def/shape_n_op.cc → parser/common/op_def/shape_n_operator.cc

@@ -15,7 +15,7 @@
  */
 
 // AUTO GEN PLEASE DO NOT MODIFY IT
-#include "common/op_def/shape_n_op.h"
+#include "common/op_def/shape_n_operator.h"
 #include "graph/debug/ge_attr_define.h"
 #include "framework/omg/parser/parser_types.h"
 

parser/common/op_def/var_is_initialized_op_op.cc → parser/common/op_def/var_is_initialized_op_operator.cc

@@ -15,7 +15,7 @@
  */
 
 // AUTO GEN PLEASE DO NOT MODIFY IT
-#include "common/op_def/var_is_initialized_op_op.h"
+#include "common/op_def/var_is_initialized_op_operator.h"
 #include <string>
 #include <vector>
 

parser/common/op_def/variable_op.cc → parser/common/op_def/variable_operator.cc

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include "parser/common/op_def/variable_op.h"
+#include "parser/common/op_def/variable_operator.h"
 
 #include "graph/debug/ge_attr_define.h"
 

parser/module.mk

@@ -92,18 +92,18 @@ PARSER_SCOPE_SRC_FILES := \
     tensorflow/scope/scope_pass_manager.cc \
 
 FMK_COMMON_SRC_FILES := \
-    tensorflow/graph_functiondef.cc \
-    tensorflow/graph_optimizer.cc \
+    tensorflow/graph_to_function_def.cc \
+    tensorflow/parser_graph_optimizer.cc \
     tensorflow/iterator_fusion_pass.cc \
     common/op_def/arg_op_operator.cc \
     common/op_def/constant_operator.cc \
-    common/op_def/fill_op.cc \
-    common/op_def/frameworkop_op.cc \
-    common/op_def/no_op_op.cc \
-    common/op_def/ref_switch_op.cc \
-    common/op_def/shape_n_op.cc \
-    common/op_def/var_is_initialized_op_op.cc \
-    common/op_def/variable_op.cc \
+    common/op_def/fill_operator.cc \
+    common/op_def/framework_op_operator.cc \
+    common/op_def/no_op_operator.cc \
+    common/op_def/ref_switch_operator.cc \
+    common/op_def/shape_n_operator.cc \
+    common/op_def/var_is_initialized_op_operator.cc \
+    common/op_def/variable_operator.cc \
 
 LOCAL_SRC_FILES := $(PARSER_TENSORFLOW_SRC_FILES)
 LOCAL_SRC_FILES += $(PARSER_SCOPE_SRC_FILES)

parser/tensorflow/graph_functiondef.cc → parser/tensorflow/graph_to_function_def.cc

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include "graph_functiondef.h"
+#include "graph_to_function_def.h"
 #include <iostream>
 #include "common/fmk_error_codes.h"
 #include "graph/debug/ge_attr_define.h"

parser/tensorflow/graph_optimizer.cc → parser/tensorflow/parser_graph_optimizer.cc

@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-#include "graph_optimizer.h"
+#include "parser_graph_optimizer.h"
 #include "graph/op_types.h"
 #include "common/types_map.h"
 #include "common/util.h"
 #include "framework/omg/parser/parser_inner_ctx.h"
 #include "graph/debug/ge_attr_define.h"
 #include "graph/utils/type_utils.h"
-#include "graph_functiondef.h"
+#include "graph_to_function_def.h"
 #include "parser/common/acl_graph_parser_util.h"
 #include "register/op_registry.h"
 

parser/tensorflow/tensorflow_fill_parser.cc

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include "parser/common/op_def/fill_op.h"
+#include "parser/common/op_def/fill_operator.h"
 #include "parser/tensorflow/tensorflow_parser_register.h"
 #include "framework/omg/parser/parser_types.h"
 

parser/tensorflow/tensorflow_frameworkop_parser.cc

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include "parser/common/op_def/frameworkop_op.h"
+#include "parser/common/op_def/framework_op_operator.h"
 #include "framework/common/debug/ge_log.h"
 #include "parser/common/op_parser_factory.h"
 #include "framework/omg/parser/parser_types.h"

parser/tensorflow/tensorflow_no_op_parser.cc

@@ -18,7 +18,7 @@
 #include "common/util.h"
 #include "framework/common/debug/ge_log.h"
 #include "parser/common/op_def/ir_pb_converter.h"
-#include "parser/common/op_def/no_op_op.h"
+#include "parser/common/op_def/no_op_operator.h"
 #include "parser/common/op_parser_factory.h"
 
 using domi::TENSORFLOW;

parser/tensorflow/tensorflow_ref_switch_parser.cc

@@ -17,7 +17,7 @@
 #include "parser/tensorflow/tensorflow_ref_switch_parser.h"
 #include "framework/common/debug/ge_log.h"
 #include "parser/common/op_def/ir_pb_converter.h"
-#include "parser/common/op_def/ref_switch_op.h"
+#include "parser/common/op_def/ref_switch_operator.h"
 #include "parser/common/op_parser_factory.h"
 #include "parser/common/util.h"
 

parser/tensorflow/tensorflow_ref_switch_parser.h

@@ -17,7 +17,7 @@
 #ifndef DOMI_OMG_PARSER_OP_PARSER_TENSORFLOW_REF_SWITCH_H_
 #define DOMI_OMG_PARSER_OP_PARSER_TENSORFLOW_REF_SWITCH_H_
 
-#include "common/op_def/ref_switch_op.h"
+#include "common/op_def/ref_switch_operator.h"
 #include "parser/tensorflow/tensorflow_op_parser.h"
 
 namespace ge {

parser/tensorflow/tensorflow_shape_n_parser.cc

@@ -18,7 +18,7 @@
 #include "parser/common/op_def/ir_pb_converter.h"
 #include "framework/common/debug/ge_log.h"
 #include "parser/common/op_parser_factory.h"
-#include "parser/common/op_def/shape_n_op.h"
+#include "parser/common/op_def/shape_n_operator.h"
 #include "parser/common/util.h"
 
 using domi::TENSORFLOW;

parser/tensorflow/tensorflow_shape_n_parser.h

@@ -17,7 +17,7 @@
 #ifndef DOMI_OMG_PARSER_OP_PARSER_TENSORFLOW_SHAPE_N_H_
 #define DOMI_OMG_PARSER_OP_PARSER_TENSORFLOW_SHAPE_N_H_
 
-#include "common/op_def/shape_n_op.h"
+#include "common/op_def/shape_n_operator.h"
 #include "parser/tensorflow/tensorflow_op_parser.h"
 
 namespace ge {

parser/tensorflow/tensorflow_var_is_initialized_op_parser.cc

@@ -15,7 +15,7 @@
  */
 
 #include "framework/common/debug/ge_log.h"
-#include "parser/common/op_def/var_is_initialized_op_op.h"
+#include "parser/common/op_def/var_is_initialized_op_operator.h"
 #include "parser/common/op_parser_factory.h"
 #include "parser/tensorflow/tensorflow_op_parser.h"
 #include "parser/tensorflow/tensorflow_parser_register.h"

parser/tensorflow/tensorflow_variable_v2_parser.cc

@@ -21,7 +21,7 @@
 #include "graph/op_desc.h"
 #include "graph/utils/attr_utils.h"
 #include "graph/utils/tensor_utils.h"
-#include "parser/common/op_def/variable_op.h"
+#include "parser/common/op_def/variable_operator.h"
 #include "parser/common/op_parser_factory.h"
 #include "parser/tensorflow/tensorflow_op_parser.h"
 #include "parser/tensorflow/tensorflow_parser_register.h"

tests/st/CMakeLists.txt

@@ -251,15 +251,15 @@ set(PARSER_SRC_FILES
     "${PARSER_DIR}/parser/common/model_saver.cc"
     "${PARSER_DIR}/parser/common/op_def/arg_op_operator.cc"
     "${PARSER_DIR}/parser/common/op_def/constant_operator.cc"
-    "${PARSER_DIR}/parser/common/op_def/fill_op.cc"
-    "${PARSER_DIR}/parser/common/op_def/frameworkop_op.cc"
+    "${PARSER_DIR}/parser/common/op_def/fill_operator.cc"
+    "${PARSER_DIR}/parser/common/op_def/framework_op_operator.cc"
     "${PARSER_DIR}/parser/common/op_def/ir_pb_converter.cc"
-    "${PARSER_DIR}/parser/common/op_def/no_op_op.cc"
+    "${PARSER_DIR}/parser/common/op_def/no_op_operator.cc"
     "${PARSER_DIR}/parser/common/op_def/operator.cc"
-    "${PARSER_DIR}/parser/common/op_def/ref_switch_op.cc"
-    "${PARSER_DIR}/parser/common/op_def/shape_n_op.cc"
-    "${PARSER_DIR}/parser/common/op_def/variable_op.cc"
-    "${PARSER_DIR}/parser/common/op_def/var_is_initialized_op_op.cc"
+    "${PARSER_DIR}/parser/common/op_def/ref_switch_operator.cc"
+    "${PARSER_DIR}/parser/common/op_def/shape_n_operator.cc"
+    "${PARSER_DIR}/parser/common/op_def/variable_operator.cc"
+    "${PARSER_DIR}/parser/common/op_def/var_is_initialized_op_operator.cc"
     "${PARSER_DIR}/parser/common/op_map.cc"
     "${PARSER_DIR}/parser/common/op_parser_factory.cc"
     "${PARSER_DIR}/parser/common/parser_api.cc"
@@ -284,8 +284,8 @@ set(PARSER_SRC_FILES
     "${PARSER_DIR}/parser/onnx/onnx_util.cc"
     "${PARSER_DIR}/parser/onnx/subgraph_adapter/if_subgraph_adapter.cc"
     "${PARSER_DIR}/parser/onnx/subgraph_adapter/subgraph_adapter_factory.cc"
-    "${PARSER_DIR}/parser/tensorflow/graph_functiondef.cc"
-    "${PARSER_DIR}/parser/tensorflow/graph_optimizer.cc"
+    "${PARSER_DIR}/parser/tensorflow/graph_to_function_def.cc"
+    "${PARSER_DIR}/parser/tensorflow/parser_graph_optimizer.cc"
     "${PARSER_DIR}/parser/tensorflow/iterator_fusion_pass.cc"
     "${PARSER_DIR}/parser/tensorflow/scope/scope_pass_manager.cc"
     "${PARSER_DIR}/parser/tensorflow/tensorflow_arg_parser.cc"

tests/st/testcase/test_tensorflow_parser.cc

@@ -34,7 +34,7 @@
 #include "external/parser/tensorflow_parser.h"
 #include "parser/tensorflow/tensorflow_constant_parser.h"
 #include "common/types.h"
-#include "parser/common/op_def/variable_op.h"
+#include "parser/common/op_def/variable_operator.h"
 #include "parser/tensorflow/tensorflow_ref_switch_parser.h"
 #include "parser/tensorflow/tensorflow_fusion_op_parser.h"
 #include "parser/tensorflow/tensorflow_auto_mapping_parser_adapter.h"
@@ -43,8 +43,8 @@
 #include "parser/tensorflow/tensorflow_reshape_parser.h"
 #include "parser/tensorflow/tensorflow_custom_parser_adapter.h"
 #include "parser/tensorflow/tensorflow_squeeze_parser.h"
-#include "parser/tensorflow/graph_functiondef.h"
-#include "parser/tensorflow/graph_optimizer.h"
+#include "parser/tensorflow/graph_to_function_def.h"
+#include "parser/tensorflow/parser_graph_optimizer.h"
 #include "cce/dnn_base_def.hpp"
 #include "parser/tensorflow/scope/scope_pass_manager.h"
 #include "parser/tensorflow/tensorflow_util.h"
@@ -52,10 +52,10 @@
 #include "parser/tensorflow/tensorflow_enter_parser.h"
 #include "parser/common/op_def/ir_pb_converter.h"
 #include "parser/common/tuple.h"
-#include "common/op_def/frameworkop_op.h"
-#include "common/op_def/shape_n_op.h"
-#include "common/op_def/var_is_initialized_op_op.h"
-#include "common/op_def/fill_op.h"
+#include "common/op_def/framework_op_operator.h"
+#include "common/op_def/shape_n_operator.h"
+#include "common/op_def/var_is_initialized_op_operator.h"
+#include "common/op_def/fill_operator.h"
 #include "common/convert/pb2json.h"
 #include "common/convert/message2operator.h"
 #include "parser/common/proto_file_parser.h"
@@ -70,7 +70,7 @@
 #include "parser/common/prototype_pass_manager.h"
 #include "parser/common/register_tbe.h"
 #include "parser/common/pass_manager.h"
-#include "parser/tensorflow/graph_optimizer.h"
+#include "parser/tensorflow/parser_graph_optimizer.h"
 #include "metadef/inc/register/scope/scope_pass_registry_impl.h"
 #include "register/scope/scope_fusion_pass_register.h"
 #undef protected

tests/ut/parser/CMakeLists.txt

@@ -252,15 +252,15 @@ set(PARSER_SRC_FILES
     "${PARSER_DIR}/parser/common/model_saver.cc"
     "${PARSER_DIR}/parser/common/op_def/arg_op_operator.cc"
     "${PARSER_DIR}/parser/common/op_def/constant_operator.cc"
-    "${PARSER_DIR}/parser/common/op_def/fill_op.cc"
-    "${PARSER_DIR}/parser/common/op_def/frameworkop_op.cc"
+    "${PARSER_DIR}/parser/common/op_def/fill_operator.cc"
+    "${PARSER_DIR}/parser/common/op_def/framework_op_operator.cc"
     "${PARSER_DIR}/parser/common/op_def/ir_pb_converter.cc"
-    "${PARSER_DIR}/parser/common/op_def/no_op_op.cc"
+    "${PARSER_DIR}/parser/common/op_def/no_op_operator.cc"
     "${PARSER_DIR}/parser/common/op_def/operator.cc"
-    "${PARSER_DIR}/parser/common/op_def/ref_switch_op.cc"
-    "${PARSER_DIR}/parser/common/op_def/shape_n_op.cc"
-    "${PARSER_DIR}/parser/common/op_def/variable_op.cc"
-    "${PARSER_DIR}/parser/common/op_def/var_is_initialized_op_op.cc"
+    "${PARSER_DIR}/parser/common/op_def/ref_switch_operator.cc"
+    "${PARSER_DIR}/parser/common/op_def/shape_n_operator.cc"
+    "${PARSER_DIR}/parser/common/op_def/variable_operator.cc"
+    "${PARSER_DIR}/parser/common/op_def/var_is_initialized_op_operator.cc"
     "${PARSER_DIR}/parser/common/op_map.cc"
     "${PARSER_DIR}/parser/common/op_parser_factory.cc"
     "${PARSER_DIR}/parser/common/parser_api.cc"
@@ -285,8 +285,8 @@ set(PARSER_SRC_FILES
     "${PARSER_DIR}/parser/onnx/onnx_util.cc"
     "${PARSER_DIR}/parser/onnx/subgraph_adapter/if_subgraph_adapter.cc"
     "${PARSER_DIR}/parser/onnx/subgraph_adapter/subgraph_adapter_factory.cc"
-    "${PARSER_DIR}/parser/tensorflow/graph_functiondef.cc"
-    "${PARSER_DIR}/parser/tensorflow/graph_optimizer.cc"
+    "${PARSER_DIR}/parser/tensorflow/graph_to_function_def.cc"
+    "${PARSER_DIR}/parser/tensorflow/parser_graph_optimizer.cc"
     "${PARSER_DIR}/parser/tensorflow/iterator_fusion_pass.cc"
     "${PARSER_DIR}/parser/tensorflow/scope/scope_pass_manager.cc"
     "${PARSER_DIR}/parser/tensorflow/tensorflow_arg_parser.cc"

tests/ut/parser/testcase/graph_optimizer_testcase/graph_optimizer_unittest.cc

@@ -7,7 +7,7 @@
 #include "tensorflow/iterator_fusion_pass.h"
 #include "parser/common/acl_graph_parser_util.h"
 #define private public
-#include "tensorflow/graph_optimizer.h"
+#include "tensorflow/parser_graph_optimizer.h"
 #undef private
 namespace ge {
   class UtestGraphOptimizer : public testing::Test {

tests/ut/parser/testcase/tensorflow_parser_testcase/tensorflow_parser_unittest.cc

@@ -38,7 +38,7 @@
 #include "tests/depends/ops_stub/ops_stub.h"
 #include "parser/tensorflow/tensorflow_constant_parser.h"
 #include "common/types.h"
-#include "parser/common/op_def/variable_op.h"
+#include "parser/common/op_def/variable_operator.h"
 #include "parser/tensorflow/tensorflow_ref_switch_parser.h"
 #include "parser/tensorflow/tensorflow_fusion_op_parser.h"
 #include "parser/tensorflow/tensorflow_auto_mapping_parser_adapter.h"
@@ -47,8 +47,8 @@
 #include "parser/tensorflow/tensorflow_reshape_parser.h"
 #include "parser/tensorflow/tensorflow_custom_parser_adapter.h"
 #include "parser/tensorflow/tensorflow_squeeze_parser.h"
-#include "parser/tensorflow/graph_functiondef.h"
-#include "parser/tensorflow/graph_optimizer.h"
+#include "parser/tensorflow/graph_to_function_def.h"
+#include "parser/tensorflow/parser_graph_optimizer.h"
 #include "cce/dnn_base_def.hpp"
 #include "parser/tensorflow/scope/scope_pass_manager.h"
 #include "parser/tensorflow/tensorflow_util.h"
@@ -56,10 +56,10 @@
 #include "parser/tensorflow/tensorflow_enter_parser.h"
 #include "parser/common/op_def/ir_pb_converter.h"
 #include "parser/common/tuple.h"
-#include "common/op_def/frameworkop_op.h"
-#include "common/op_def/shape_n_op.h"
-#include "common/op_def/var_is_initialized_op_op.h"
-#include "common/op_def/fill_op.h"
+#include "common/op_def/framework_op_operator.h"
+#include "common/op_def/shape_n_operator.h"
+#include "common/op_def/var_is_initialized_op_operator.h"
+#include "common/op_def/fill_operator.h"
 #include "common/convert/pb2json.h"
 #include "common/convert/message2operator.h"
 #include "parser/common/proto_file_parser.h"
@@ -73,7 +73,7 @@
 #include "parser/common/prototype_pass_manager.h"
 #include "parser/common/register_tbe.h"
 #include "parser/common/pass_manager.h"
-#include "parser/tensorflow/graph_optimizer.h"
+#include "parser/tensorflow/parser_graph_optimizer.h"
 #include "metadef/inc/register/scope/scope_pass_registry_impl.h"
 #include "register/scope/scope_fusion_pass_register.h"
 #include "common/op_map.h"