提交 99e3e36a 编写于 作者: M Michal Gallus

MKLDNN elementwise_mul: Disable UT for CUDA

test=develop
上级 785066eb
...@@ -362,7 +362,9 @@ class OpTest(unittest.TestCase): ...@@ -362,7 +362,9 @@ class OpTest(unittest.TestCase):
else: else:
return [] return []
places = [fluid.CPUPlace()] places = [fluid.CPUPlace()]
if core.is_compiled_with_cuda() and core.op_support_gpu(self.op_type): cpu_only = self._cpu_only if hasattr(self, '_cpu_only') else False
if core.is_compiled_with_cuda() and core.op_support_gpu(self.op_type)\
and not cpu_only:
places.append(core.CUDAPlace(0)) places.append(core.CUDAPlace(0))
return places return places
......
...@@ -34,6 +34,7 @@ class TestElementwiseMulMKLDNNOp_BroadcastNCHW16c(ElementwiseMulOp): ...@@ -34,6 +34,7 @@ class TestElementwiseMulMKLDNNOp_BroadcastNCHW16c(ElementwiseMulOp):
super(TestElementwiseMulMKLDNNOp_BroadcastNCHW16c, self).setUp() super(TestElementwiseMulMKLDNNOp_BroadcastNCHW16c, self).setUp()
self.attrs["x_data_format"] = "nchw16c" self.attrs["x_data_format"] = "nchw16c"
self.attrs["y_data_format"] = "nc" self.attrs["y_data_format"] = "nc"
self._cpu_only = True
def init_kernel_type(self): def init_kernel_type(self):
self.use_mkldnn = True self.use_mkldnn = True
...@@ -66,6 +67,7 @@ class TestElementwiseMulMKLDNNOp_BroadcastNCHW8c(ElementwiseMulOp): ...@@ -66,6 +67,7 @@ class TestElementwiseMulMKLDNNOp_BroadcastNCHW8c(ElementwiseMulOp):
super(TestElementwiseMulMKLDNNOp_BroadcastNCHW8c, self).setUp() super(TestElementwiseMulMKLDNNOp_BroadcastNCHW8c, self).setUp()
self.attrs["x_data_format"] = "nchw8c" self.attrs["x_data_format"] = "nchw8c"
self.attrs["y_data_format"] = "nc" self.attrs["y_data_format"] = "nc"
self._cpu_only = True
def init_kernel_type(self): def init_kernel_type(self):
self.use_mkldnn = True self.use_mkldnn = True
...@@ -119,6 +121,7 @@ class TestElementwiseMulMKLDNNOp_FallbackNCHW16C(ElementwiseMulOp): ...@@ -119,6 +121,7 @@ class TestElementwiseMulMKLDNNOp_FallbackNCHW16C(ElementwiseMulOp):
super(TestElementwiseMulMKLDNNOp_FallbackNCHW16C, self).setUp() super(TestElementwiseMulMKLDNNOp_FallbackNCHW16C, self).setUp()
self.attrs["x_data_format"] = "nchw16c" self.attrs["x_data_format"] = "nchw16c"
self.attrs["y_data_format"] = "nchw16c" self.attrs["y_data_format"] = "nchw16c"
self._cpu_only = True
def init_kernel_type(self): def init_kernel_type(self):
self.use_mkldnn = True self.use_mkldnn = True
...@@ -149,6 +152,7 @@ class TestElementwiseMulMKLDNNOp_FallbackNoReorders(ElementwiseMulOp): ...@@ -149,6 +152,7 @@ class TestElementwiseMulMKLDNNOp_FallbackNoReorders(ElementwiseMulOp):
super(TestElementwiseMulMKLDNNOp_FallbackNoReorders, self).setUp() super(TestElementwiseMulMKLDNNOp_FallbackNoReorders, self).setUp()
self.attrs["x_data_format"] = "nchw16c" self.attrs["x_data_format"] = "nchw16c"
self.attrs["y_data_format"] = "nchw16c" self.attrs["y_data_format"] = "nchw16c"
self._cpu_only = True
def init_kernel_type(self): def init_kernel_type(self):
self.use_mkldnn = True self.use_mkldnn = True
...@@ -178,6 +182,7 @@ class TestElementwiseMulMKLDNNOp_FallbackWithReorder1(ElementwiseMulOp): ...@@ -178,6 +182,7 @@ class TestElementwiseMulMKLDNNOp_FallbackWithReorder1(ElementwiseMulOp):
super(TestElementwiseMulMKLDNNOp_FallbackWithReorder1, self).setUp() super(TestElementwiseMulMKLDNNOp_FallbackWithReorder1, self).setUp()
self.attrs["x_data_format"] = "nchw" self.attrs["x_data_format"] = "nchw"
self.attrs["y_data_format"] = "nchw16c" self.attrs["y_data_format"] = "nchw16c"
self._cpu_only = True
def init_kernel_type(self): def init_kernel_type(self):
self.use_mkldnn = True self.use_mkldnn = True
...@@ -207,6 +212,7 @@ class TestElementwiseMulMKLDNNOp_FallbackWithReorder2(ElementwiseMulOp): ...@@ -207,6 +212,7 @@ class TestElementwiseMulMKLDNNOp_FallbackWithReorder2(ElementwiseMulOp):
super(TestElementwiseMulMKLDNNOp_FallbackWithReorder2, self).setUp() super(TestElementwiseMulMKLDNNOp_FallbackWithReorder2, self).setUp()
self.attrs["x_data_format"] = "nchw16c" self.attrs["x_data_format"] = "nchw16c"
self.attrs["y_data_format"] = "nchw" self.attrs["y_data_format"] = "nchw"
self._cpu_only = True
def init_kernel_type(self): def init_kernel_type(self):
self.use_mkldnn = True self.use_mkldnn = True
...@@ -235,6 +241,7 @@ class TestElementwiseMulMKLDNNOp_FallbackNoReorders2(ElementwiseMulOp): ...@@ -235,6 +241,7 @@ class TestElementwiseMulMKLDNNOp_FallbackNoReorders2(ElementwiseMulOp):
super(TestElementwiseMulMKLDNNOp_FallbackNoReorders2, self).setUp() super(TestElementwiseMulMKLDNNOp_FallbackNoReorders2, self).setUp()
self.attrs["x_data_format"] = "nc" self.attrs["x_data_format"] = "nc"
self.attrs["y_data_format"] = "nc" self.attrs["y_data_format"] = "nc"
self._cpu_only = True
def init_kernel_type(self): def init_kernel_type(self):
self.use_mkldnn = True self.use_mkldnn = True
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册