Merge pull request #75 from jiangjiajun/develop

Develop

README.md

@@ -6,7 +6,10 @@ X2Paddle is a toolkit for converting trained model to PaddlePaddle from other de
 
 python >= 3.5  
 paddlepaddle >= 1.5.0  
-tensorflow == 1.14.0  
+
+**以下依赖只需对应安装自己需要的即可**  
+转换tensorflow模型 ： tensorflow == 1.14.0  
+转换caffe模型 ： caffe == 1.0.0  
 
 ## 安装
 ```
@@ -22,6 +25,13 @@ x2paddle --framework=tensorflow --model=tf_model.pb --save_dir=pd_model
 ```
 x2paddle --framework=caffe --prototxt=deploy.proto --weight=deploy.caffemodel --save_dir=pd_model
 ```
+### ONNX
+待release，目前可使用[onnx2fluid](https://github.com/PaddlePaddle/X2Paddle/tree/master/onnx2fluid)
+### PyTorch
+可先将pytorch模型导出为onnx，再使用x2paddle转换onnx模型
+### Keras with tensorflow as backend
+可先将keras模型转成tensorflow模型，再使用x2paddle转换tensorflow模型
+
 ### 参数选项
 | 参数 | |
 |----------|--------------|

tool/ReadMe.md

-## 工具
-
-keras_to_tf.py : keras转tensorflow脚本  
-pytorch_to_onnx.py : pytorch转onnx脚本

tool/keras_to_tf.py

-#   Copyright (c) 2019  PaddlePaddle Authors. All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License"
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.