-
Notifications
You must be signed in to change notification settings - Fork 5.7k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
[Paddle Inference] Add where trt converter #47820
Merged
jiweibo
merged 8 commits into
PaddlePaddle:develop
from
xiaoxiaohehe001:add_where_layer
Nov 14, 2022
Merged
Changes from 6 commits
Commits
Show all changes
8 commits
Select commit
Hold shift + click to select a range
8686d1a
add_where_layer
xiaoxiaohehe001 3657d15
add_where_layer
xiaoxiaohehe001 c308502
add_where_layer
xiaoxiaohehe001 315cd92
add_where_layer
xiaoxiaohehe001 df8f8bb
add_where_layer
xiaoxiaohehe001 5ff3fcc
add_where_layer
xiaoxiaohehe001 b6009c3
add_where_layer
xiaoxiaohehe001 8410196
add_where_layer
xiaoxiaohehe001 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,62 @@ | ||
/* Copyright (c) 2022 PaddlePaddle Authors. All Rights Reserved. | ||
|
||
Licensed under the Apache License, Version 2.0 (the "License"); | ||
you may not use this file except in compliance with the License. | ||
You may obtain a copy of the License at | ||
|
||
http://www.apache.org/licenses/LICENSE-2.0 | ||
|
||
Unless required by applicable law or agreed to in writing, software | ||
distributed under the License is distributed on an "AS IS" BASIS, | ||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
See the License for the specific language governing permissions and | ||
limitations under the License. */ | ||
|
||
#include "paddle/fluid/inference/tensorrt/convert/op_converter.h" | ||
|
||
namespace paddle { | ||
namespace framework { | ||
class Scope; | ||
|
||
namespace proto { | ||
class OpDesc; | ||
} // namespace proto | ||
} // namespace framework | ||
} // namespace paddle | ||
|
||
namespace paddle { | ||
namespace inference { | ||
namespace tensorrt { | ||
|
||
/* | ||
* Where Op | ||
*/ | ||
class WhereOpConverter : public OpConverter { | ||
public: | ||
void operator()(const framework::proto::OpDesc& op, | ||
const framework::Scope& scope, | ||
bool test_mode) override { | ||
VLOG(3) << "convert a fluid where op to tensorrt where layer"; | ||
|
||
framework::OpDesc op_desc(op, nullptr); | ||
std::string input_x_name = op_desc.Input("X").front(); | ||
std::string condition_name = op_desc.Input("Condition").front(); | ||
std::string input_y_name = op_desc.Input("Y").front(); | ||
std::string output_name = op_desc.Output("Out").front(); | ||
|
||
const auto input_x_tensor = engine_->GetITensor(input_x_name); | ||
const auto condition_tensor = engine_->GetITensor(condition_name); | ||
const auto input_y_tensor = engine_->GetITensor(input_y_name); | ||
|
||
auto layer = TRT_ENGINE_ADD_LAYER( | ||
engine_, Select, *condition_tensor, *input_x_tensor, *input_y_tensor); | ||
|
||
RreplenishLayerAndOutput(layer, "where", {output_name}, test_mode); | ||
} | ||
}; | ||
|
||
} // namespace tensorrt | ||
} // namespace inference | ||
} // namespace paddle | ||
|
||
REGISTER_TRT_OP_CONVERTER(where, WhereOpConverter); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
228 changes: 228 additions & 0 deletions
228
python/paddle/fluid/tests/unittests/ir/inference/test_trt_convert_where.py
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,228 @@ | ||
# Copyright (c) 2022 PaddlePaddle Authors. All Rights Reserved. | ||
# | ||
# Licensed under the Apache License, Version 2.0 (the "License"); | ||
# you may not use this file except in compliance with the License. | ||
# You may obtain a copy of the License at | ||
# | ||
# http://www.apache.org/licenses/LICENSE-2.0 | ||
# | ||
# Unless required by applicable law or agreed to in writing, software | ||
# distributed under the License is distributed on an "AS IS" BASIS, | ||
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
# See the License for the specific language governing permissions and | ||
# limitations under the License. | ||
|
||
from trt_layer_auto_scan_test import TrtLayerAutoScanTest | ||
from program_config import TensorConfig, ProgramConfig | ||
import unittest | ||
import numpy as np | ||
import paddle.inference as paddle_infer | ||
from functools import partial | ||
from typing import List | ||
|
||
|
||
class TrtConvertActivationTest(TrtLayerAutoScanTest): | ||
def is_program_valid(self, program_config: ProgramConfig) -> bool: | ||
return True | ||
|
||
def sample_program_configs(self): | ||
self.trt_param.workspace_size = 1073741824 | ||
|
||
def generate_input1(dims, batch): | ||
if dims == 1: | ||
return np.zeros((batch)).astype(np.float32) | ||
elif dims == 2: | ||
return np.ones((batch, 4)).astype(np.float32) | ||
elif dims == 3: | ||
return np.ones((batch, 4, 6)).astype(np.float32) | ||
else: | ||
return np.ones((batch, 4, 6, 8)).astype(np.float32) | ||
|
||
def generate_input2(dims, batch): | ||
if dims == 1: | ||
return np.zeros((batch)).astype(np.float32) | ||
elif dims == 2: | ||
return np.ones((batch, 4)).astype(np.float32) | ||
elif dims == 3: | ||
return np.ones((batch, 4, 6)).astype(np.float32) | ||
else: | ||
return np.ones((batch, 4, 6, 8)).astype(np.float32) | ||
|
||
def generate_input3(dims, batch): | ||
if dims == 1: | ||
return np.zeros((batch)).astype(np.float32) | ||
elif dims == 2: | ||
return np.ones((batch, 4)).astype(np.float32) | ||
elif dims == 3: | ||
return np.ones((batch, 4, 6)).astype(np.float32) | ||
else: | ||
return np.ones((batch, 4, 6, 8)).astype(np.float32) | ||
|
||
for dims in [1, 2, 3, 4]: | ||
for batch in [1, 2]: | ||
self.dims = dims | ||
dics = [{}] | ||
ops_config = [ | ||
{ | ||
"op_type": "cast", | ||
"op_inputs": {"X": ["condition_data"]}, | ||
"op_outputs": {"Out": ["condition_data_bool"]}, | ||
"op_attrs": {"in_dtype": 5, "out_dtype": 0}, | ||
"outputs_dtype": {"condition_data_bool": np.bool}, | ||
}, | ||
{ | ||
"op_type": "where", | ||
"op_inputs": { | ||
"Condition": ["condition_data_bool"], | ||
"X": ["input_x_data"], | ||
"Y": ["input_y_data"], | ||
}, | ||
"op_outputs": {"Out": ["output_data"]}, | ||
"op_attrs": dics[0], | ||
"outputs_dtype": {"condition_data_bool": np.bool}, | ||
}, | ||
] | ||
ops = self.generate_op_config(ops_config) | ||
|
||
program_config = ProgramConfig( | ||
ops=ops, | ||
weights={}, | ||
inputs={ | ||
"condition_data": TensorConfig( | ||
data_gen=partial(generate_input1, dims, batch) | ||
), | ||
"input_x_data": TensorConfig( | ||
data_gen=partial(generate_input2, dims, batch) | ||
), | ||
"input_y_data": TensorConfig( | ||
data_gen=partial(generate_input3, dims, batch) | ||
), | ||
}, | ||
outputs=["output_data"], | ||
) | ||
|
||
yield program_config | ||
|
||
def sample_predictor_configs( | ||
self, program_config | ||
) -> (paddle_infer.Config, List[int], float): | ||
def generate_dynamic_shape(attrs): | ||
if self.dims == 1: | ||
self.dynamic_shape.min_input_shape = { | ||
"condition_data": [1], | ||
"condition_data_bool": [1], | ||
"input_x_data": [1], | ||
"input_y_data": [1], | ||
} | ||
self.dynamic_shape.max_input_shape = { | ||
"condition_data": [2], | ||
"condition_data_bool": [2], | ||
"input_x_data": [2], | ||
"input_y_data": [2], | ||
} | ||
self.dynamic_shape.opt_input_shape = { | ||
"condition_data": [1], | ||
"condition_data_bool": [1], | ||
"input_x_data": [1], | ||
"input_y_data": [1], | ||
} | ||
elif self.dims == 2: | ||
self.dynamic_shape.min_input_shape = { | ||
"condition_data": [1, 4], | ||
"condition_data_bool": [1, 4], | ||
"input_x_data": [1, 4], | ||
"input_y_data": [1, 4], | ||
} | ||
self.dynamic_shape.max_input_shape = { | ||
"condition_data": [2, 4], | ||
"condition_data_bool": [2, 4], | ||
"input_x_data": [2, 4], | ||
"input_y_data": [2, 4], | ||
} | ||
self.dynamic_shape.opt_input_shape = { | ||
"condition_data": [1, 4], | ||
"condition_data_bool": [1, 4], | ||
"input_x_data": [1, 4], | ||
"input_y_data": [1, 4], | ||
} | ||
elif self.dims == 3: | ||
self.dynamic_shape.min_input_shape = { | ||
"condition_data": [1, 4, 6], | ||
"condition_data_bool": [1, 4, 6], | ||
"input_x_data": [1, 4, 6], | ||
"input_y_data": [1, 4, 6], | ||
} | ||
self.dynamic_shape.max_input_shape = { | ||
"condition_data": [2, 4, 6], | ||
"condition_data_bool": [2, 4, 6], | ||
"input_x_data": [2, 4, 6], | ||
"input_y_data": [2, 4, 6], | ||
} | ||
self.dynamic_shape.opt_input_shape = { | ||
"condition_data": [1, 4, 6], | ||
"condition_data_bool": [1, 4, 6], | ||
"input_x_data": [1, 4, 6], | ||
"input_y_data": [1, 4, 6], | ||
} | ||
elif self.dims == 4: | ||
self.dynamic_shape.min_input_shape = { | ||
"condition_data": [1, 4, 6, 8], | ||
"condition_data_bool": [1, 4, 6, 8], | ||
"input_x_data": [1, 4, 6, 8], | ||
"input_y_data": [1, 4, 6, 8], | ||
} | ||
self.dynamic_shape.max_input_shape = { | ||
"condition_data": [2, 4, 6, 8], | ||
"condition_data_bool": [2, 4, 6, 8], | ||
"input_x_data": [2, 4, 6, 8], | ||
"input_y_data": [2, 4, 6, 8], | ||
} | ||
self.dynamic_shape.opt_input_shape = { | ||
"condition_data": [1, 4, 6, 8], | ||
"condition_data_bool": [1, 4, 6, 8], | ||
"input_x_data": [1, 4, 6, 8], | ||
"input_y_data": [1, 4, 6, 8], | ||
} | ||
|
||
def clear_dynamic_shape(): | ||
self.dynamic_shape.min_input_shape = {} | ||
self.dynamic_shape.max_input_shape = {} | ||
self.dynamic_shape.opt_input_shape = {} | ||
|
||
def generate_trt_nodes_num(attrs, dynamic_shape): | ||
if not dynamic_shape: | ||
return 0, 6 | ||
return 1, 5 | ||
|
||
attrs = [ | ||
program_config.ops[i].attrs for i in range(len(program_config.ops)) | ||
] | ||
|
||
# for static_shape | ||
clear_dynamic_shape() | ||
self.trt_param.precision = paddle_infer.PrecisionType.Float32 | ||
yield self.create_inference_config(), generate_trt_nodes_num( | ||
attrs, False | ||
), 1e-5 | ||
self.trt_param.precision = paddle_infer.PrecisionType.Half | ||
yield self.create_inference_config(), generate_trt_nodes_num( | ||
attrs, False | ||
), 1e-5 | ||
|
||
# for dynamic_shape | ||
generate_dynamic_shape(attrs) | ||
self.trt_param.precision = paddle_infer.PrecisionType.Float32 | ||
yield self.create_inference_config(), generate_trt_nodes_num( | ||
attrs, True | ||
), 1e-5 | ||
self.trt_param.precision = paddle_infer.PrecisionType.Half | ||
yield self.create_inference_config(), generate_trt_nodes_num( | ||
attrs, True | ||
), 1e-5 | ||
|
||
def test(self): | ||
self.run_test() | ||
|
||
|
||
if __name__ == "__main__": | ||
unittest.main() |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
cast是不是也和这个有关