diff --git a/parser/CMakeLists.txt b/parser/CMakeLists.txt index e203166..193d4cc 100644 --- a/parser/CMakeLists.txt +++ b/parser/CMakeLists.txt @@ -25,8 +25,8 @@ set(SRC_LIST "tensorflow/graph_functiondef.cc" "tensorflow/graph_optimizer.cc" "tensorflow/iterator_fusion_pass.cc" - "common/op_def/arg_op.cc" - "common/op_def/constant_op.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" diff --git a/parser/common/op_def/arg_op.cc b/parser/common/op_def/arg_op_operator.cc similarity index 95% rename from parser/common/op_def/arg_op.cc rename to parser/common/op_def/arg_op_operator.cc index e9c4243..5e06525 100644 --- a/parser/common/op_def/arg_op.cc +++ b/parser/common/op_def/arg_op_operator.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "parser/common/op_def/arg_op.h" +#include "parser/common/op_def/arg_op_operator.h" #include #include "framework/common/fmk_types.h" diff --git a/parser/common/op_def/arg_op.h b/parser/common/op_def/arg_op_operator.h similarity index 100% rename from parser/common/op_def/arg_op.h rename to parser/common/op_def/arg_op_operator.h diff --git a/parser/common/op_def/constant_op.cc b/parser/common/op_def/constant_operator.cc similarity index 96% rename from parser/common/op_def/constant_op.cc rename to parser/common/op_def/constant_operator.cc index cecb1d5..db17752 100644 --- a/parser/common/op_def/constant_op.cc +++ b/parser/common/op_def/constant_operator.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "common/op_def/constant_op.h" +#include "common/op_def/constant_operator.h" #include #include diff --git a/parser/common/op_def/constant_op.h b/parser/common/op_def/constant_operator.h similarity index 100% rename from parser/common/op_def/constant_op.h rename to parser/common/op_def/constant_operator.h diff --git a/parser/module.mk b/parser/module.mk index 678179c..cb6c1e7 100644 --- a/parser/module.mk +++ b/parser/module.mk @@ -95,8 +95,8 @@ FMK_COMMON_SRC_FILES := \ tensorflow/graph_functiondef.cc \ tensorflow/graph_optimizer.cc \ tensorflow/iterator_fusion_pass.cc \ - common/op_def/arg_op.cc \ - common/op_def/constant_op.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 \ diff --git a/parser/tensorflow/tensorflow_arg_parser.cc b/parser/tensorflow/tensorflow_arg_parser.cc index 32a1943..985eb15 100644 --- a/parser/tensorflow/tensorflow_arg_parser.cc +++ b/parser/tensorflow/tensorflow_arg_parser.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "parser/common/op_def/arg_op.h" +#include "parser/common/op_def/arg_op_operator.h" #include "framework/common/debug/ge_log.h" #include "framework/omg/parser/parser_inner_ctx.h" #include "graph/compute_graph.h" diff --git a/parser/tensorflow/tensorflow_constant_parser.cc b/parser/tensorflow/tensorflow_constant_parser.cc index 22f1647..9812b37 100644 --- a/parser/tensorflow/tensorflow_constant_parser.cc +++ b/parser/tensorflow/tensorflow_constant_parser.cc @@ -19,7 +19,7 @@ #include #include #include "parser/common/acl_graph_parser_util.h" -#include "parser/common/op_def/constant_op.h" +#include "parser/common/op_def/constant_operator.h" #include "parser/common/op_def/ir_pb_converter.h" #include "parser/common/util.h" #include "framework/common/debug/ge_log.h" diff --git a/parser/tensorflow/tensorflow_constant_parser.h b/parser/tensorflow/tensorflow_constant_parser.h index 557db3d..5d4df36 100644 --- a/parser/tensorflow/tensorflow_constant_parser.h +++ b/parser/tensorflow/tensorflow_constant_parser.h @@ -17,7 +17,7 @@ #ifndef GE_PARSER_TENSORFLOW_TENSORFLOW_CONSTANT_PARSER_H_ #define GE_PARSER_TENSORFLOW_TENSORFLOW_CONSTANT_PARSER_H_ -#include "common/op_def/constant_op.h" +#include "common/op_def/constant_operator.h" #include "parser/common/data_op_parser.h" #include "parser/tensorflow/tensorflow_op_parser.h" diff --git a/tests/st/CMakeLists.txt b/tests/st/CMakeLists.txt index 7498987..d469f1c 100644 --- a/tests/st/CMakeLists.txt +++ b/tests/st/CMakeLists.txt @@ -249,8 +249,8 @@ set(PARSER_SRC_FILES "${PARSER_DIR}/parser/common/convert/message2operator.cc" "${PARSER_DIR}/parser/common/data_op_parser.cc" "${PARSER_DIR}/parser/common/model_saver.cc" - "${PARSER_DIR}/parser/common/op_def/arg_op.cc" - "${PARSER_DIR}/parser/common/op_def/constant_op.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/ir_pb_converter.cc" diff --git a/tests/st/testcase/test_tensorflow_parser.cc b/tests/st/testcase/test_tensorflow_parser.cc index 5b41752..6ca926d 100644 --- a/tests/st/testcase/test_tensorflow_parser.cc +++ b/tests/st/testcase/test_tensorflow_parser.cc @@ -38,7 +38,7 @@ #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" -#include "parser/common/op_def/arg_op.h" +#include "parser/common/op_def/arg_op_operator.h" #include "parser/tensorflow/tensorflow_fusion_custom_parser_adapter.h" #include "parser/tensorflow/tensorflow_reshape_parser.h" #include "parser/tensorflow/tensorflow_custom_parser_adapter.h" @@ -678,6 +678,7 @@ namespace { if ((_name== "S") || (_name == "K")) { int index = 0; + ge::AttrUtils::SetInt(opDef, "T", 1); ge::AttrUtils::SetInt(opDef, "arg_index", index); ge::AttrUtils::SetInt(opDef, "ret_index", index); diff --git a/tests/ut/parser/CMakeLists.txt b/tests/ut/parser/CMakeLists.txt index 0253c0f..38cb743 100644 --- a/tests/ut/parser/CMakeLists.txt +++ b/tests/ut/parser/CMakeLists.txt @@ -250,8 +250,8 @@ set(PARSER_SRC_FILES "${PARSER_DIR}/parser/common/convert/message2operator.cc" "${PARSER_DIR}/parser/common/data_op_parser.cc" "${PARSER_DIR}/parser/common/model_saver.cc" - "${PARSER_DIR}/parser/common/op_def/arg_op.cc" - "${PARSER_DIR}/parser/common/op_def/constant_op.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/ir_pb_converter.cc" 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 00678d8..d64e300 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 @@ -42,7 +42,7 @@ #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" -#include "parser/common/op_def/arg_op.h" +#include "parser/common/op_def/arg_op_operator.h" #include "parser/tensorflow/tensorflow_fusion_custom_parser_adapter.h" #include "parser/tensorflow/tensorflow_reshape_parser.h" #include "parser/tensorflow/tensorflow_custom_parser_adapter.h"