experiments/STT-tensorflow
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #27988 from pranavm-nvidia:develop-pranavm-asymmetric-padding

Browse Source 
PiperOrigin-RevId: 245451093
This commit is contained in:
TensorFlower Gardener 2019-04-26 11:30:11 -07:00
commit ba4db912ec
1 changed files with 54 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
tensorflow/compiler/tf2tensorrt/convert/convert_nodes.cc
View File

@ -1969,6 +1969,10 @@ Status ConvertConv2DHelper(OpConverterParams* params, int group,
} else { } else {
padding = {{0, 0}, {0, 0}}; padding = {{0, 0}, {0, 0}};
} }
// TensorRT 5.1 added support for asymmetric padding. Due to a bug in 5.1.2, we
// can only use asymmetric padding in convolutions with 5.1.3+.
#if !IS_TRT_VERSION_GE(5, 1, 3, 0)
if (padding[0].first != padding[0].second || if (padding[0].first != padding[0].second ||
padding[1].first != padding[1].second) { padding[1].first != padding[1].second) {
// Handle asymmetric padding. // Handle asymmetric padding.
@ -1981,6 +1985,7 @@ Status ConvertConv2DHelper(OpConverterParams* params, int group,
padding = {{0, 0}, {0, 0}}; padding = {{0, 0}, {0, 0}};
tensor = pad_layer->getOutput(0); tensor = pad_layer->getOutput(0);
} }
#endif
// Add convolution. // Add convolution.
nvinfer1::ILayer* conv_layer = nullptr; nvinfer1::ILayer* conv_layer = nullptr;
@ -1991,7 +1996,23 @@ Status ConvertConv2DHelper(OpConverterParams* params, int group,
biases.GetTrtWeights()); biases.GetTrtWeights());
TFTRT_RETURN_ERROR_IF_NULLPTR(layer, node_def.name()); TFTRT_RETURN_ERROR_IF_NULLPTR(layer, node_def.name());
layer->setStride(stride); layer->setStride(stride);
layer->setPadding({padding[0].first, padding[1].first}); // TensorRT 5.1.3 added support for padding modes.
#if IS_TRT_VERSION_GE(5, 1, 3, 0)
if (attrs.get<string>("padding") == "SAME") {
VLOG(2) << "Using SAME padding";
// SAME_UPPER means that post padding is preferred.
layer->setPaddingMode(nvinfer1::PaddingMode::kSAME_UPPER);
}
// For VALID padding, we need to manually set the padding.
layer->setPrePadding(nvinfer1::DimsHW{padding[0].first, padding[1].first});
layer->setPostPadding(
nvinfer1::DimsHW{padding[0].second, padding[1].second});
VLOG(2) << "Set pre-padding to: " << DebugString(layer->getPrePadding())
<< " and post-padding to: " << DebugString(layer->getPostPadding());
#else
layer->setPadding(nvinfer1::DimsHW{padding[0].first, padding[1].first});
VLOG(2) << "Set padding to: " << DebugString(layer->getPadding());
#endif
layer->setName(node_def.name().c_str()); layer->setName(node_def.name().c_str());
layer->setNbGroups(num_groups); layer->setNbGroups(num_groups);
conv_layer = layer; conv_layer = layer;
@ -2002,7 +2023,20 @@ Status ConvertConv2DHelper(OpConverterParams* params, int group,
biases.GetTrtWeights()); biases.GetTrtWeights());
TFTRT_RETURN_ERROR_IF_NULLPTR(layer, node_def.name()); TFTRT_RETURN_ERROR_IF_NULLPTR(layer, node_def.name());
layer->setStride(stride); layer->setStride(stride);
layer->setPadding({padding[0].first, padding[1].first}); #if IS_TRT_VERSION_GE(5, 1, 3, 0)
if (attrs.get<string>("padding") == "SAME") {
VLOG(2) << "Using SAME padding";
layer->setPaddingMode(nvinfer1::PaddingMode::kSAME_UPPER);
}
layer->setPrePadding(nvinfer1::DimsHW{padding[0].first, padding[1].first});
layer->setPostPadding(
nvinfer1::DimsHW{padding[0].second, padding[1].second});
VLOG(2) << "Set pre-padding to: " << DebugString(layer->getPrePadding())
<< " and post-padding to: " << DebugString(layer->getPostPadding());
#else
layer->setPadding(nvinfer1::DimsHW{padding[0].first, padding[1].first});
VLOG(2) << "Set padding to: " << DebugString(layer->getPadding());
#endif
layer->setName(node_def.name().c_str()); layer->setName(node_def.name().c_str());
layer->setNbGroups(num_groups); layer->setNbGroups(num_groups);
layer->setDilation(dilation); layer->setDilation(dilation);
@ -2748,6 +2782,8 @@ Status ConvertPool(OpConverterParams* params) {
padding = {{0, 0}, {0, 0}}; padding = {{0, 0}, {0, 0}};
} }
// TensorRT 5.1 added support for asymmetric padding.
#if !IS_TRT_VERSION_GE(5, 1, 0, 0)
if (padding[0].first != padding[0].second || if (padding[0].first != padding[0].second ||
padding[1].first != padding[1].second) { padding[1].first != padding[1].second) {
VLOG(2) << "Padding!!!: " << padding[0].first << padding[0].second VLOG(2) << "Padding!!!: " << padding[0].first << padding[0].second
@ -2761,6 +2797,7 @@ Status ConvertPool(OpConverterParams* params) {
padding = {{0, 0}, {0, 0}}; padding = {{0, 0}, {0, 0}};
tensor = pad_layer->getOutput(0); tensor = pad_layer->getOutput(0);
} }
#endif
nvinfer1::IPoolingLayer* layer = nvinfer1::IPoolingLayer* layer =
params->converter->network()->addPooling(*tensor, type, ksize); params->converter->network()->addPooling(*tensor, type, ksize);
@ -2772,7 +2809,21 @@ Status ConvertPool(OpConverterParams* params) {
layer->getOutput(0)); layer->getOutput(0));
layer->setStride(stride); layer->setStride(stride);
layer->setPadding({padding[0].first, padding[1].first}); // TensorRT 5.1.3 added support for padding modes.
#if IS_TRT_VERSION_GE(5, 1, 3, 0)
if (attrs.get<string>("padding") == "SAME") {
// SAME_UPPER means that post padding is preferred.
layer->setPaddingMode(nvinfer1::PaddingMode::kSAME_UPPER);
}
#endif
// TensorRT 5.1 has support for asymmetric padding.
#if IS_TRT_VERSION_GE(5, 1, 0, 0)
// If padding mode is not SAME, then these values will be used instead.
layer->setPrePadding(nvinfer1::DimsHW{padding[0].first, padding[1].first});
layer->setPostPadding(nvinfer1::DimsHW{padding[0].second, padding[1].second});
#else
layer->setPadding(nvinfer1::DimsHW{padding[0].first, padding[1].first});
#endif
layer->setName(node_def.name().c_str()); layer->setName(node_def.name().c_str());
nvinfer1::ITensor* output_tensor = layer->getOutput(0); nvinfer1::ITensor* output_tensor = layer->getOutput(0);