From 212c3d9009f08f9d942dffd491a3c3bcfed2cd3e Mon Sep 17 00:00:00 2001 From: channingss Date: Thu, 8 Aug 2019 17:06:17 +0800 Subject: [PATCH] updatea --- x2paddle/decoder/onnx_decoder.py | 1 - x2paddle/op_mapper/onnx_op_mapper.py | 6 ++++++ x2paddle_model_zoo.md | 2 -- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/x2paddle/decoder/onnx_decoder.py b/x2paddle/decoder/onnx_decoder.py index bb271a9..2671dd1 100644 --- a/x2paddle/decoder/onnx_decoder.py +++ b/x2paddle/decoder/onnx_decoder.py @@ -241,7 +241,6 @@ class ONNXDecoder(object): model.opset_import[0].version) check_model(model) - # model = convert_version(model, 10) model = polish_model(model) model = self.optimize_model_skip_op_for_inference(model) diff --git a/x2paddle/op_mapper/onnx_op_mapper.py b/x2paddle/op_mapper/onnx_op_mapper.py index 0fb57ef..2fc4ff1 100644 --- a/x2paddle/op_mapper/onnx_op_mapper.py +++ b/x2paddle/op_mapper/onnx_op_mapper.py @@ -49,6 +49,12 @@ class ONNXOpMapper(OpMapper): raise Exception("Model are not supported yet.") #mapping op + + print("Total nodes: {}".format( + sum([ + isinstance(node, ONNXGraphNode) + for name, node in self.graph.node_map.items() + ]))) for node_name in self.graph.topo_sort: node = self.graph.get_node(node_name) op = node.layer_type diff --git a/x2paddle_model_zoo.md b/x2paddle_model_zoo.md index c0f30b2..80d12d9 100644 --- a/x2paddle_model_zoo.md +++ b/x2paddle_model_zoo.md @@ -27,7 +27,6 @@ | mNASNet | [code](https://github.com/LiJianfei06/MnasNet-caffe) | | MTCNN | [code](https://github.com/kpzhang93/MTCNN_face_detection_alignment/tree/master/code/codes/MTCNNv1/model) | - # ONNX | 模型 | 来源 | operator version| @@ -44,7 +43,6 @@ | Shufflenet | [onnx official](https://github.com/onnx/models/tree/master/vision/classification/shufflenet) |9| | Inception_v2 | [onnx official](https://github.com/onnx/models/tree/master/vision/classification/inception_and_googlenet/inception_v2) |9| - 目前onnx2paddle主要支持onnx operator version 9，关于如何使用torchvison的model: ``` import torch -- GitLab