Skip to content

Commit 99e3e36

Browse files
committed
MKLDNN elementwise_mul: Disable UT for CUDA
test=develop
1 parent 785066e commit 99e3e36

File tree

2 files changed

+10
-1
lines changed

2 files changed

+10
-1
lines changed

python/paddle/fluid/tests/unittests/op_test.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -362,7 +362,9 @@ def _get_places(self):
362362
else:
363363
return []
364364
places = [fluid.CPUPlace()]
365-
if core.is_compiled_with_cuda() and core.op_support_gpu(self.op_type):
365+
cpu_only = self._cpu_only if hasattr(self, '_cpu_only') else False
366+
if core.is_compiled_with_cuda() and core.op_support_gpu(self.op_type)\
367+
and not cpu_only:
366368
places.append(core.CUDAPlace(0))
367369
return places
368370

python/paddle/fluid/tests/unittests/test_elementwise_mul_mkldnn_op.py

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ def setUp(self):
3434
super(TestElementwiseMulMKLDNNOp_BroadcastNCHW16c, self).setUp()
3535
self.attrs["x_data_format"] = "nchw16c"
3636
self.attrs["y_data_format"] = "nc"
37+
self._cpu_only = True
3738

3839
def init_kernel_type(self):
3940
self.use_mkldnn = True
@@ -66,6 +67,7 @@ def setUp(self):
6667
super(TestElementwiseMulMKLDNNOp_BroadcastNCHW8c, self).setUp()
6768
self.attrs["x_data_format"] = "nchw8c"
6869
self.attrs["y_data_format"] = "nc"
70+
self._cpu_only = True
6971

7072
def init_kernel_type(self):
7173
self.use_mkldnn = True
@@ -119,6 +121,7 @@ def setUp(self):
119121
super(TestElementwiseMulMKLDNNOp_FallbackNCHW16C, self).setUp()
120122
self.attrs["x_data_format"] = "nchw16c"
121123
self.attrs["y_data_format"] = "nchw16c"
124+
self._cpu_only = True
122125

123126
def init_kernel_type(self):
124127
self.use_mkldnn = True
@@ -149,6 +152,7 @@ def setUp(self):
149152
super(TestElementwiseMulMKLDNNOp_FallbackNoReorders, self).setUp()
150153
self.attrs["x_data_format"] = "nchw16c"
151154
self.attrs["y_data_format"] = "nchw16c"
155+
self._cpu_only = True
152156

153157
def init_kernel_type(self):
154158
self.use_mkldnn = True
@@ -178,6 +182,7 @@ def setUp(self):
178182
super(TestElementwiseMulMKLDNNOp_FallbackWithReorder1, self).setUp()
179183
self.attrs["x_data_format"] = "nchw"
180184
self.attrs["y_data_format"] = "nchw16c"
185+
self._cpu_only = True
181186

182187
def init_kernel_type(self):
183188
self.use_mkldnn = True
@@ -207,6 +212,7 @@ def setUp(self):
207212
super(TestElementwiseMulMKLDNNOp_FallbackWithReorder2, self).setUp()
208213
self.attrs["x_data_format"] = "nchw16c"
209214
self.attrs["y_data_format"] = "nchw"
215+
self._cpu_only = True
210216

211217
def init_kernel_type(self):
212218
self.use_mkldnn = True
@@ -235,6 +241,7 @@ def setUp(self):
235241
super(TestElementwiseMulMKLDNNOp_FallbackNoReorders2, self).setUp()
236242
self.attrs["x_data_format"] = "nc"
237243
self.attrs["y_data_format"] = "nc"
244+
self._cpu_only = True
238245

239246
def init_kernel_type(self):
240247
self.use_mkldnn = True

0 commit comments

Comments
 (0)