Skip to content

Commit d217614

Browse files
committed
update
1 parent 7c9188a commit d217614

File tree

2 files changed

+41
-47
lines changed

2 files changed

+41
-47
lines changed

paddle/fluid/inference/tensorrt/convert/linear_interp_v2_op.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ class LinearInterpolateV2OpConverter : public OpConverter {
7474
auto* scale_var = scope.FindVar(op_desc.Input("Scale")[0]);
7575
auto* scale_tensor = scale_var->GetMutable<phi::DenseTensor>();
7676
auto* scale_d = scale_tensor->data<float>();
77-
scale_w = scale_d[1];
77+
scale_w = scale_d[0];
7878
} else {
7979
const std::vector<float> scale_attr =
8080
PADDLE_GET_CONST(std::vector<float>, op_desc.GetAttr("scale"));

test/ir/inference/test_trt_convert_linear_interp_v2.py

Lines changed: 40 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -50,51 +50,47 @@ def generate_input2(attrs: list[dict[str, Any]]):
5050

5151
for data_layout in ["NCHW", "NHWC"]:
5252
for align_corners in [False, True]:
53-
for scale_x in [2.0]:
54-
scale = [scale_x]
55-
dics = [
56-
{
57-
"data_layout": data_layout,
58-
"interp_method": "linear",
59-
"align_corners": align_corners,
60-
"align_mode": 0,
61-
"scale": scale,
62-
"out_h": -1,
63-
"out_w": -1,
64-
}
65-
]
66-
67-
ops_config = [
68-
{
69-
"op_type": "linear_interp_v2",
70-
"op_inputs": {
71-
"X": ["input_data"],
72-
"Scale": ["input_scale"],
73-
},
74-
"op_outputs": {
75-
"Out": ["linear_interp_v2_output_data"]
76-
},
77-
"op_attrs": dics[0],
78-
}
79-
]
80-
ops = self.generate_op_config(ops_config)
81-
82-
program_config = ProgramConfig(
83-
ops=ops,
84-
weights={
85-
"input_scale": TensorConfig(
86-
data_gen=partial(generate_input2, dics)
87-
)
53+
dics = [
54+
{
55+
"data_layout": data_layout,
56+
"interp_method": "linear",
57+
"align_corners": align_corners,
58+
"align_mode": 0,
59+
"scale": [],
60+
"out_h": -1,
61+
"out_w": -1,
62+
}
63+
]
64+
65+
ops_config = [
66+
{
67+
"op_type": "linear_interp_v2",
68+
"op_inputs": {
69+
"X": ["input_data"],
70+
"Scale": ["input_scale"],
8871
},
89-
inputs={
90-
"input_data": TensorConfig(
91-
data_gen=partial(generate_input1, dics)
92-
)
93-
},
94-
outputs=["linear_interp_v2_output_data"],
95-
)
96-
97-
yield program_config
72+
"op_outputs": {"Out": ["linear_interp_v2_output_data"]},
73+
"op_attrs": dics[0],
74+
}
75+
]
76+
ops = self.generate_op_config(ops_config)
77+
78+
program_config = ProgramConfig(
79+
ops=ops,
80+
weights={
81+
"input_scale": TensorConfig(
82+
data_gen=partial(generate_input2, dics)
83+
)
84+
},
85+
inputs={
86+
"input_data": TensorConfig(
87+
data_gen=partial(generate_input1, dics)
88+
)
89+
},
90+
outputs=["linear_interp_v2_output_data"],
91+
)
92+
93+
yield program_config
9894

9995
def sample_predictor_configs(
10096
self, program_config
@@ -124,7 +120,6 @@ def generate_trt_nodes_num(attrs, dynamic_shape):
124120
attrs, False
125121
), 1e-5
126122
self.trt_param.precision = paddle_infer.PrecisionType.Half
127-
program_config.set_input_type(np.float16)
128123
yield self.create_inference_config(), generate_trt_nodes_num(
129124
attrs, False
130125
), 1e-2
@@ -235,7 +230,6 @@ def generate_trt_nodes_num(attrs, dynamic_shape):
235230
attrs, False
236231
), 1e-5
237232
self.trt_param.precision = paddle_infer.PrecisionType.Half
238-
program_config.set_input_type(np.float16)
239233
yield self.create_inference_config(), generate_trt_nodes_num(
240234
attrs, False
241235
), 1e-2

0 commit comments

Comments
 (0)