From 37b234b33e0a259451794aceb5099b956ffde8c5 Mon Sep 17 00:00:00 2001 From: jiweibo Date: Tue, 24 Aug 2021 07:49:13 +0000 Subject: [PATCH 1/2] fix some problem --- .../fluid/tests/unittests/ir/inference/program_config.py | 7 +++++-- .../unittests/ir/inference/trt_layer_auto_scan_test.py | 6 ++++++ 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/python/paddle/fluid/tests/unittests/ir/inference/program_config.py b/python/paddle/fluid/tests/unittests/ir/inference/program_config.py index 6b465f4b2aff32..e570796c36a374 100644 --- a/python/paddle/fluid/tests/unittests/ir/inference/program_config.py +++ b/python/paddle/fluid/tests/unittests/ir/inference/program_config.py @@ -137,8 +137,11 @@ def create_fake_model(program_config): op_desc._set_attr(name, values) for name, values in op_config.outputs.items(): op_desc.set_output(name, values) - var_desc = main_block_desc.var(cpt.to_bytes(name)) - var_desc.set_type(core.VarDesc.VarType.LOD_TENSOR) + for v in values: + var_desc = main_block_desc.var(cpt.to_bytes(v)) + var_desc.set_type(core.VarDesc.VarType.LOD_TENSOR) + var_desc.set_dtype( + convert_np_dtype_to_dtype_(tensor_config.dtype)) op_desc.infer_var_type(main_block_desc) op_desc.infer_shape(main_block_desc) diff --git a/python/paddle/fluid/tests/unittests/ir/inference/trt_layer_auto_scan_test.py b/python/paddle/fluid/tests/unittests/ir/inference/trt_layer_auto_scan_test.py index bf6fc7a24a3635..f6bea12beec91c 100644 --- a/python/paddle/fluid/tests/unittests/ir/inference/trt_layer_auto_scan_test.py +++ b/python/paddle/fluid/tests/unittests/ir/inference/trt_layer_auto_scan_test.py @@ -100,6 +100,12 @@ def sample_program_configs(self): attrs=op_attr)) self.update_program_input_and_weight_with_attr(op_attr_list) + # if no weight need to save, we create a place_holder to help seriazlie params. + if not self.program_weights: + self.program_weights = { + "place_holder_weight": TensorConfig( + shape=[1], data=np.array(1).astype(np.float32)) + } program_config = ProgramConfig( ops=ops, weights=self.program_weights, From 28cba11374331a1582921afdfdccee7726ee711a Mon Sep 17 00:00:00 2001 From: jiweibo Date: Tue, 24 Aug 2021 08:11:01 +0000 Subject: [PATCH 2/2] update --- .../tests/unittests/ir/inference/trt_layer_auto_scan_test.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/python/paddle/fluid/tests/unittests/ir/inference/trt_layer_auto_scan_test.py b/python/paddle/fluid/tests/unittests/ir/inference/trt_layer_auto_scan_test.py index f6bea12beec91c..90e69a9fce3399 100644 --- a/python/paddle/fluid/tests/unittests/ir/inference/trt_layer_auto_scan_test.py +++ b/python/paddle/fluid/tests/unittests/ir/inference/trt_layer_auto_scan_test.py @@ -104,7 +104,7 @@ def sample_program_configs(self): if not self.program_weights: self.program_weights = { "place_holder_weight": TensorConfig( - shape=[1], data=np.array(1).astype(np.float32)) + shape=[1], data=np.array([1]).astype(np.float32)) } program_config = ProgramConfig( ops=ops,