diff options
author | A. Unique TensorFlower <gardener@tensorflow.org> | 2017-10-24 16:13:09 -0700 |
---|---|---|
committer | TensorFlower Gardener <gardener@tensorflow.org> | 2017-10-24 16:17:10 -0700 |
commit | 8e7390ff4e0d9d173df5e193bf90af934e42f193 (patch) | |
tree | 36c2e146b737d6442dc1beb26e7d215f6086c117 | |
parent | fa5921b6cefa3e877348cfa5158143fbc764bc8c (diff) |
Fix FusedConv2DBiasActivationOp for OIHW filter format.
The 'filter' variable wasn't initialized for OIHW filter format.
PiperOrigin-RevId: 173327533
-rw-r--r-- | tensorflow/contrib/fused_conv/kernels/fused_conv2d_bias_activation_op.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/tensorflow/contrib/fused_conv/kernels/fused_conv2d_bias_activation_op.cc b/tensorflow/contrib/fused_conv/kernels/fused_conv2d_bias_activation_op.cc index e4c39739f7..88306094ab 100644 --- a/tensorflow/contrib/fused_conv/kernels/fused_conv2d_bias_activation_op.cc +++ b/tensorflow/contrib/fused_conv/kernels/fused_conv2d_bias_activation_op.cc @@ -445,11 +445,11 @@ void LaunchFusedConv2DBiasActivationOp<GPUDevice, T, BiasType, ScaleType>:: .set_zero_padding_width(padding_cols / 2); Tensor maybe_transformed_filter; - const Tensor* filter; - if (is_int8x4) { - // We have already checked filter is OIHW_VECT_I in the constructor. - filter = &filter_param; - } else if (filter_format == FORMAT_HWIO) { + const Tensor* filter = &filter_param; + // For qint8, we have already checked filter is OIHW_VECT_I in the + // constructor, but we need to test for is_int8x4 so the if block doesn't + // generate code for qint8. + if (!is_int8x4 && filter_format == FORMAT_HWIO) { // Shuffle filter tensor from HWIO to OIHW: OP_REQUIRES_OK(ctx, ctx->allocate_temp( DataTypeToEnum<T>::value, |