Browse Source

clean code

pull/640/head
13291271729 3 years ago
parent
commit
fc9971f510
13 changed files with 16 additions and 15 deletions
  1. +2
    -2
      parser/CMakeLists.txt
  2. +1
    -1
      parser/common/op_def/arg_op_operator.cc
  3. +0
    -0
      parser/common/op_def/arg_op_operator.h
  4. +1
    -1
      parser/common/op_def/constant_operator.cc
  5. +0
    -0
      parser/common/op_def/constant_operator.h
  6. +2
    -2
      parser/module.mk
  7. +1
    -1
      parser/tensorflow/tensorflow_arg_parser.cc
  8. +1
    -1
      parser/tensorflow/tensorflow_constant_parser.cc
  9. +1
    -1
      parser/tensorflow/tensorflow_constant_parser.h
  10. +2
    -2
      tests/st/CMakeLists.txt
  11. +2
    -1
      tests/st/testcase/test_tensorflow_parser.cc
  12. +2
    -2
      tests/ut/parser/CMakeLists.txt
  13. +1
    -1
      tests/ut/parser/testcase/tensorflow_parser_testcase/tensorflow_parser_unittest.cc

+ 2
- 2
parser/CMakeLists.txt View File

@@ -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"


parser/common/op_def/arg_op.cc → parser/common/op_def/arg_op_operator.cc View File

@@ -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 <string>
#include "framework/common/fmk_types.h"


parser/common/op_def/arg_op.h → parser/common/op_def/arg_op_operator.h View File


parser/common/op_def/constant_op.cc → parser/common/op_def/constant_operator.cc View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/

#include "common/op_def/constant_op.h"
#include "common/op_def/constant_operator.h"
#include <string>
#include <vector>


parser/common/op_def/constant_op.h → parser/common/op_def/constant_operator.h View File


+ 2
- 2
parser/module.mk View File

@@ -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 \


+ 1
- 1
parser/tensorflow/tensorflow_arg_parser.cc View File

@@ -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"


+ 1
- 1
parser/tensorflow/tensorflow_constant_parser.cc View File

@@ -19,7 +19,7 @@
#include <memory>
#include <vector>
#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"


+ 1
- 1
parser/tensorflow/tensorflow_constant_parser.h View File

@@ -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"



+ 2
- 2
tests/st/CMakeLists.txt View File

@@ -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"


+ 2
- 1
tests/st/testcase/test_tensorflow_parser.cc View File

@@ -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);


+ 2
- 2
tests/ut/parser/CMakeLists.txt View File

@@ -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"


+ 1
- 1
tests/ut/parser/testcase/tensorflow_parser_testcase/tensorflow_parser_unittest.cc View File

@@ -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"


Loading…
Cancel
Save