Browse Source

!659 sync ge_dev to master 20220905

Merge pull request !659 from 王笑天/ge_dev
pull/663/MERGE
王笑天 Gitee 2 years ago
parent
commit
9a666a6af5
No known key found for this signature in database GPG Key ID: 173E9B9CA92EEF8F
4 changed files with 7 additions and 6 deletions
  1. +1
    -1
      metadef
  2. +2
    -5
      tests/depends/graph/src/attr_util_stub.cc
  3. +2
    -0
      tests/st/CMakeLists.txt
  4. +2
    -0
      tests/ut/parser/CMakeLists.txt

+ 1
- 1
metadef

@@ -1 +1 @@
Subproject commit f5c1b6d1b6b6e97d0cfcf2efd52ec8da12d32c86
Subproject commit 599fbd9d7f9509b7673af90e186817b5a75ad547

+ 2
- 5
tests/depends/graph/src/attr_util_stub.cc View File

@@ -135,10 +135,8 @@ GE_FUNC_DEV_VISIBILITY GE_FUNC_HOST_VISIBILITY OpDescPtr AttrUtils::CloneOpDesc(
if (!op_desc->impl_->output_name_idx_.empty()) {
op_desc->impl_->output_name_idx_.clear();
}
if (!op_desc->impl_->optional_input_names_.empty()) {
op_desc->impl_->optional_input_names_.clear();
}

op_desc->impl_->MutableIRMeta() = IRMetaData(op_desc->GetName());
return op_desc;
}

@@ -173,8 +171,7 @@ GE_FUNC_DEV_VISIBILITY GE_FUNC_HOST_VISIBILITY OpDescPtr AttrUtils::CopyOpDesc(c
}
op_desc->impl_->input_name_idx_.insert(org_op_desc->impl_->input_name_idx_.begin(),
org_op_desc->impl_->input_name_idx_.end());
op_desc->impl_->optional_input_names_.insert(org_op_desc->impl_->optional_input_names_.begin(),
org_op_desc->impl_->optional_input_names_.end());
op_desc->impl_->MutableIRMeta() = org_op_desc->impl_->GetIRMeta();
op_desc->impl_->output_name_idx_.insert(org_op_desc->impl_->output_name_idx_.begin(),
org_op_desc->impl_->output_name_idx_.end());



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

@@ -103,6 +103,8 @@ set(MATEDEF_SRC_FILES
"${PARSER_DIR}/metadef/graph/model_serialize.cc"
"${PARSER_DIR}/metadef/graph/node.cc"
"${PARSER_DIR}/metadef/graph/op_desc.cc"
"${PARSER_DIR}/metadef/graph/ir_meta.cc"
"${PARSER_DIR}/metadef/graph/ir_data_type_symbol_store.cc"
"${PARSER_DIR}/metadef/graph/operator.cc"
"${PARSER_DIR}/metadef/graph/operator_impl.cc"
"${PARSER_DIR}/metadef/graph/operator_factory.cc"


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

@@ -106,6 +106,8 @@ set(MATEDEF_SRC_FILES
"${PARSER_DIR}/metadef/graph/model_serialize.cc"
"${PARSER_DIR}/metadef/graph/node.cc"
"${PARSER_DIR}/metadef/graph/op_desc.cc"
"${PARSER_DIR}/metadef/graph/ir_meta.cc"
"${PARSER_DIR}/metadef/graph/ir_data_type_symbol_store.cc"
"${PARSER_DIR}/metadef/graph/operator.cc"
"${PARSER_DIR}/metadef/graph/operator_impl.cc"
"${PARSER_DIR}/metadef/graph/operator_factory.cc"


Loading…
Cancel
Save