未验证 提交 c501e7dd 编写于 作者: W WJJ1995 提交者: GitHub

Update logging info (#764)

* update logging info

* update logging info
上级 a19264fc
...@@ -50,11 +50,11 @@ X2Paddle是飞桨生态下的模型转换工具,致力于帮助其它深度学 ...@@ -50,11 +50,11 @@ X2Paddle是飞桨生态下的模型转换工具,致力于帮助其它深度学
### 环境依赖 ### 环境依赖
- python >= 3.5 - python >= 3.5
- paddlepaddle >= 2.0.0 - paddlepaddle >= 2.2.2
- tensorflow == 1.14 (如需转换TensorFlow模型) - tensorflow == 1.14 (如需转换TensorFlow模型)
- onnx >= 1.6.0 (如需转换ONNX模型) - onnx >= 1.6.0 (如需转换ONNX模型)
- torch >= 1.5.0 (如需转换PyTorch模型) - torch >= 1.5.0 (如需转换PyTorch模型)
- paddlelite == 2.9.0 (如需一键转换成Paddle-Lite支持格式) - paddlelite >= 2.9.0 (如需一键转换成Paddle-Lite支持格式,推荐最新版本)
### pip安装(推荐) ### pip安装(推荐)
......
...@@ -139,28 +139,33 @@ def tf2paddle(model_path, ...@@ -139,28 +139,33 @@ def tf2paddle(model_path,
version = tf.__version__ version = tf.__version__
if version >= '2.0.0' or version < '1.0.0': if version >= '2.0.0' or version < '1.0.0':
logging.info( logging.info(
"[ERROR] 1.0.0<=tensorflow<2.0.0 is required, and v1.14.0 is recommended" "[ERROR] 1.0.0<=TensorFlow<2.0.0 is required, and v1.14.0 is recommended"
) )
return return
except: except:
logging.info( logging.info(
"[ERROR] Tensorflow is not installed, use \"pip install tensorflow\"." "[ERROR] TensorFlow is not installed, use \"pip install TensorFlow\"."
) )
return return
from x2paddle.decoder.tf_decoder import TFDecoder from x2paddle.decoder.tf_decoder import TFDecoder
from x2paddle.op_mapper.tf2paddle.tf_op_mapper import TFOpMapper from x2paddle.op_mapper.tf2paddle.tf_op_mapper import TFOpMapper
logging.info("Now translating model from tensorflow to paddle.") logging.info("Now translating model from TensorFlow to Paddle.")
model = TFDecoder(model_path, define_input_shape=define_input_shape) model = TFDecoder(model_path, define_input_shape=define_input_shape)
mapper = TFOpMapper(model) mapper = TFOpMapper(model)
mapper.paddle_graph.build() mapper.paddle_graph.build()
logging.info("Model optimizing ...")
from x2paddle.optimizer.optimizer import GraphOptimizer from x2paddle.optimizer.optimizer import GraphOptimizer
graph_opt = GraphOptimizer(source_frame="tf") graph_opt = GraphOptimizer(source_frame="tf")
graph_opt.optimize(mapper.paddle_graph) graph_opt.optimize(mapper.paddle_graph)
logging.info("Model optimized!")
mapper.paddle_graph.gen_model(save_dir) mapper.paddle_graph.gen_model(save_dir)
logging.info("Successfully exported Paddle static graph model!")
if convert_to_lite: if convert_to_lite:
logging.info("Now translating model from Paddle to Paddle Lite ...")
convert2lite(save_dir, lite_valid_places, lite_model_type) convert2lite(save_dir, lite_valid_places, lite_model_type)
logging.info("Successfully exported Paddle Lite support model!")
def caffe2paddle(proto_file, def caffe2paddle(proto_file,
...@@ -187,10 +192,13 @@ def caffe2paddle(proto_file, ...@@ -187,10 +192,13 @@ def caffe2paddle(proto_file,
from x2paddle.optimizer.optimizer import GraphOptimizer from x2paddle.optimizer.optimizer import GraphOptimizer
graph_opt = GraphOptimizer(source_frame="caffe") graph_opt = GraphOptimizer(source_frame="caffe")
graph_opt.optimize(mapper.paddle_graph) graph_opt.optimize(mapper.paddle_graph)
logging.info("Model optimized.") logging.info("Model optimized!")
mapper.paddle_graph.gen_model(save_dir) mapper.paddle_graph.gen_model(save_dir)
logging.info("Successfully exported Paddle static graph model!")
if convert_to_lite: if convert_to_lite:
logging.info("Now translating model from Paddle to Paddle Lite ...")
convert2lite(save_dir, lite_valid_places, lite_model_type) convert2lite(save_dir, lite_valid_places, lite_model_type)
logging.info("Successfully exported Paddle Lite support model!")
def onnx2paddle(model_path, def onnx2paddle(model_path,
...@@ -224,8 +232,11 @@ def onnx2paddle(model_path, ...@@ -224,8 +232,11 @@ def onnx2paddle(model_path,
graph_opt.optimize(mapper.paddle_graph) graph_opt.optimize(mapper.paddle_graph)
logging.info("Model optimized.") logging.info("Model optimized.")
mapper.paddle_graph.gen_model(save_dir) mapper.paddle_graph.gen_model(save_dir)
logging.info("Successfully exported Paddle static graph model!")
if convert_to_lite: if convert_to_lite:
logging.info("Now translating model from Paddle to Paddle Lite ...")
convert2lite(save_dir, lite_valid_places, lite_model_type) convert2lite(save_dir, lite_valid_places, lite_model_type)
logging.info("Successfully exported Paddle Lite support model!")
def pytorch2paddle(module, def pytorch2paddle(module,
...@@ -247,17 +258,17 @@ def pytorch2paddle(module, ...@@ -247,17 +258,17 @@ def pytorch2paddle(module,
version_sum = int(v0) * 100 + int(v1) * 10 + int(v2) version_sum = int(v0) * 100 + int(v1) * 10 + int(v2)
if version_sum < 150: if version_sum < 150:
logging.info( logging.info(
"[ERROR] pytorch>=1.5.0 is required, 1.6.0 is the most recommended" "[ERROR] PyTorch>=1.5.0 is required, 1.6.0 is the most recommended"
) )
return return
if version_sum > 160: if version_sum > 160:
logging.info("[WARNING] pytorch==1.6.0 is recommended") logging.info("[WARNING] PyTorch==1.6.0 is recommended")
except: except:
logging.info( logging.info(
"[ERROR] Pytorch is not installed, use \"pip install torch==1.6.0 torchvision\"." "[ERROR] PyTorch is not installed, use \"pip install torch==1.6.0 torchvision\"."
) )
return return
logging.info("Now translating model from pytorch to paddle.") logging.info("Now translating model from PyTorch to Paddle.")
from x2paddle.decoder.pytorch_decoder import ScriptDecoder, TraceDecoder from x2paddle.decoder.pytorch_decoder import ScriptDecoder, TraceDecoder
from x2paddle.op_mapper.pytorch2paddle.pytorch_op_mapper import PyTorchOpMapper from x2paddle.op_mapper.pytorch2paddle.pytorch_op_mapper import PyTorchOpMapper
...@@ -272,11 +283,14 @@ def pytorch2paddle(module, ...@@ -272,11 +283,14 @@ def pytorch2paddle(module,
from x2paddle.optimizer.optimizer import GraphOptimizer from x2paddle.optimizer.optimizer import GraphOptimizer
graph_opt = GraphOptimizer(source_frame="pytorch", jit_type=jit_type) graph_opt = GraphOptimizer(source_frame="pytorch", jit_type=jit_type)
graph_opt.optimize(mapper.paddle_graph) graph_opt.optimize(mapper.paddle_graph)
logging.info("Model optimized.") logging.info("Model optimized!")
mapper.paddle_graph.gen_model( mapper.paddle_graph.gen_model(
save_dir, jit_type=jit_type, enable_code_optim=enable_code_optim) save_dir, jit_type=jit_type, enable_code_optim=enable_code_optim)
logging.info("Successfully exported Paddle static graph model!")
if convert_to_lite: if convert_to_lite:
logging.info("Now translating model from Paddle to Paddle Lite ...")
convert2lite(save_dir, lite_valid_places, lite_model_type) convert2lite(save_dir, lite_valid_places, lite_model_type)
logging.info("Successfully exported Paddle Lite support model!")
def main(): def main():
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册