未验证 提交 ca364e14 编写于 作者: C cyber-pioneer 提交者: GitHub

rm restict of platform (#51806)

上级 c985b1ac
...@@ -12,7 +12,6 @@ ...@@ -12,7 +12,6 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
import platform
import unittest import unittest
import numpy as np import numpy as np
...@@ -171,28 +170,24 @@ class TestPrimForwardAndBackward(unittest.TestCase): ...@@ -171,28 +170,24 @@ class TestPrimForwardAndBackward(unittest.TestCase):
self.assertTrue('layer_norm' not in fwd_ops) self.assertTrue('layer_norm' not in fwd_ops)
def test_cinn_prim(self): def test_cinn_prim(self):
plat = platform.system() for dtype in self.dtypes:
if plat == "Linux": if paddle.device.get_device() == "cpu":
for dtype in self.dtypes: print("need pass this case")
if paddle.device.get_device() == "cpu": continue
print("need pass this case") x_n, w_n, b_n = generate_data(dtype)
continue self.x = paddle.to_tensor(x_n)
x_n, w_n, b_n = generate_data(dtype) self.w = paddle.to_tensor(w_n)
self.x = paddle.to_tensor(x_n) self.b = paddle.to_tensor(b_n)
self.w = paddle.to_tensor(w_n) self.x.stop_gradient = False
self.b = paddle.to_tensor(b_n) dy_res = self.train(use_prim=False)
self.x.stop_gradient = False cinn_res = self.train(use_prim=True)
dy_res = self.train(use_prim=False)
cinn_res = self.train(use_prim=True) np.testing.assert_allclose(
cinn_res,
np.testing.assert_allclose( dy_res,
cinn_res, rtol=TOLERANCE[dtype]['rtol'],
dy_res, atol=TOLERANCE[dtype]['atol'],
rtol=TOLERANCE[dtype]['rtol'], )
atol=TOLERANCE[dtype]['atol'],
)
else:
pass
if __name__ == '__main__': if __name__ == '__main__':
......
...@@ -12,7 +12,6 @@ ...@@ -12,7 +12,6 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
import platform
import unittest import unittest
import numpy as np import numpy as np
...@@ -185,31 +184,24 @@ class TestPrimForwardAndBackward(unittest.TestCase): ...@@ -185,31 +184,24 @@ class TestPrimForwardAndBackward(unittest.TestCase):
self.assertTrue('reduce_mean' not in fwd_ops) self.assertTrue('reduce_mean' not in fwd_ops)
def test_cinn_prim(self): def test_cinn_prim(self):
plat = platform.system() for shape in self.shapes:
if plat == "Linux": for dtype in self.dtypes:
for shape in self.shapes: # mean-kernel on cpu not support float16
for dtype in self.dtypes: if paddle.device.get_device() == "cpu" and dtype == "float16":
# mean-kernel on cpu not support float16 print("need pass this case")
if ( continue
paddle.device.get_device() == "cpu" data = generate_data(shape, dtype)
and dtype == "float16" data_t = paddle.to_tensor(data)
): data_t.stop_gradient = False
print("need pass this case") dy_res = self.train(use_prim=False, data=data_t)
continue cinn_res = self.train(use_prim=True, data=data_t)
data = generate_data(shape, dtype)
data_t = paddle.to_tensor(data) np.testing.assert_allclose(
data_t.stop_gradient = False cinn_res,
dy_res = self.train(use_prim=False, data=data_t) dy_res,
cinn_res = self.train(use_prim=True, data=data_t) rtol=TOLERANCE[dtype]['rtol'],
atol=TOLERANCE[dtype]['atol'],
np.testing.assert_allclose( )
cinn_res,
dy_res,
rtol=TOLERANCE[dtype]['rtol'],
atol=TOLERANCE[dtype]['atol'],
)
else:
pass
if __name__ == '__main__': if __name__ == '__main__':
......
...@@ -14,7 +14,6 @@ ...@@ -14,7 +14,6 @@
import math import math
import os import os
import platform
import tempfile import tempfile
import time import time
import unittest import unittest
...@@ -442,22 +441,18 @@ class TestResnet(unittest.TestCase): ...@@ -442,22 +441,18 @@ class TestResnet(unittest.TestCase):
) )
def test_resnet_composite_forward_backward(self): def test_resnet_composite_forward_backward(self):
plat = platform.system() core._set_prim_all_enabled(True)
if plat == "Linux": static_loss = self.train(to_static=True)
core._set_prim_all_enabled(True) core._set_prim_all_enabled(False)
static_loss = self.train(to_static=True) dygraph_loss = self.train(to_static=True)
core._set_prim_all_enabled(False) np.testing.assert_allclose(
dygraph_loss = self.train(to_static=True) static_loss,
np.testing.assert_allclose( dygraph_loss,
static_loss, rtol=1e-02,
dygraph_loss, err_msg='static_loss: {} \n dygraph_loss: {}'.format(
rtol=1e-02, static_loss, dygraph_loss
err_msg='static_loss: {} \n dygraph_loss: {}'.format( ),
static_loss, dygraph_loss )
),
)
else:
pass
def test_in_static_mode_mkldnn(self): def test_in_static_mode_mkldnn(self):
fluid.set_flags({'FLAGS_use_mkldnn': True}) fluid.set_flags({'FLAGS_use_mkldnn': True})
......
...@@ -12,7 +12,6 @@ ...@@ -12,7 +12,6 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
import platform
import time import time
import unittest import unittest
...@@ -63,9 +62,7 @@ def train(to_static, enable_prim, enable_cinn): ...@@ -63,9 +62,7 @@ def train(to_static, enable_prim, enable_cinn):
np.random.seed(SEED) np.random.seed(SEED)
paddle.seed(SEED) paddle.seed(SEED)
paddle.framework.random._manual_program_seed(SEED) paddle.framework.random._manual_program_seed(SEED)
fluid.core._set_prim_all_enabled( fluid.core._set_prim_all_enabled(enable_prim)
enable_prim and platform.system() == 'Linux'
)
train_reader = paddle.batch( train_reader = paddle.batch(
reader_decorator(paddle.dataset.flowers.train(use_xmap=False)), reader_decorator(paddle.dataset.flowers.train(use_xmap=False)),
......
...@@ -13,7 +13,6 @@ ...@@ -13,7 +13,6 @@
# limitations under the License. # limitations under the License.
import os import os
import platform
import unittest import unittest
import paddle import paddle
...@@ -95,78 +94,48 @@ class TestPrimForwardAndBackward(unittest.TestCase): ...@@ -95,78 +94,48 @@ class TestPrimForwardAndBackward(unittest.TestCase):
self.reset_env_flag() self.reset_env_flag()
os.environ["FLAGS_prim_all"] = "True" os.environ["FLAGS_prim_all"] = "True"
self.flag = "cinn_prim_all" self.flag = "cinn_prim_all"
plat = platform.system() _ = self.train(use_cinn=True)
if plat == "Linux":
_ = self.train(use_cinn=True)
else:
pass
def test_prim_all(self): def test_prim_all(self):
"""prim forward + prim backward""" """prim forward + prim backward"""
self.reset_env_flag() self.reset_env_flag()
os.environ["FLAGS_prim_all"] = "True" os.environ["FLAGS_prim_all"] = "True"
self.flag = "prim_all" self.flag = "prim_all"
plat = platform.system() _ = self.train(use_cinn=False)
if plat == "Linux":
_ = self.train(use_cinn=False)
else:
pass
def test_cinn_prim_forward(self): def test_cinn_prim_forward(self):
"""cinn + prim forward""" """cinn + prim forward"""
self.reset_env_flag() self.reset_env_flag()
os.environ["FLAGS_prim_forward"] = "True" os.environ["FLAGS_prim_forward"] = "True"
self.flag = "cinn_prim_forward" self.flag = "cinn_prim_forward"
plat = platform.system() _ = self.train(use_cinn=True)
if plat == "Linux":
_ = self.train(use_cinn=True)
else:
pass
def test_prim_forward(self): def test_prim_forward(self):
"""only prim forward""" """only prim forward"""
self.reset_env_flag() self.reset_env_flag()
os.environ["FLAGS_prim_forward"] = "True" os.environ["FLAGS_prim_forward"] = "True"
self.flag = "prim_forward" self.flag = "prim_forward"
plat = platform.system() _ = self.train(use_cinn=False)
if plat == "Linux":
_ = self.train(use_cinn=False)
else:
pass
def test_cinn_prim_backward(self): def test_cinn_prim_backward(self):
"""cinn + prim_backward""" """cinn + prim_backward"""
self.reset_env_flag() self.reset_env_flag()
os.environ["FLAGS_prim_backward"] = "True" os.environ["FLAGS_prim_backward"] = "True"
self.flag = "cinn_prim_backward" self.flag = "cinn_prim_backward"
plat = platform.system() _ = self.train(use_cinn=True)
if plat == "Linux":
_ = self.train(use_cinn=True)
else:
pass
def test_prim_backward(self): def test_prim_backward(self):
"""only prim backward""" """only prim backward"""
self.reset_env_flag() self.reset_env_flag()
os.environ["FLAGS_prim_backward"] = "True" os.environ["FLAGS_prim_backward"] = "True"
self.flag = "prim_backward" self.flag = "prim_backward"
plat = platform.system() _ = self.train(use_cinn=False)
if plat == "Linux":
_ = self.train(use_cinn=False)
else:
pass
def test_cinn(self): def test_cinn(self):
"""only cinn""" """only cinn"""
self.reset_env_flag() self.reset_env_flag()
self.flag = "cinn" self.flag = "cinn"
plat = platform.system() _ = self.train(use_cinn=True)
if plat == "Linux":
_ = self.train(use_cinn=True)
else:
pass
if __name__ == '__main__': if __name__ == '__main__':
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册