| @@ -79,7 +79,7 @@ Status CaffeCustomParserAdapter::ParseWeights(const Message *op_src, ge::NodePtr | |||||
| GE_CHECK_NOTNULL(op); | GE_CHECK_NOTNULL(op); | ||||
| const LayerParameter *layer = reinterpret_cast<const LayerParameter *>(op_src); | const LayerParameter *layer = reinterpret_cast<const LayerParameter *>(op_src); | ||||
| GE_CHK_BOOL_RET_STATUS(nullptr != layer, FAILED, "[Convert][Type]Dynamic cast op_src to LayerParameter failed"); | |||||
| GE_CHK_BOOL_RET_STATUS(layer != nullptr, FAILED, "[Convert][Type]Dynamic cast op_src to LayerParameter failed"); | |||||
| GELOGI("layer: %s blobs_size: %d bottom_size: %d", layer->name().c_str(), layer->blobs_size(), layer->bottom_size()); | GELOGI("layer: %s blobs_size: %d bottom_size: %d", layer->name().c_str(), layer->blobs_size(), layer->bottom_size()); | ||||
| if (layer->blobs_size() == 0) { | if (layer->blobs_size() == 0) { | ||||
| return SUCCESS; | return SUCCESS; | ||||
| @@ -452,8 +452,7 @@ Status SetNodedefProto(domi::tensorflow::NodeDef &proto, ge::NodePtr n, string o | |||||
| OpDescPtr src_opdesc = src_node->GetOpDesc(); | OpDescPtr src_opdesc = src_node->GetOpDesc(); | ||||
| GELOGI("inedge src:%s, src_out_index:%d, dst:%s, dst_in_index:%d", src_opdesc->GetName().c_str(), | GELOGI("inedge src:%s, src_out_index:%d, dst:%s, dst_in_index:%d", src_opdesc->GetName().c_str(), | ||||
| src_anchor->GetIdx(), op_desc->GetName().c_str(), anchor->GetIdx()); | src_anchor->GetIdx(), op_desc->GetName().c_str(), anchor->GetIdx()); | ||||
| string inputName; | |||||
| inputName = src_opdesc->GetName() + ":" + "output:" + std::to_string(src_anchor->GetIdx()); | |||||
| string inputName = src_opdesc->GetName() + ":" + "output:" + std::to_string(src_anchor->GetIdx()); | |||||
| GELOGI("inputName =%s\n", inputName.c_str()); | GELOGI("inputName =%s\n", inputName.c_str()); | ||||
| proto.add_input(inputName); | proto.add_input(inputName); | ||||
| } | } | ||||
| @@ -3251,8 +3251,7 @@ Status TensorFlowModelParser::TrimGraphByOutput(const domi::tensorflow::GraphDef | |||||
| output_graph_def->Clear(); | output_graph_def->Clear(); | ||||
| for (const NodeDef &node : filtered_graph_def.node()) { | for (const NodeDef &node : filtered_graph_def.node()) { | ||||
| if (input_nodes.count(node.name())) { | if (input_nodes.count(node.name())) { | ||||
| NodeDef placeholder_node; | |||||
| placeholder_node = node; | |||||
| NodeDef placeholder_node = node; | |||||
| placeholder_node.clear_input(); | placeholder_node.clear_input(); | ||||
| GE_IF_BOOL_EXEC(node.op() != "Placeholder", placeholder_node.set_op("Placeholder")); | GE_IF_BOOL_EXEC(node.op() != "Placeholder", placeholder_node.set_op("Placeholder")); | ||||
| domi::tensorflow::AttrValue attr_value; | domi::tensorflow::AttrValue attr_value; | ||||