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

Merge pull request #30340 from Intel-tensorflow:bugfix/wenxizhu/dilated-conv3d

Browse Source 
PiperOrigin-RevId: 257214782
This commit is contained in:
TensorFlower Gardener 2019-07-09 10:13:30 -07:00
commit 4bb0f6e87f
2 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
tensorflow/core/kernels/mkl_conv_ops.h
View File

@ -411,15 +411,18 @@ class MklDnnConvUtil {
input_cols, filter_cols, dilation_cols, stride_cols, input_cols, filter_cols, dilation_cols, stride_cols,
padding_type, &out_cols, &pad_left, &pad_right)); padding_type, &out_cols, &pad_left, &pad_right));
} else { } else {
OP_REQUIRES_OK(context_, GetWindowedOutputSizeVerbose( OP_REQUIRES_OK(context_, GetWindowedOutputSizeVerboseV2(
input_planes, filter_planes, stride_planes, input_planes, filter_planes, dilation_planes,
padding_, &out_planes, &pad_D1, &pad_D2)); stride_planes, padding_, &out_planes,
OP_REQUIRES_OK(context_, GetWindowedOutputSizeVerbose( &pad_D1, &pad_D2));
input_rows, filter_rows, stride_rows, OP_REQUIRES_OK(context_,
padding_, &out_rows, &pad_top, &pad_bottom)); GetWindowedOutputSizeVerboseV2(
OP_REQUIRES_OK(context_, GetWindowedOutputSizeVerbose( input_rows, filter_rows, dilation_rows, stride_rows,
input_cols, filter_cols, stride_cols, padding_, &out_rows, &pad_top, &pad_bottom));
padding_, &out_cols, &pad_left, &pad_right)); OP_REQUIRES_OK(context_,
GetWindowedOutputSizeVerboseV2(
input_cols, filter_cols, dilation_cols, stride_cols,
padding_, &out_cols, &pad_left, &pad_right));
} }
if (is_conv2d) { if (is_conv2d) {

5
tensorflow/python/kernel_tests/conv_ops_3d_test.py
View File

@ -32,6 +32,7 @@ from tensorflow.python.ops import gradients_impl
from tensorflow.python.ops import nn_ops from tensorflow.python.ops import nn_ops
import tensorflow.python.ops.nn_grad # pylint: disable=unused-import import tensorflow.python.ops.nn_grad # pylint: disable=unused-import
from tensorflow.python.platform import test from tensorflow.python.platform import test
from tensorflow.python.framework import test_util
def GetTestConfigs(): def GetTestConfigs():
@ -220,7 +221,7 @@ class Conv3DTest(test.TestCase):
expected=expected_output) expected=expected_output)
def testConv3D1x1x1Filter2x1x1Dilation(self): def testConv3D1x1x1Filter2x1x1Dilation(self):
if test.is_gpu_available(cuda_only=True): if test.is_gpu_available(cuda_only=True) or test_util.IsMklEnabled():
self._VerifyDilatedConvValues( self._VerifyDilatedConvValues(
tensor_in_sizes=[1, 3, 6, 1, 1], tensor_in_sizes=[1, 3, 6, 1, 1],
filter_in_sizes=[1, 1, 1, 1, 1], filter_in_sizes=[1, 1, 1, 1, 1],
@ -245,7 +246,7 @@ class Conv3DTest(test.TestCase):
expected=expected_output) expected=expected_output)
def testConv3D2x2x2Filter1x2x1Dilation(self): def testConv3D2x2x2Filter1x2x1Dilation(self):
if test.is_gpu_available(cuda_only=True): if test.is_gpu_available(cuda_only=True) or test_util.IsMklEnabled():
self._VerifyDilatedConvValues( self._VerifyDilatedConvValues(
tensor_in_sizes=[1, 4, 6, 3, 1], tensor_in_sizes=[1, 4, 6, 3, 1],
filter_in_sizes=[2, 2, 2, 1, 1], filter_in_sizes=[2, 2, 2, 1, 1],