Browse Source

!249 support error_manager used in train

Merge pull request !249 from 王笑天/master
pull/249/MERGE
i-robot Gitee 4 years ago
parent
commit
86162f6080
3 changed files with 7 additions and 3 deletions
  1. +2
    -2
      build.sh
  2. +1
    -1
      metadef
  3. +4
    -0
      parser/tensorflow/tensorflow_parser.cc

+ 2
- 2
build.sh View File

@@ -180,7 +180,7 @@ generate_package()
FWK_PATH="fwkacllib/lib64"
ATC_PATH="atc/lib64"

COMMON_LIB=("libgraph.so" "libregister.so")
COMMON_LIB=("libgraph.so" "libregister.so" "liberror_manager.so")
PARSER_LIB=("lib_caffe_parser.so" "libfmk_onnx_parser.so" "libfmk_parser.so" "libparser_common.so")

rm -rf ${OUTPUT_PATH:?}/${FWK_PATH}/
@@ -192,7 +192,7 @@ generate_package()
mk_dir "${OUTPUT_PATH}/${ACL_PATH}"

find output/ -name parser_lib.tar -exec rm {} \;
cd "${OUTPUT_PATH}"

for lib in "${PARSER_LIB[@]}";


+ 1
- 1
metadef

@@ -1 +1 @@
Subproject commit f982caa0981b1fdcc55a8ec27b4f4de9c58d33ba
Subproject commit 3df578f6d08e51e2c4ed8a023fb8482109941665

+ 4
- 0
parser/tensorflow/tensorflow_parser.cc View File

@@ -818,6 +818,8 @@ Status TensorFlowModelParser::CheckOpType(const domi::tensorflow::NodeDef *node_
* @return ge::DataType
*/
ge::DataType TensorFlowModelParser::ConvertToGeDataType(const uint32_t type) {
ErrorManager::GetInstance().GenWorkStreamIdDefault();

ge::DataType data_type = domi::TensorAssign::ConvertTensorflowDataType(type);
return data_type;
}
@@ -2139,6 +2141,7 @@ Status TensorFlowWeightsParser::ParseFromMemory(const char *data, uint32_t size,
Status TensorFlowWeightsParser::Parse(const char *file, ge::Graph &graph) { return SUCCESS; }

Status TensorFlowModelParser::ParseProto(const google::protobuf::Message *proto, ge::ComputeGraphPtr &graph) {
ErrorManager::GetInstance().GenWorkStreamIdDefault();
PARSER_TIMESTAMP_START(ParseProto);
GE_CHECK_NOTNULL(proto);
GE_CHECK_NOTNULL(graph);
@@ -2265,6 +2268,7 @@ Status TensorFlowModelParser::ParseProto(const google::protobuf::Message *proto,

Status TensorFlowModelParser::ParseProtoWithSubgraph(const google::protobuf::Message *root_proto,
domi::GetGraphCallback callback, ge::ComputeGraphPtr &root_graph) {
ErrorManager::GetInstance().GenWorkStreamIdDefault();
GE_CHECK_NOTNULL(root_proto);
GE_CHECK_NOTNULL(callback);
GE_CHECK_NOTNULL(root_graph);


Loading…
Cancel
Save