merge paddle/develop

x2paddle/convert.py

@@ -203,6 +203,14 @@ def paddle2onnx(model_path, save_dir):
     mapper.convert(model.program, save_dir)
 
 
+def paddle2onnx(model_path, save_dir):
+    from x2paddle.decoder.paddle_decoder import PaddleDecoder
+    from x2paddle.op_mapper.paddle_op_mapper import PaddleOpMapper
+    model = PaddleDecoder(model_path, '__model__', '__params__')
+    mapper = PaddleOpMapper()
+    mapper.convert(model.program, save_dir)
+
+
 def main():
     if len(sys.argv) < 2:
         print("Use \"x2paddle -h\" to print the help information")

x2paddle/decoder/onnx_decoder.py

@@ -334,24 +334,6 @@ class ONNXGraph(Graph):
                 'external': False
             }
 
-    # for item in self.graph.input:
-    #     self.value_infos[item.name] = {
-    #         'dtype':
-    #         TENSOR_TYPE_TO_NP_TYPE[item.type.tensor_type.elem_type],
-    #         'shape':
-    #         [dim.dim_value for dim in item.type.tensor_type.shape.dim],
-    #         'external': True
-    #     }
-    # for item in self.graph.output:
-    #     #assert item.name not in value_info
-    #     self.value_infos[item.name] = {
-    #         'dtype':
-    #         TENSOR_TYPE_TO_NP_TYPE[item.type.tensor_type.elem_type],
-    #         'shape':
-    #         [dim.dim_value for dim in item.type.tensor_type.shape.dim],
-    #         'external': True
-    #     }
-
     def allocate_shapes(self):
         """
         run shape inference