Skip to content
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.

Sign up for GitHub

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

[PaddleTRT] Fixed bug in generating quantization calibration table for yolo_box #61596

Merged
merged 3 commits into from
Feb 5, 2024
Merged

[PaddleTRT] Fixed bug in generating quantization calibration table for yolo_box #61596

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6fd3b4e
修复yolov3量化表yolo_box的bug
lizexu123 Feb 4, 2024
c16f3e2
多写了
lizexu123 Feb 5, 2024
292bad6
修改
lizexu123 Feb 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions paddle/fluid/inference/tensorrt/convert/yolo_box_op.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,10 +49,13 @@ class YoloBoxOpConverter : public OpConverter {
? PADDLE_GET_CONST(float, op_desc.GetAttr("iou_aware_factor"))
: 0.5;

int type_id = static_cast<int>(engine_->WithFp16());
bool with_fp16 = engine_->WithFp16() && !engine_->disable_trt_plugin_fp16();
if (engine_->precision() == phi::DataType::INT8) {
with_fp16 = true;
}
auto input_dim = X_tensor->getDimensions();
auto* yolo_box_plugin = new plugin::YoloBoxPlugin(
type_id ? nvinfer1::DataType::kHALF : nvinfer1::DataType::kFLOAT,
with_fp16 ? nvinfer1::DataType::kHALF : nvinfer1::DataType::kFLOAT,
anchors,
class_num,
conf_thresh,
Expand Down
7 changes: 4 additions & 3 deletions paddle/fluid/inference/tensorrt/plugin/yolo_box_op_plugin.cu
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,10 @@
// See the License for the specific language governing permissions and
// limitations under the License.

#include "paddle/fluid/inference/tensorrt/plugin/yolo_box_op_plugin.h"
#include <algorithm>
#include <cassert>

#include "paddle/fluid/inference/tensorrt/plugin/yolo_box_op_plugin.h"

namespace paddle {
namespace inference {
namespace tensorrt {
Expand Down Expand Up @@ -102,7 +101,9 @@ nvinfer1::Dims YoloBoxPlugin::getOutputDimensions(

bool YoloBoxPlugin::supportsFormat(
nvinfer1::DataType type, nvinfer1::TensorFormat format) const TRT_NOEXCEPT {
return ((type == data_type_ || type == nvinfer1::DataType::kINT32) &&
return ((type == nvinfer1::DataType::kFLOAT ||
type == nvinfer1::DataType::kHALF ||
type == nvinfer1::DataType::kINT32) &&
format == nvinfer1::TensorFormat::kLINEAR);
}

Expand Down