diff --git a/test_benchmark/PyTorch/GRU/deploy_infer.py b/test_benchmark/PyTorch/GRU/deploy_infer.py index 85dfe0f9b..b248e6747 100644 --- a/test_benchmark/PyTorch/GRU/deploy_infer.py +++ b/test_benchmark/PyTorch/GRU/deploy_infer.py @@ -4,7 +4,6 @@ import numpy as np import paddle -import paddle.fluid as fluid from paddle.inference import Config from paddle.inference import create_predictor diff --git a/test_benchmark/PyTorch/GRU/pd_infer.py b/test_benchmark/PyTorch/GRU/pd_infer.py index fa7d1b49b..30904601b 100644 --- a/test_benchmark/PyTorch/GRU/pd_infer.py +++ b/test_benchmark/PyTorch/GRU/pd_infer.py @@ -1,5 +1,4 @@ from __future__ import print_function -import paddle.fluid as fluid import paddle import sys import os @@ -14,11 +13,8 @@ # trace paddle.enable_static() exe = paddle.static.Executor(paddle.CPUPlace()) - [prog, inputs, outputs] = fluid.io.load_inference_model( - dirname="pd_model_trace/inference_model/", - executor=exe, - model_filename="model.pdmodel", - params_filename="model.pdiparams") + [prog, inputs, outputs] = paddle.static.load_inference_model( + path_prefix="pd_model_trace/inference_model/model", executor=exe) result = exe.run(prog, feed={inputs[0]: input_data}, fetch_list=outputs) abs_diff = np.max(np.abs(pytorch_result - result[0])) print(abs_diff) diff --git a/test_benchmark/PyTorch/black.list b/test_benchmark/PyTorch/black.list index df67cb92b..cf6458c25 100644 --- a/test_benchmark/PyTorch/black.list +++ b/test_benchmark/PyTorch/black.list @@ -4,7 +4,6 @@ CamembertForQuestionAnswering DPRContextEncoder EasyOCR_detector EasyOCR_recognizer -GRU MiniFasNet MockingBird Roberta diff --git a/x2paddle/op_mapper/pytorch2paddle/aten.py b/x2paddle/op_mapper/pytorch2paddle/aten.py index 186b901a6..5254d6109 100755 --- a/x2paddle/op_mapper/pytorch2paddle/aten.py +++ b/x2paddle/op_mapper/pytorch2paddle/aten.py @@ -4198,6 +4198,10 @@ def aten_norm(mapper, graph, node): return current_inputs, current_outputs +# pytorch has one more param: `dtype`, which is not used. +aten_linalg_vector_norm = aten_norm + + def aten___not__(mapper, graph, node): """ 构造对bool型取负的PaddleLayer。 TorchScript示例: