未验证 提交 74c99613 编写于 作者: G Guanghua Yu 提交者: GitHub

fix x2paddle version (#1427)

上级 835d71cf
...@@ -99,7 +99,9 @@ def get_model_dir(model_dir, model_filename, params_filename): ...@@ -99,7 +99,9 @@ def get_model_dir(model_dir, model_filename, params_filename):
return updated_model_dir, updated_model_filename, updated_params_filename return updated_model_dir, updated_model_filename, updated_params_filename
def load_onnx_model(model_path, disable_feedback=False): def load_onnx_model(model_path,
disable_feedback=False,
enable_onnx_checker=True):
assert model_path.endswith( assert model_path.endswith(
'.onnx' '.onnx'
), '{} does not end with .onnx suffix and cannot be loaded.'.format( ), '{} does not end with .onnx suffix and cannot be loaded.'.format(
...@@ -121,8 +123,7 @@ def load_onnx_model(model_path, disable_feedback=False): ...@@ -121,8 +123,7 @@ def load_onnx_model(model_path, disable_feedback=False):
try: try:
pkg.require('x2paddle') pkg.require('x2paddle')
except: except:
from pip._internal import main os.system('python -m pip install -U x2paddle==1.3.9')
main(['install', 'x2paddle'])
# check onnx installation and version # check onnx installation and version
try: try:
pkg.require('onnx') pkg.require('onnx')
...@@ -150,7 +151,7 @@ def load_onnx_model(model_path, disable_feedback=False): ...@@ -150,7 +151,7 @@ def load_onnx_model(model_path, disable_feedback=False):
) if paddle.distributed.get_world_size() > 1 else 0 ) if paddle.distributed.get_world_size() > 1 else 0
try: try:
_logger.info("Now translating model from onnx to paddle.") _logger.info("Now translating model from onnx to paddle.")
model = ONNXDecoder(model_path) model = ONNXDecoder(model_path, enable_onnx_checker)
mapper = ONNXOpMapper(model) mapper = ONNXOpMapper(model)
mapper.paddle_graph.build() mapper.paddle_graph.build()
graph_opt = GraphOptimizer(source_frame="onnx") graph_opt = GraphOptimizer(source_frame="onnx")
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册