Skip to content

Commit

Permalink
Cherry pick 43307 (#43618)
Browse files Browse the repository at this point in the history
* add bilinear_interp_v2 converter

* update op_teller.cc

* add unittest for bilinear_interp_v2 converter

* code format

* bug fix

* code format and add unittest

* remove merged modify in op_teller.cc

* code format

* code format

* fix scale init error
  • Loading branch information
ccrrong authored Jun 22, 2022
1 parent 90ae353 commit d0bbf46
Show file tree
Hide file tree
Showing 5 changed files with 361 additions and 0 deletions.
1 change: 1 addition & 0 deletions paddle/fluid/inference/api/analysis_predictor.cc
Original file line number Diff line number Diff line change
Expand Up @@ -1750,6 +1750,7 @@ USE_TRT_CONVERTER(multiclass_nms);
USE_TRT_CONVERTER(multiclass_nms3);
USE_TRT_CONVERTER(nearest_interp);
USE_TRT_CONVERTER(nearest_interp_v2);
USE_TRT_CONVERTER(bilinear_interp_v2);
USE_TRT_CONVERTER(reshape);
USE_TRT_CONVERTER(reduce_sum);
USE_TRT_CONVERTER(gather_nd);
Expand Down
1 change: 1 addition & 0 deletions paddle/fluid/inference/tensorrt/convert/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ nv_library(tensorrt_converter
shuffle_channel_op.cc swish_op.cc instance_norm_op.cc stack_op.cc transpose_op.cc flatten_op.cc flatten_contiguous_range_op.cc
emb_eltwise_layernorm.cc skip_layernorm.cc scale_op.cc slice_op.cc hard_sigmoid_op.cc hard_swish_op.cc clip_op.cc
gather_op.cc
bilinear_interp_v2_op.cc
anchor_generator_op.cc
yolo_box_op.cc
roi_align_op.cc
Expand Down
133 changes: 133 additions & 0 deletions paddle/fluid/inference/tensorrt/convert/bilinear_interp_v2_op.cc
Original file line number Diff line number Diff line change
@@ -0,0 +1,133 @@
/* 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/framework/data_layout.h"
#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 {

class BilinearInterpolateV2OpConverter : public OpConverter {
public:
void operator()(const framework::proto::OpDesc& op,
const framework::Scope& scope, bool test_mode) override {
VLOG(3) << "convert a fluid bilinear_interp_v2 op";

framework::OpDesc op_desc(op, nullptr);

std::string input_name = op_desc.Input("X").front();
std::string output_name = op_desc.Output("Out").front();

auto input = engine_->GetITensor(input_name);

auto data_layout = framework::StringToDataLayout(
BOOST_GET_CONST(std::string, op_desc.GetAttr("data_layout")));
auto interp_method =
BOOST_GET_CONST(std::string, op_desc.GetAttr("interp_method"));
bool align_corners =
BOOST_GET_CONST(bool, op_desc.GetAttr("align_corners"));
auto align_mode = BOOST_GET_CONST(int, op_desc.GetAttr("align_mode"));

auto resize_inputs = op_desc.Inputs();
auto input_names = op_desc.Input("X");
auto out_h = BOOST_GET_CONST(int, op_desc.GetAttr("out_h"));
auto out_w = BOOST_GET_CONST(int, op_desc.GetAttr("out_w"));

auto layer = TRT_ENGINE_ADD_LAYER(engine_, Resize, *input);
if (align_mode == 0 && !align_corners) {
layer->setResizeMode(nvinfer1::ResizeMode::kLINEAR);
}

auto in_dim = input->getDimensions();
float scale_h = -1.f;
float scale_w = -1.f;

// Scales Priority: Scale(tensor) > scale(attr) > out_d/out_h/out_w(attr)
bool has_scale_input_attr =
(resize_inputs.find("Scale") != resize_inputs.end());
bool has_scale_input =
has_scale_input_attr && (op_desc.Input("Scale").size() > 0);
if (has_scale_input) {
auto* scale_var = scope.FindVar(op_desc.Input("Scale")[0]);
auto* scale_tensor = scale_var->GetMutable<framework::LoDTensor>();
auto* scale_d = scale_tensor->data<float>();
scale_h = scale_d[0];
scale_w = scale_d[1];
} else {
const std::vector<float> scale_attr =
BOOST_GET_CONST(std::vector<float>, op_desc.GetAttr("scale"));
if (scale_attr.size() > 1) {
scale_h = scale_attr[0];
scale_w = scale_attr[1];
}
}

// axis are different in static/dynamic mode
bool with_dynamic = engine_->with_dynamic_shape();
int h_axis = (data_layout == framework::DataLayout::kNCHW) + with_dynamic;
int w_axis =
(data_layout == framework::DataLayout::kNCHW) + 1 + with_dynamic;

if (scale_w > 0. && scale_h > 0.) {
out_h = static_cast<int>(in_dim.d[h_axis] * scale_h);
out_w = static_cast<int>(in_dim.d[w_axis] * scale_w);
}

if (out_h > 0 && out_w > 0) {
scale_h =
static_cast<float>(out_h) / static_cast<float>(in_dim.d[h_axis]);
scale_w =
static_cast<float>(out_w) / static_cast<float>(in_dim.d[w_axis]);
}

std::vector<float> scales;

if (engine_->with_dynamic_shape()) {
scales.push_back(1.f);
}

if (data_layout == framework::DataLayout::kNCHW) {
scales.push_back(1.f);
scales.push_back(scale_h);
scales.push_back(scale_w);
} else if (data_layout == framework::DataLayout::kNHWC) {
scales.push_back(scale_h);
scales.push_back(scale_w);
scales.push_back(1.f);
} else {
PADDLE_THROW(platform::errors::InvalidArgument(
"Data layout must be NCHW or NHWC."));
}

layer->setScales(scales.data(), scales.size());
RreplenishLayerAndOutput(layer, "bilinear_interp_v2", {output_name},
test_mode);
}
};

} // namespace tensorrt
} // namespace inference
} // namespace paddle

REGISTER_TRT_OP_CONVERTER(bilinear_interp_v2, BilinearInterpolateV2OpConverter);
97 changes: 97 additions & 0 deletions paddle/fluid/inference/tensorrt/op_teller.cc
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,9 @@
// limitations under the License.

#include "paddle/fluid/inference/tensorrt/op_teller.h"

#include <bitset>

#include "paddle/fluid/framework/block_desc.h"
#include "paddle/fluid/framework/data_layout.h"

Expand Down Expand Up @@ -108,6 +110,7 @@ struct SimpleOpTypeSetTeller : public Teller {
"conv3d_transpose",
"mish",
"nearest_interp_v2",
"bilinear_interp_v2",
"pool3d",
"deformable_conv",
"relu6",
Expand Down Expand Up @@ -170,6 +173,7 @@ struct SimpleOpTypeSetTeller : public Teller {
"conv3d",
"conv3d_transpose",
"mish",
"bilinear_interp_v2",
"nearest_interp_v2",
"pool3d",
"deformable_conv",
Expand Down Expand Up @@ -770,6 +774,99 @@ bool OpTeller::Tell(const framework::ir::Node* node, bool use_no_calib_int8,
}
}

if (op_type == "bilinear_interp_v2") {
std::vector<std::string> attrs{"data_layout", "interp_method",
"align_corners", "scale",
"out_h", "out_w"};
for (auto const attr : attrs) {
if (!desc.HasAttr(attr)) {
VLOG(3) << "The op_type " << op_type << " doesn't have the attr "
<< attr << " and return false";
return false;
}
}

auto resize_inputs = desc.Inputs();
if (resize_inputs.find("SizeTensor") != resize_inputs.end()) {
if (desc.Input("SizeTensor").size() >= 1) {
VLOG(3)
<< "The Paddle-TRT doesn't support the SizeTensor for op_type "
<< op_type;
return false;
}
}

if (resize_inputs.find("OutSize") != resize_inputs.end()) {
if (desc.Input("OutSize").size() >= 1) {
VLOG(3) << "The Paddle-TRT doesn't support the OutSize for op_type "
<< op_type;
return false;
}
}

auto data_layout = framework::StringToDataLayout(
BOOST_GET_CONST(std::string, desc.GetAttr("data_layout")));
if (data_layout != framework::DataLayout::kNCHW &&
data_layout != framework::DataLayout::kNHWC) {
VLOG(3) << "The op_type " << op_type
<< " is not NCHW or NHWC return false";
return false;
}
auto interp_method =
BOOST_GET_CONST(std::string, desc.GetAttr("interp_method"));
if (interp_method != "bilinear") {
VLOG(3) << "The interp_method of op_type " << op_type
<< " is not bilinear";
return false;
}

auto align_corners = BOOST_GET_CONST(bool, desc.GetAttr("align_corners"));
if (align_corners != false) {
VLOG(3)
<< "The bilinear_interp_v2 only supports align_corners with false.";
return false;
}

bool has_scale_input_size =
(resize_inputs.find("Scale") != resize_inputs.end());

if (has_scale_input_size && desc.Input("Scale").size() != 1) {
const std::vector<float> scale =
BOOST_GET_CONST(std::vector<float>, desc.GetAttr("scale"));
if (scale.size() <= 1) {
if (!desc.HasAttr("out_h") || !desc.HasAttr("out_w")) {
VLOG(3) << "The op_type " << op_type
<< " doesn't have Scale and the scale size <=1 and without "
"out_h / out_w, it will return false";
return false;
}
auto out_h = BOOST_GET_CONST(int, desc.GetAttr("out_h"));
auto out_w = BOOST_GET_CONST(int, desc.GetAttr("out_w"));
if (!(out_h <= 0 && out_w <= 0)) {
if (out_h <= 0) {
VLOG(3) << "The op_type " << op_type
<< "'s out_h must be greater than 0 if scale is not set.";
return false;
}
if (out_w <= 0) {
VLOG(3) << "The op_type " << op_type
<< "'s out_w must be greater than 0 if scale is not set.";
return false;
}
}
} else {
for (size_t i = 0; i < scale.size(); i++) {
if (scale[i] <= 0 && with_dynamic_shape) {
VLOG(3) << "dynamic shape not support Attr(scale[" << i << "]) "
<< scale[i]
<< " less than 1 and Input(Scale) vector not set.";
return false;
}
}
}
}
}

if (op_type == "hard_swish") {
if (desc.Input("X").size() != 1) {
VLOG(3) << "HardSwish op has only 1 input, but got "
Expand Down
Loading

0 comments on commit d0bbf46

Please sign in to comment.