diff --git a/README.md b/README.md index 4dd2125f281fee598f6ec842239d87c54d650d91..ba811966bbc03e44b4e3eb5a0c177922866fe624 100644 --- a/README.md +++ b/README.md @@ -16,6 +16,7 @@ paddlepaddle >= 1.8.0 tensorflow : tensorflow == 1.14.0 caffe : 无 onnx : onnx >= 1.6.0 +pytorch:torch >=1.5.0 (script方式暂不支持1.7.0) ## 安装 ### 安装方式一(推荐) @@ -45,11 +46,10 @@ x2paddle --framework=caffe --prototxt=deploy.prototxt --weight=deploy.caffemodel x2paddle --framework=onnx --model=onnx_model.onnx --save_dir=pd_model ``` -### Paddle2ONNX -``` -# 注意:paddle_infer_model_dir下需包含__model__和__params__两个文件 -x2paddle --framework=paddle2onnx --model=paddle_infer_model_dir --save_dir=onnx_model -``` +### PyTorch +> PyTorch不支持命令行使用方式,详见[PyTorch2Paddle](pytorch2paddle.md) + + ### 参数选项 | 参数 | | |----------|--------------| diff --git a/x2paddle/convert.py b/x2paddle/convert.py index 23850dbbc2e1f663f6829f90c4bcd16276894c55..c43236c6732a8676b8babae3af727d033f71f46a 100644 --- a/x2paddle/convert.py +++ b/x2paddle/convert.py @@ -209,7 +209,7 @@ def onnx2paddle(model_path, save_dir, paddle_type, params_merge=False): mapper.save_inference_model(save_dir, params_merge) -def pytorch2paddle(module, save_dir, jit_type, input_examples=None): +def pytorch2paddle(module, save_dir, jit_type="trace", input_examples=None): # check pytorch installation and version try: import torch