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

Disable ISliceLayer in TRT 5.1 until the bug is fixed.

Browse Source 
PiperOrigin-RevId: 237892535
This commit is contained in:
Guangda Lai 2019-03-11 15:11:18 -07:00 committed by TensorFlower Gardener
parent 73cdb00c26
commit 67759c1a25
1 changed files with 30 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -311,31 +311,31 @@ Status Converter::GetTrtBroadcastShape(
} }
const int max_nb_dims = nvinfer1::Dims::MAX_DIMS + 1; const int max_nb_dims = nvinfer1::Dims::MAX_DIMS + 1;
auto compute_output_dims = auto compute_output_dims = [](const TRT_TensorOrWeights& input,
[](const TRT_TensorOrWeights& input, int broadcast_num_dims, int broadcast_num_dims, int* output_dims_array,
int* output_dims_array, nvinfer1::Dims* output_dims) { nvinfer1::Dims* output_dims) {
const nvinfer1::Dims input_dims = input.GetTrtDims(); const nvinfer1::Dims input_dims = input.GetTrtDims();
std::fill(output_dims_array, output_dims_array + max_nb_dims, 1); std::fill(output_dims_array, output_dims_array + max_nb_dims, 1);
std::copy(input_dims.d, input_dims.d + input_dims.nbDims, std::copy(input_dims.d, input_dims.d + input_dims.nbDims,
output_dims_array + broadcast_num_dims - input_dims.nbDims); output_dims_array + broadcast_num_dims - input_dims.nbDims);
if (input.is_tensor()) { if (input.is_tensor()) {
const int true_input_dims = input_dims.nbDims + 1; const int true_input_dims = input_dims.nbDims + 1;
if (true_input_dims < broadcast_num_dims) { if (true_input_dims < broadcast_num_dims) {
return errors::InvalidArgument( return errors::InvalidArgument(
"Broadcasting beyond batch dimension is not supported ", "Broadcasting beyond batch dimension is not supported ",
"(tensor #dims ", true_input_dims, " vs broadcast #dims ", "(tensor #dims ", true_input_dims, " vs broadcast #dims ",
broadcast_num_dims, ")"); broadcast_num_dims, ")");
} }
// Set the batch dimension to -1, since batch size is not supposed to // Set the batch dimension to -1, since batch size is not supposed to
// be broadcasted. // be broadcasted.
output_dims_array[0] = -1; output_dims_array[0] = -1;
} }
// Copy to output dimensions (stripping the batch dimension). // Copy to output dimensions (stripping the batch dimension).
output_dims->nbDims = broadcast_num_dims - 1; output_dims->nbDims = broadcast_num_dims - 1;
std::copy(output_dims_array + 1, output_dims_array + broadcast_num_dims, std::copy(output_dims_array + 1, output_dims_array + broadcast_num_dims,
output_dims->d); output_dims->d);
return Status::OK(); return Status::OK();
}; };
// Compute the output dimensions. // Compute the output dimensions.
const int broadcast_num_dims = const int broadcast_num_dims =
@ -2296,7 +2296,11 @@ Status ConvertStridedSliceHelper(OpConverterParams* params,
} }
// TRT 5.1 adds a slice layer. For older versions, we attempt to use the // TRT 5.1 adds a slice layer. For older versions, we attempt to use the
// padding layer with negative padding. // padding layer with negative padding.
#if NV_TENSORRT_MAJOR > 5 || (NV_TENSORRT_MAJOR == 5 && NV_TENSORRT_MINOR >= 1) #if (NV_TENSORRT_MAJOR > 5 || \
(NV_TENSORRT_MAJOR == 5 && NV_TENSORRT_MINOR >= 1)) && \
0
// TODO(laigd): TRT 5.1 RC has a bug when ISliceLayer is used along with
// IConcatenationLayer, so disable ISliceLayer for now until it's fixed.
// Use ISliceLayer. // Use ISliceLayer.
nvinfer1::Dims begin_dims, size_dims, stride_dims; nvinfer1::Dims begin_dims, size_dims, stride_dims;
TF_RETURN_IF_ERROR(TensorShapeArrayToTrtDims(begin, &begin_dims, TF_RETURN_IF_ERROR(TensorShapeArrayToTrtDims(begin, &begin_dims,