From e4d486a07731736ab9e5fd5103269420256c8b3e Mon Sep 17 00:00:00 2001 From: 13291271729 Date: Thu, 1 Sep 2022 11:47:43 +0800 Subject: [PATCH] clean code --- parser/CMakeLists.txt | 18 +++++++++--------- .../op_def/{fill_op.cc => fill_operator.cc} | 2 +- .../op_def/{fill_op.h => fill_operator.h} | 0 ...meworkop_op.cc => framework_op_operator.cc} | 2 +- ...rameworkop_op.h => framework_op_operator.h} | 0 .../op_def/{no_op_op.cc => no_op_operator.cc} | 2 +- .../op_def/{no_op_op.h => no_op_operator.h} | 0 ...ref_switch_op.cc => ref_switch_operator.cc} | 2 +- .../{ref_switch_op.h => ref_switch_operator.h} | 0 .../{shape_n_op.cc => shape_n_operator.cc} | 2 +- .../{shape_n_op.h => shape_n_operator.h} | 0 ...op.cc => var_is_initialized_op_operator.cc} | 2 +- ...p_op.h => var_is_initialized_op_operator.h} | 0 .../{variable_op.cc => variable_operator.cc} | 2 +- .../{variable_op.h => variable_operator.h} | 0 parser/module.mk | 18 +++++++++--------- ...functiondef.cc => graph_to_function_def.cc} | 2 +- ...h_functiondef.h => graph_to_function_def.h} | 0 ..._optimizer.cc => parser_graph_optimizer.cc} | 4 ++-- ...ph_optimizer.h => parser_graph_optimizer.h} | 0 parser/tensorflow/tensorflow_fill_parser.cc | 2 +- .../tensorflow_frameworkop_parser.cc | 2 +- parser/tensorflow/tensorflow_no_op_parser.cc | 2 +- .../tensorflow/tensorflow_ref_switch_parser.cc | 2 +- .../tensorflow/tensorflow_ref_switch_parser.h | 2 +- parser/tensorflow/tensorflow_shape_n_parser.cc | 2 +- parser/tensorflow/tensorflow_shape_n_parser.h | 2 +- .../tensorflow_var_is_initialized_op_parser.cc | 2 +- .../tensorflow_variable_v2_parser.cc | 2 +- tests/st/CMakeLists.txt | 18 +++++++++--------- tests/st/testcase/test_tensorflow_parser.cc | 16 ++++++++-------- tests/ut/parser/CMakeLists.txt | 18 +++++++++--------- .../graph_optimizer_unittest.cc | 2 +- .../tensorflow_parser_unittest.cc | 16 ++++++++-------- 34 files changed, 72 insertions(+), 72 deletions(-) rename parser/common/op_def/{fill_op.cc => fill_operator.cc} (97%) rename parser/common/op_def/{fill_op.h => fill_operator.h} (100%) rename parser/common/op_def/{frameworkop_op.cc => framework_op_operator.cc} (98%) rename parser/common/op_def/{frameworkop_op.h => framework_op_operator.h} (100%) rename parser/common/op_def/{no_op_op.cc => no_op_operator.cc} (95%) rename parser/common/op_def/{no_op_op.h => no_op_operator.h} (100%) rename parser/common/op_def/{ref_switch_op.cc => ref_switch_operator.cc} (95%) rename parser/common/op_def/{ref_switch_op.h => ref_switch_operator.h} (100%) rename parser/common/op_def/{shape_n_op.cc => shape_n_operator.cc} (97%) rename parser/common/op_def/{shape_n_op.h => shape_n_operator.h} (100%) rename parser/common/op_def/{var_is_initialized_op_op.cc => var_is_initialized_op_operator.cc} (95%) rename parser/common/op_def/{var_is_initialized_op_op.h => var_is_initialized_op_operator.h} (100%) rename parser/common/op_def/{variable_op.cc => variable_operator.cc} (97%) rename parser/common/op_def/{variable_op.h => variable_operator.h} (100%) rename parser/tensorflow/{graph_functiondef.cc => graph_to_function_def.cc} (99%) rename parser/tensorflow/{graph_functiondef.h => graph_to_function_def.h} (100%) rename parser/tensorflow/{graph_optimizer.cc => parser_graph_optimizer.cc} (99%) rename parser/tensorflow/{graph_optimizer.h => parser_graph_optimizer.h} (100%) diff --git a/parser/CMakeLists.txt b/parser/CMakeLists.txt index 193d4cc..ce8a6e0 100644 --- a/parser/CMakeLists.txt +++ b/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 ############ diff --git a/parser/common/op_def/fill_op.cc b/parser/common/op_def/fill_operator.cc similarity index 97% rename from parser/common/op_def/fill_op.cc rename to parser/common/op_def/fill_operator.cc index e3d5927..9b2ee5d 100644 --- a/parser/common/op_def/fill_op.cc +++ b/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 { diff --git a/parser/common/op_def/fill_op.h b/parser/common/op_def/fill_operator.h similarity index 100% rename from parser/common/op_def/fill_op.h rename to parser/common/op_def/fill_operator.h diff --git a/parser/common/op_def/frameworkop_op.cc b/parser/common/op_def/framework_op_operator.cc similarity index 98% rename from parser/common/op_def/frameworkop_op.cc rename to parser/common/op_def/framework_op_operator.cc index 81010ae..305fac0 100644 --- a/parser/common/op_def/frameworkop_op.cc +++ b/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 #include "framework/common/fmk_types.h" diff --git a/parser/common/op_def/frameworkop_op.h b/parser/common/op_def/framework_op_operator.h similarity index 100% rename from parser/common/op_def/frameworkop_op.h rename to parser/common/op_def/framework_op_operator.h diff --git a/parser/common/op_def/no_op_op.cc b/parser/common/op_def/no_op_operator.cc similarity index 95% rename from parser/common/op_def/no_op_op.cc rename to parser/common/op_def/no_op_operator.cc index c427bd2..d630beb 100644 --- a/parser/common/op_def/no_op_op.cc +++ b/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 namespace ge { diff --git a/parser/common/op_def/no_op_op.h b/parser/common/op_def/no_op_operator.h similarity index 100% rename from parser/common/op_def/no_op_op.h rename to parser/common/op_def/no_op_operator.h diff --git a/parser/common/op_def/ref_switch_op.cc b/parser/common/op_def/ref_switch_operator.cc similarity index 95% rename from parser/common/op_def/ref_switch_op.cc rename to parser/common/op_def/ref_switch_operator.cc index 933e05b..cc02f81 100644 --- a/parser/common/op_def/ref_switch_op.cc +++ b/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") {} diff --git a/parser/common/op_def/ref_switch_op.h b/parser/common/op_def/ref_switch_operator.h similarity index 100% rename from parser/common/op_def/ref_switch_op.h rename to parser/common/op_def/ref_switch_operator.h diff --git a/parser/common/op_def/shape_n_op.cc b/parser/common/op_def/shape_n_operator.cc similarity index 97% rename from parser/common/op_def/shape_n_op.cc rename to parser/common/op_def/shape_n_operator.cc index d75818d..df2a7d9 100644 --- a/parser/common/op_def/shape_n_op.cc +++ b/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" diff --git a/parser/common/op_def/shape_n_op.h b/parser/common/op_def/shape_n_operator.h similarity index 100% rename from parser/common/op_def/shape_n_op.h rename to parser/common/op_def/shape_n_operator.h diff --git a/parser/common/op_def/var_is_initialized_op_op.cc b/parser/common/op_def/var_is_initialized_op_operator.cc similarity index 95% rename from parser/common/op_def/var_is_initialized_op_op.cc rename to parser/common/op_def/var_is_initialized_op_operator.cc index 9f7e9c2..81f7f4e 100644 --- a/parser/common/op_def/var_is_initialized_op_op.cc +++ b/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 #include diff --git a/parser/common/op_def/var_is_initialized_op_op.h b/parser/common/op_def/var_is_initialized_op_operator.h similarity index 100% rename from parser/common/op_def/var_is_initialized_op_op.h rename to parser/common/op_def/var_is_initialized_op_operator.h diff --git a/parser/common/op_def/variable_op.cc b/parser/common/op_def/variable_operator.cc similarity index 97% rename from parser/common/op_def/variable_op.cc rename to parser/common/op_def/variable_operator.cc index d1d0c7b..8d200ec 100644 --- a/parser/common/op_def/variable_op.cc +++ b/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" diff --git a/parser/common/op_def/variable_op.h b/parser/common/op_def/variable_operator.h similarity index 100% rename from parser/common/op_def/variable_op.h rename to parser/common/op_def/variable_operator.h diff --git a/parser/module.mk b/parser/module.mk index cb6c1e7..524b6a9 100644 --- a/parser/module.mk +++ b/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) diff --git a/parser/tensorflow/graph_functiondef.cc b/parser/tensorflow/graph_to_function_def.cc similarity index 99% rename from parser/tensorflow/graph_functiondef.cc rename to parser/tensorflow/graph_to_function_def.cc index 94e3d2e..9629cfc 100644 --- a/parser/tensorflow/graph_functiondef.cc +++ b/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 #include "common/fmk_error_codes.h" #include "graph/debug/ge_attr_define.h" diff --git a/parser/tensorflow/graph_functiondef.h b/parser/tensorflow/graph_to_function_def.h similarity index 100% rename from parser/tensorflow/graph_functiondef.h rename to parser/tensorflow/graph_to_function_def.h diff --git a/parser/tensorflow/graph_optimizer.cc b/parser/tensorflow/parser_graph_optimizer.cc similarity index 99% rename from parser/tensorflow/graph_optimizer.cc rename to parser/tensorflow/parser_graph_optimizer.cc index e9c8799..7a10bc1 100644 --- a/parser/tensorflow/graph_optimizer.cc +++ b/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" diff --git a/parser/tensorflow/graph_optimizer.h b/parser/tensorflow/parser_graph_optimizer.h similarity index 100% rename from parser/tensorflow/graph_optimizer.h rename to parser/tensorflow/parser_graph_optimizer.h diff --git a/parser/tensorflow/tensorflow_fill_parser.cc b/parser/tensorflow/tensorflow_fill_parser.cc index 886dcdb..fab2eb9 100644 --- a/parser/tensorflow/tensorflow_fill_parser.cc +++ b/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" diff --git a/parser/tensorflow/tensorflow_frameworkop_parser.cc b/parser/tensorflow/tensorflow_frameworkop_parser.cc index 2d03c7b..cb9ccff 100644 --- a/parser/tensorflow/tensorflow_frameworkop_parser.cc +++ b/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" diff --git a/parser/tensorflow/tensorflow_no_op_parser.cc b/parser/tensorflow/tensorflow_no_op_parser.cc index 4d43f9d..efd193a 100644 --- a/parser/tensorflow/tensorflow_no_op_parser.cc +++ b/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; diff --git a/parser/tensorflow/tensorflow_ref_switch_parser.cc b/parser/tensorflow/tensorflow_ref_switch_parser.cc index f2f8840..205147e 100644 --- a/parser/tensorflow/tensorflow_ref_switch_parser.cc +++ b/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" diff --git a/parser/tensorflow/tensorflow_ref_switch_parser.h b/parser/tensorflow/tensorflow_ref_switch_parser.h index 9bd43cc..68ca56f 100644 --- a/parser/tensorflow/tensorflow_ref_switch_parser.h +++ b/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 { diff --git a/parser/tensorflow/tensorflow_shape_n_parser.cc b/parser/tensorflow/tensorflow_shape_n_parser.cc index 7530bc8..c33aefb 100644 --- a/parser/tensorflow/tensorflow_shape_n_parser.cc +++ b/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; diff --git a/parser/tensorflow/tensorflow_shape_n_parser.h b/parser/tensorflow/tensorflow_shape_n_parser.h index c22188c..5933951 100644 --- a/parser/tensorflow/tensorflow_shape_n_parser.h +++ b/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 { diff --git a/parser/tensorflow/tensorflow_var_is_initialized_op_parser.cc b/parser/tensorflow/tensorflow_var_is_initialized_op_parser.cc index 577bbca..b0fec3a 100644 --- a/parser/tensorflow/tensorflow_var_is_initialized_op_parser.cc +++ b/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" diff --git a/parser/tensorflow/tensorflow_variable_v2_parser.cc b/parser/tensorflow/tensorflow_variable_v2_parser.cc index 2b14280..ac850c7 100644 --- a/parser/tensorflow/tensorflow_variable_v2_parser.cc +++ b/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" diff --git a/tests/st/CMakeLists.txt b/tests/st/CMakeLists.txt index d469f1c..580669b 100644 --- a/tests/st/CMakeLists.txt +++ b/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" diff --git a/tests/st/testcase/test_tensorflow_parser.cc b/tests/st/testcase/test_tensorflow_parser.cc index 6ca926d..2ea4689 100644 --- a/tests/st/testcase/test_tensorflow_parser.cc +++ b/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 diff --git a/tests/ut/parser/CMakeLists.txt b/tests/ut/parser/CMakeLists.txt index 38cb743..28453d9 100644 --- a/tests/ut/parser/CMakeLists.txt +++ b/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" diff --git a/tests/ut/parser/testcase/graph_optimizer_testcase/graph_optimizer_unittest.cc b/tests/ut/parser/testcase/graph_optimizer_testcase/graph_optimizer_unittest.cc index 5139002..9667978 100644 --- a/tests/ut/parser/testcase/graph_optimizer_testcase/graph_optimizer_unittest.cc +++ b/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 { diff --git a/tests/ut/parser/testcase/tensorflow_parser_testcase/tensorflow_parser_unittest.cc b/tests/ut/parser/testcase/tensorflow_parser_testcase/tensorflow_parser_unittest.cc index d64e300..d1c6c8e 100644 --- a/tests/ut/parser/testcase/tensorflow_parser_testcase/tensorflow_parser_unittest.cc +++ b/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"