Skip to content

P
Paddle

机器未来 / Paddle
与 Fork 源项目一致

Fork自 PaddlePaddle / Paddle

通知 1
Star 1
Fork 0
P
Paddle
未验证 提交 4c9ddb3d 编写于 作者: S Sylwester Fraczek 提交者： GitHub
浏览文件
操作

enable check_dygraph for mkldnn activation tests (#25779) 

* enable check_dygraph for mkldnn activation tests

* TestMKLDNNSwishDim4 float32->self.dtype
上级 5258d53d
隐藏空白更改
内联 并排
Showing with 21 addition and 121 deletion
python/paddle/fluid/tests/unittests/mkldnn/test_activation_mkldnn_op.py
浏览文件 @ 4c9ddb3d
...@@ -30,16 +30,8 @@ class TestMKLDNNReluDim2(TestRelu): ...@@ -30,16 +30,8 @@ class TestMKLDNNReluDim2(TestRelu):
self.attrs = {"use_mkldnn": True} self.attrs = {"use_mkldnn": True}
def test_check_output(self): def init_dtype(self):
# TODO(wangzhongpu): support mkldnn op in dygraph mode self.dtype = np.float32
self.check_output(check_dygraph=False)
def test_check_grad(self):
if self.dtype == np.float16:
return
# TODO(wangzhongpu): support mkldnn op in dygraph mode
self.check_grad(
['X'], 'Out', max_relative_error=0.007, check_dygraph=False)
class TestMKLDNNLeakyReluDim2(TestLeakyRelu): class TestMKLDNNLeakyReluDim2(TestLeakyRelu):
...@@ -48,16 +40,8 @@ class TestMKLDNNLeakyReluDim2(TestLeakyRelu): ...@@ -48,16 +40,8 @@ class TestMKLDNNLeakyReluDim2(TestLeakyRelu):
self.attrs = {"use_mkldnn": True} self.attrs = {"use_mkldnn": True}
def test_check_output(self): def init_dtype(self):
# TODO(wangzhongpu): support mkldnn op in dygraph mode self.dtype = np.float32
self.check_output(check_dygraph=False)
def test_check_grad(self):
if self.dtype == np.float16:
return
# TODO(wangzhongpu): support mkldnn op in dygraph mode
self.check_grad(
['X'], 'Out', max_relative_error=0.007, check_dygraph=False)
class TestMKLDNNGeluDim2(TestActivation): class TestMKLDNNGeluDim2(TestActivation):
...@@ -92,16 +76,8 @@ class TestMKLDNNTanhDim2(TestTanh): ...@@ -92,16 +76,8 @@ class TestMKLDNNTanhDim2(TestTanh):
self.attrs = {"use_mkldnn": True} self.attrs = {"use_mkldnn": True}
def test_check_output(self): def init_dtype(self):
# TODO(wangzhongpu): support mkldnn op in dygraph mode self.dtype = np.float32
self.check_output(check_dygraph=False)
def test_check_grad(self):
if self.dtype == np.float16:
return
# TODO(wangzhongpu): support mkldnn op in dygraph mode
self.check_grad(
['X'], 'Out', max_relative_error=0.007, check_dygraph=False)
class TestMKLDNNSqrtDim2(TestSqrt): class TestMKLDNNSqrtDim2(TestSqrt):
...@@ -110,16 +86,8 @@ class TestMKLDNNSqrtDim2(TestSqrt): ...@@ -110,16 +86,8 @@ class TestMKLDNNSqrtDim2(TestSqrt):
self.attrs = {"use_mkldnn": True} self.attrs = {"use_mkldnn": True}
def test_check_output(self): def init_dtype(self):
# TODO(wangzhongpu): support mkldnn op in dygraph mode self.dtype = np.float32
self.check_output(check_dygraph=False)
def test_check_grad(self):
if self.dtype == np.float16:
return
# TODO(wangzhongpu): support mkldnn op in dygraph mode
self.check_grad(
['X'], 'Out', max_relative_error=0.007, check_dygraph=False)
class TestMKLDNNAbsDim2(TestAbs): class TestMKLDNNAbsDim2(TestAbs):
...@@ -127,16 +95,8 @@ class TestMKLDNNAbsDim2(TestAbs): ...@@ -127,16 +95,8 @@ class TestMKLDNNAbsDim2(TestAbs):
super(TestMKLDNNAbsDim2, self).setUp() super(TestMKLDNNAbsDim2, self).setUp()
self.attrs = {"use_mkldnn": True} self.attrs = {"use_mkldnn": True}
def test_check_output(self): def init_dtype(self):
# TODO(wangzhongpu): support mkldnn op in dygraph mode self.dtype = np.float32
self.check_output(check_dygraph=False)
def test_check_grad(self):
if self.dtype == np.float16:
return
# TODO(wangzhongpu): support mkldnn op in dygraph mode
self.check_grad(
['X'], 'Out', max_relative_error=0.007, check_dygraph=False)
class TestMKLDNNSwishDim2(TestSwish): class TestMKLDNNSwishDim2(TestSwish):
...@@ -151,15 +111,8 @@ class TestMKLDNNSwishDim2(TestSwish): ...@@ -151,15 +111,8 @@ class TestMKLDNNSwishDim2(TestSwish):
self.outputs = {'Out': out} self.outputs = {'Out': out}
self.attrs = {"use_mkldnn": True, "beta": beta} self.attrs = {"use_mkldnn": True, "beta": beta}
def test_check_output(self): def init_dtype(self):
# TODO(wangzhongpu): support mkldnn op in dygraph mode self.dtype = np.float32
self.check_output()
def test_check_grad(self):
if self.dtype == np.float16:
return
# TODO(wangzhongpu): support mkldnn op in dygraph mode
self.check_grad(['X'], 'Out')
class TestMKLDNNSigmoidDim2(TestSigmoid): class TestMKLDNNSigmoidDim2(TestSigmoid):
...@@ -181,16 +134,8 @@ class TestMKLDNNReluDim4(TestRelu): ...@@ -181,16 +134,8 @@ class TestMKLDNNReluDim4(TestRelu):
self.outputs = {'Out': out} self.outputs = {'Out': out}
self.attrs = {"use_mkldnn": True} self.attrs = {"use_mkldnn": True}
def test_check_output(self): def init_dtype(self):
# TODO(wangzhongpu): support mkldnn op in dygraph mode self.dtype = np.float32
self.check_output(check_dygraph=False)
def test_check_grad(self):
if self.dtype == np.float16:
return
# TODO(wangzhongpu): support mkldnn op in dygraph mode
self.check_grad(
['X'], 'Out', max_relative_error=0.007, check_dygraph=False)
class TestMKLDNNLeakyReluDim4(TestLeakyRelu): class TestMKLDNNLeakyReluDim4(TestLeakyRelu):
...@@ -206,16 +151,8 @@ class TestMKLDNNLeakyReluDim4(TestLeakyRelu): ...@@ -206,16 +151,8 @@ class TestMKLDNNLeakyReluDim4(TestLeakyRelu):
self.outputs = {'Out': out} self.outputs = {'Out': out}
self.attrs = {"use_mkldnn": True} self.attrs = {"use_mkldnn": True}
def test_check_output(self): def init_dtype(self):
# TODO(wangzhongpu): support mkldnn op in dygraph mode self.dtype = np.float32
self.check_output(check_dygraph=False)
def test_check_grad(self):
if self.dtype == np.float16:
return
# TODO(wangzhongpu): support mkldnn op in dygraph mode
self.check_grad(
['X'], 'Out', max_relative_error=0.007, check_dygraph=False)
class TestMKLDNNGeluDim4(TestActivation): class TestMKLDNNGeluDim4(TestActivation):
...@@ -254,17 +191,6 @@ class TestMKLDNNTanhDim4(TestTanh): ...@@ -254,17 +191,6 @@ class TestMKLDNNTanhDim4(TestTanh):
self.outputs = {'Out': np.tanh(self.inputs['X'])} self.outputs = {'Out': np.tanh(self.inputs['X'])}
self.attrs = {"use_mkldnn": True} self.attrs = {"use_mkldnn": True}
def test_check_output(self):
# TODO(wangzhongpu): support mkldnn op in dygraph mode
self.check_output(check_dygraph=False)
def test_check_grad(self):
if self.dtype == np.float16:
return
# TODO(wangzhongpu): support mkldnn op in dygraph mode
self.check_grad(
['X'], 'Out', max_relative_error=0.007, check_dygraph=False)
class TestMKLDNNSqrtDim4(TestSqrt): class TestMKLDNNSqrtDim4(TestSqrt):
def setUp(self): def setUp(self):
...@@ -276,17 +202,6 @@ class TestMKLDNNSqrtDim4(TestSqrt): ...@@ -276,17 +202,6 @@ class TestMKLDNNSqrtDim4(TestSqrt):
self.outputs = {'Out': np.sqrt(self.inputs['X'])} self.outputs = {'Out': np.sqrt(self.inputs['X'])}
self.attrs = {"use_mkldnn": True} self.attrs = {"use_mkldnn": True}
def test_check_output(self):
# TODO(wangzhongpu): support mkldnn op in dygraph mode
self.check_output(check_dygraph=False)
def test_check_grad(self):
if self.dtype == np.float16:
return
# TODO(wangzhongpu): support mkldnn op in dygraph mode
self.check_grad(
['X'], 'Out', max_relative_error=0.007, check_dygraph=False)
class TestMKLDNNAbsDim4(TestAbs): class TestMKLDNNAbsDim4(TestAbs):
def setUp(self): def setUp(self):
...@@ -299,23 +214,15 @@ class TestMKLDNNAbsDim4(TestAbs): ...@@ -299,23 +214,15 @@ class TestMKLDNNAbsDim4(TestAbs):
self.outputs = {'Out': np.abs(self.inputs['X'])} self.outputs = {'Out': np.abs(self.inputs['X'])}
self.attrs = {"use_mkldnn": True} self.attrs = {"use_mkldnn": True}
def test_check_output(self): def init_dtype(self):
# TODO(wangzhongpu): support mkldnn op in dygraph mode self.dtype = np.float32
self.check_output(check_dygraph=False)
def test_check_grad(self):
if self.dtype == np.float16:
return
# TODO(wangzhongpu): support mkldnn op in dygraph mode
self.check_grad(
['X'], 'Out', max_relative_error=0.007, check_dygraph=False)
class TestMKLDNNSwishDim4(TestSwish): class TestMKLDNNSwishDim4(TestSwish):
def setUp(self): def setUp(self):
super(TestMKLDNNSwishDim4, self).setUp() super(TestMKLDNNSwishDim4, self).setUp()
x = np.random.uniform(0.1, 1, [2, 4, 3, 5]).astype("float32") x = np.random.uniform(0.1, 1, [2, 4, 3, 5]).astype(self.dtype)
beta = 2.3 beta = 2.3
out = x * expit(beta * x) out = x * expit(beta * x)
...@@ -323,15 +230,8 @@ class TestMKLDNNSwishDim4(TestSwish): ...@@ -323,15 +230,8 @@ class TestMKLDNNSwishDim4(TestSwish):
self.outputs = {'Out': out} self.outputs = {'Out': out}
self.attrs = {"use_mkldnn": True, "beta": beta} self.attrs = {"use_mkldnn": True, "beta": beta}
def test_check_output(self): def init_dtype(self):
# TODO(wangzhongpu): support mkldnn op in dygraph mode self.dtype = np.float32
self.check_output()
def test_check_grad(self):
if self.dtype == np.float16:
return
# TODO(wangzhongpu): support mkldnn op in dygraph mode
self.check_grad(['X'], 'Out')
class TestMKLDNNSigmoidDim4(TestSigmoid): class TestMKLDNNSigmoidDim4(TestSigmoid):
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或