-
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-TRT] add flip op #55688
Merged
Merged
[Paddle-TRT] add flip op #55688
Changes from all commits
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
3e67cb2
[Paddle-TRT] add flip op
ming1753 b78c177
modify text info
ming1753 69864a7
remove test on int type
ming1753 b549c64
increase test workspace size
ming1753 a8c1fbb
increase test workspace size
ming1753 150706a
delete attribute filter
ming1753 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,83 @@ | ||
/* Copyright (c) 2023 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 inference { | ||
namespace tensorrt { | ||
|
||
class FlipOpConverter : public OpConverter { | ||
public: | ||
void operator()(const framework::proto::OpDesc& op, | ||
const framework::Scope& scope, | ||
bool test_mode) override { | ||
VLOG(4) << "convert a flip op to tensorrt layer"; | ||
|
||
framework::OpDesc op_desc(op, nullptr); | ||
// Declare inputs | ||
auto* input = engine_->GetITensor(op_desc.Input("X")[0]); | ||
auto input_dims = input->getDimensions(); | ||
|
||
// Get Attrs | ||
std::vector<int> axis = | ||
PADDLE_GET_CONST(std::vector<int>, op_desc.GetAttr("axis")); | ||
for (size_t i = 0; i < axis.size(); ++i) { | ||
axis[i] += (axis[i] < 0) ? input_dims.nbDims : 0; | ||
} | ||
|
||
nvinfer1::ITensor* shape_tensor = Shape(input); | ||
// getAxisLength default is a scalar | ||
auto getAxisLength = [&](int axis, bool scalar = true) { | ||
int d = input_dims.d[axis]; | ||
if (d >= 0) { | ||
return Add1DConstantLayer(d, "", scalar); | ||
} else { | ||
return GetEleTensorOfShape(shape_tensor, axis, scalar); | ||
} | ||
}; | ||
for (size_t i = 0; i < axis.size(); ++i) { | ||
auto loop = TRT_ENGINE_ADD_LAYER(engine_, Loop); | ||
nvinfer1::ITensor* tripLimit = getAxisLength(axis[i]); | ||
loop->addTripLimit(*tripLimit, nvinfer1::TripLimit::kCOUNT); | ||
auto iterator = loop->addIterator(*input, axis[i], true); | ||
std::vector<int32_t> zero_vec{0}; | ||
std::vector<int32_t> one_vec{1}; | ||
auto zero = Add1DConstantLayer(zero_vec); | ||
auto one = Add1DConstantLayer(one_vec); | ||
nvinfer1::IRecurrenceLayer* iRec = loop->addRecurrence(*zero); | ||
nvinfer1::ITensor* iCur = iRec->getOutput(0); | ||
auto iNext = TRT_ENGINE_ADD_LAYER(engine_, | ||
ElementWise, | ||
*iCur, | ||
*one, | ||
nvinfer1::ElementWiseOperation::kSUM); | ||
iRec->setInput(1, *iNext->getOutput(0)); | ||
nvinfer1::ILoopOutputLayer* loopOut = loop->addLoopOutput( | ||
*iterator->getOutput(0), nvinfer1::LoopOutput::kCONCATENATE, axis[i]); | ||
loopOut->setInput(1, *tripLimit); | ||
input = loopOut->getOutput(0); | ||
} | ||
|
||
auto* layer = TRT_ENGINE_ADD_LAYER(engine_, Identity, *input); | ||
auto output_name = op_desc.Output("Out")[0]; | ||
RreplenishLayerAndOutput(layer, "flip", {output_name}, test_mode); | ||
} | ||
}; | ||
|
||
} // namespace tensorrt | ||
} // namespace inference | ||
} // namespace paddle | ||
|
||
REGISTER_TRT_OP_CONVERTER(flip, FlipOpConverter); |
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,140 @@ | ||
# Copyright (c) 2023 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. | ||
|
||
import unittest | ||
from functools import partial | ||
from typing import List | ||
|
||
import numpy as np | ||
from program_config import ProgramConfig, TensorConfig | ||
from trt_layer_auto_scan_test import TrtLayerAutoScanTest | ||
|
||
import paddle.inference as paddle_infer | ||
|
||
|
||
class TrtConvertFlipTest(TrtLayerAutoScanTest): | ||
def is_program_valid(self, program_config: ProgramConfig) -> bool: | ||
ver = paddle_infer.get_trt_compile_version() | ||
if ver[0] * 1000 + ver[1] * 100 + ver[2] * 10 < 7220: | ||
return False | ||
return True | ||
|
||
def sample_program_configs(self): | ||
def generate_input(batch): | ||
if self.dims == 4: | ||
return np.random.random([batch, 3, 3, 24]).astype(np.float32) | ||
elif self.dims == 3: | ||
return np.random.random([batch, 3, 24]).astype(np.float32) | ||
elif self.dims == 2: | ||
return np.random.random([batch, 24]).astype(np.float32) | ||
elif self.dims == 1: | ||
return np.random.random([24]).astype(np.int32) | ||
|
||
def generate_axis(): | ||
return np.arange(self.dims).tolist() | ||
|
||
for dims in [2, 3, 4]: | ||
for batch in [3, 6, 9]: | ||
self.dims = dims | ||
axis = generate_axis() | ||
ops_config = [ | ||
{ | ||
"op_type": "flip", | ||
"op_inputs": { | ||
"X": ["input_data"], | ||
}, | ||
"op_outputs": {"Out": ["output_data"]}, | ||
"op_attrs": {"axis": axis}, | ||
} | ||
] | ||
ops = self.generate_op_config(ops_config) | ||
|
||
program_config = ProgramConfig( | ||
ops=ops, | ||
weights={}, | ||
inputs={ | ||
"input_data": TensorConfig( | ||
data_gen=partial(generate_input, 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 == 4: | ||
self.dynamic_shape.min_input_shape = { | ||
"input_data": [1, 3 - 1, 3 - 1, 24 - 1] | ||
} | ||
self.dynamic_shape.max_input_shape = { | ||
"input_data": [9, 3 + 1, 3 + 1, 24 + 1] | ||
} | ||
self.dynamic_shape.opt_input_shape = { | ||
"input_data": [1, 3, 3, 24] | ||
} | ||
elif self.dims == 3: | ||
self.dynamic_shape.min_input_shape = { | ||
"input_data": [1, 3 - 1, 24 - 1] | ||
} | ||
self.dynamic_shape.max_input_shape = { | ||
"input_data": [9, 3 + 1, 24 + 1] | ||
} | ||
self.dynamic_shape.opt_input_shape = {"input_data": [1, 3, 24]} | ||
elif self.dims == 2: | ||
self.dynamic_shape.min_input_shape = {"input_data": [1, 24]} | ||
self.dynamic_shape.max_input_shape = {"input_data": [9, 24]} | ||
self.dynamic_shape.opt_input_shape = {"input_data": [1, 24]} | ||
elif self.dims == 1: | ||
self.dynamic_shape.min_input_shape = {"input_data": [24 - 1]} | ||
self.dynamic_shape.max_input_shape = {"input_data": [24 + 1]} | ||
self.dynamic_shape.opt_input_shape = {"input_data": [24]} | ||
|
||
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): | ||
ver = paddle_infer.get_trt_compile_version() | ||
if ver[0] * 1000 + ver[1] * 100 + ver[2] * 10 < 7220: | ||
return 0, 3 | ||
return 1, 2 | ||
|
||
attrs = [ | ||
program_config.ops[i].attrs for i in range(len(program_config.ops)) | ||
] | ||
self.trt_param.max_batch_size = 9 | ||
self.trt_param.workspace_size = 1073741824 | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. 这个没必要开这么大吧 |
||
|
||
# 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-3 | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. 这个阈值用默认的,没必要放大 |
||
|
||
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.
原生op定义中,axis 可以是 int也可以是list(vector),这里看起来只考虑了list 的情况?
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.
原生op通过在python源代码中转成list支持int,convert时候只能拿到vector