Skip to content

P
Paddle

PaddlePaddle / Paddle
接近 2 年 前同步成功

通知 2323
Star 20933
Fork 5424
P
Paddle
未验证 提交 712f9fe5 编写于 作者: L Leo Chen 提交者： GitHub
浏览文件
操作

[NPU] Refine npu unit tests (#34240) 

* add npu unittest only if WITH_ASCEND_CL is ON

* remove @unittest.skipIf, since these unittests will only be created when WITH_ASCEND_CL is ON

* open dygraph test for npu test
上级 f50a67eb
显示空白变更内容
内联 并排
Showing with 155 addition and 502 deletion
python/paddle/fluid/tests/unittests/npu/CMakeLists.txt
浏览文件 @ 712f9fe5
file(GLOB TEST_OPS RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}" "test_*.py") file(GLOB TEST_OPS RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}" "test_*.py")
string(REPLACE ".py" "" TEST_OPS "${TEST_OPS}") string(REPLACE ".py" "" TEST_OPS "${TEST_OPS}")
foreach(TEST_OP ${TEST_OPS}) if (WITH_ASCEND_CL)
foreach(TEST_OP ${TEST_OPS})
py_test_modules(${TEST_OP} MODULES ${TEST_OP}) py_test_modules(${TEST_OP} MODULES ${TEST_OP})
endforeach(TEST_OP) endforeach(TEST_OP)
endif()
python/paddle/fluid/tests/unittests/npu/test_abs_op_npu.py
浏览文件 @ 712f9fe5
...@@ -25,8 +25,6 @@ import paddle.fluid as fluid ...@@ -25,8 +25,6 @@ import paddle.fluid as fluid
paddle.enable_static() paddle.enable_static()
@unittest.skipIf(not paddle.is_compiled_with_npu(),
"core is not compiled with NPU")
class TestNPUAbs(OpTest): class TestNPUAbs(OpTest):
def setUp(self): def setUp(self):
self.op_type = "abs" self.op_type = "abs"
......
python/paddle/fluid/tests/unittests/npu/test_accuracy_op_npu.py
浏览文件 @ 712f9fe5
...@@ -27,8 +27,6 @@ paddle.enable_static() ...@@ -27,8 +27,6 @@ paddle.enable_static()
SEED = 2021 SEED = 2021
@unittest.skipIf(not paddle.is_compiled_with_npu(),
"core is not compiled with NPU")
class TestAccuracy(OpTest): class TestAccuracy(OpTest):
def setUp(self): def setUp(self):
self.op_type = "accuracy" self.op_type = "accuracy"
...@@ -60,7 +58,7 @@ class TestAccuracy(OpTest): ...@@ -60,7 +58,7 @@ class TestAccuracy(OpTest):
self.dtype = np.float32 self.dtype = np.float32
def test_check_output(self): def test_check_output(self):
self.check_output_with_place(self.place, check_dygraph=False) self.check_output_with_place(self.place)
class TestAccuracy2(TestAccuracy): class TestAccuracy2(TestAccuracy):
......
python/paddle/fluid/tests/unittests/npu/test_adam_op_npu.py
浏览文件 @ 712f9fe5
...@@ -25,8 +25,6 @@ paddle.enable_static() ...@@ -25,8 +25,6 @@ paddle.enable_static()
SEED = 2021 SEED = 2021
@unittest.skipIf(not paddle.is_compiled_with_npu(),
"core is not compiled with NPU")
class TestAdam(OpTest): class TestAdam(OpTest):
def setUp(self): def setUp(self):
self.set_npu() self.set_npu()
...@@ -75,11 +73,9 @@ class TestAdam(OpTest): ...@@ -75,11 +73,9 @@ class TestAdam(OpTest):
self.dtype = np.float32 self.dtype = np.float32
def test_check_output(self): def test_check_output(self):
self.check_output_with_place(self.place, atol=1e-5, check_dygraph=False) self.check_output_with_place(self.place, atol=1e-5)
@unittest.skipIf(not paddle.is_compiled_with_npu(),
"core is not compiled with NPU")
class TestAdamWithEpsilonTensor(OpTest): class TestAdamWithEpsilonTensor(OpTest):
def setUp(self): def setUp(self):
self.set_npu() self.set_npu()
...@@ -131,11 +127,9 @@ class TestAdamWithEpsilonTensor(OpTest): ...@@ -131,11 +127,9 @@ class TestAdamWithEpsilonTensor(OpTest):
self.dtype = np.float32 self.dtype = np.float32
def test_check_output(self): def test_check_output(self):
self.check_output_with_place(self.place, atol=1e-5, check_dygraph=False) self.check_output_with_place(self.place, atol=1e-5)
@unittest.skipIf(not paddle.is_compiled_with_npu(),
"core is not compiled with NPU")
class TestAdamOpWithSkipUpdate(OpTest): class TestAdamOpWithSkipUpdate(OpTest):
def setUp(self): def setUp(self):
self.set_npu() self.set_npu()
...@@ -185,11 +179,9 @@ class TestAdamOpWithSkipUpdate(OpTest): ...@@ -185,11 +179,9 @@ class TestAdamOpWithSkipUpdate(OpTest):
self.dtype = np.float32 self.dtype = np.float32
def test_check_output(self): def test_check_output(self):
self.check_output_with_place(self.place, atol=1e-5, check_dygraph=False) self.check_output_with_place(self.place, atol=1e-5)
@unittest.skipIf(not paddle.is_compiled_with_npu(),
"core is not compiled with NPU")
class TestAdamOpWithGlobalBetaPow(OpTest): class TestAdamOpWithGlobalBetaPow(OpTest):
def setUp(self): def setUp(self):
self.set_npu() self.set_npu()
...@@ -244,11 +236,9 @@ class TestAdamOpWithGlobalBetaPow(OpTest): ...@@ -244,11 +236,9 @@ class TestAdamOpWithGlobalBetaPow(OpTest):
self.dtype = np.float32 self.dtype = np.float32
def test_check_output(self): def test_check_output(self):
self.check_output_with_place(self.place, atol=1e-5, check_dygraph=False) self.check_output_with_place(self.place, atol=1e-5)
@unittest.skipIf(not paddle.is_compiled_with_npu(),
"core is not compiled with NPU")
class TestNet(unittest.TestCase): class TestNet(unittest.TestCase):
def _test(self, run_npu=True): def _test(self, run_npu=True):
main_prog = paddle.static.Program() main_prog = paddle.static.Program()
...@@ -309,8 +299,6 @@ class TestNet(unittest.TestCase): ...@@ -309,8 +299,6 @@ class TestNet(unittest.TestCase):
self.assertTrue(np.allclose(npu_loss, cpu_loss, rtol=1e-3)) self.assertTrue(np.allclose(npu_loss, cpu_loss, rtol=1e-3))
@unittest.skipIf(not paddle.is_compiled_with_npu(),
"core is not compiled with NPU")
class TestNetWithEpsilonTensor(unittest.TestCase): class TestNetWithEpsilonTensor(unittest.TestCase):
def _test(self, run_npu=True): def _test(self, run_npu=True):
main_prog = paddle.static.Program() main_prog = paddle.static.Program()
......
python/paddle/fluid/tests/unittests/npu/test_amp_check_finite_and_scale_op_npu.py
浏览文件 @ 712f9fe5
...@@ -25,8 +25,6 @@ from paddle.fluid.contrib.mixed_precision.amp_nn import check_finite_and_unscale ...@@ -25,8 +25,6 @@ from paddle.fluid.contrib.mixed_precision.amp_nn import check_finite_and_unscale
paddle.enable_static() paddle.enable_static()
@unittest.skipIf(not paddle.is_compiled_with_npu(),
"core is not compiled with NPU")
class TestCheckFiniteAndUnscale(unittest.TestCase): class TestCheckFiniteAndUnscale(unittest.TestCase):
def get_prog(self): def get_prog(self):
paddle.enable_static() paddle.enable_static()
...@@ -39,11 +37,11 @@ class TestCheckFiniteAndUnscale(unittest.TestCase): ...@@ -39,11 +37,11 @@ class TestCheckFiniteAndUnscale(unittest.TestCase):
name="status", shape=[8], dtype='float32') name="status", shape=[8], dtype='float32')
main_program.global_block().append_op( main_program.global_block().append_op(
type="alloc_float_status", type="alloc_float_status",
outputs={"FloatStatus": float_status}, ) outputs={"FloatStatus": float_status})
main_program.global_block().append_op( main_program.global_block().append_op(
type="clear_float_status", type="clear_float_status",
inputs={"FloatStatus": float_status}, inputs={"FloatStatus": float_status},
outputs={"FloatStatusOut": float_status}, ) outputs={"FloatStatusOut": float_status})
c = paddle.fluid.layers.elementwise_div(a, b) c = paddle.fluid.layers.elementwise_div(a, b)
out, found_inf = check_finite_and_unscale( out, found_inf = check_finite_and_unscale(
[c], scale, float_status=float_status) [c], scale, float_status=float_status)
...@@ -95,8 +93,6 @@ class TestCheckFiniteAndUnscale(unittest.TestCase): ...@@ -95,8 +93,6 @@ class TestCheckFiniteAndUnscale(unittest.TestCase):
self.assertFalse(found_inf[0]) self.assertFalse(found_inf[0])
@unittest.skipIf(not paddle.is_compiled_with_npu(),
"core is not compiled with NPU")
class TestCheckFiniteAndUnscaleClearFloatStatus(unittest.TestCase): class TestCheckFiniteAndUnscaleClearFloatStatus(unittest.TestCase):
def get_prog(self): def get_prog(self):
paddle.enable_static() paddle.enable_static()
...@@ -109,21 +105,21 @@ class TestCheckFiniteAndUnscaleClearFloatStatus(unittest.TestCase): ...@@ -109,21 +105,21 @@ class TestCheckFiniteAndUnscaleClearFloatStatus(unittest.TestCase):
name="status", shape=[8], dtype='float32') name="status", shape=[8], dtype='float32')
main_program.global_block().append_op( main_program.global_block().append_op(
type="alloc_float_status", type="alloc_float_status",
outputs={"FloatStatus": float_status}, ) outputs={"FloatStatus": float_status})
main_program.global_block().append_op( main_program.global_block().append_op(
type="clear_float_status", type="clear_float_status",
inputs={"FloatStatus": float_status}, inputs={"FloatStatus": float_status},
outputs={"FloatStatusOut": float_status}, ) outputs={"FloatStatusOut": float_status})
c = paddle.fluid.layers.elementwise_div(a, b) c = paddle.fluid.layers.elementwise_div(a, b)
out, found_inf = check_finite_and_unscale( out, found_inf = check_finite_and_unscale(
[c], scale, float_status=float_status) [c], scale, float_status=float_status)
main_program.global_block().append_op( main_program.global_block().append_op(
type="alloc_float_status", type="alloc_float_status",
outputs={"FloatStatus": float_status}, ) outputs={"FloatStatus": float_status})
main_program.global_block().append_op( main_program.global_block().append_op(
type="clear_float_status", type="clear_float_status",
inputs={"FloatStatus": float_status}, inputs={"FloatStatus": float_status},
outputs={"FloatStatusOut": float_status}, ) outputs={"FloatStatusOut": float_status})
d = paddle.fluid.layers.elementwise_add(a, b) d = paddle.fluid.layers.elementwise_add(a, b)
out, found_inf = check_finite_and_unscale( out, found_inf = check_finite_and_unscale(
[d], scale, float_status=float_status) [d], scale, float_status=float_status)
......
python/paddle/fluid/tests/unittests/test_assign_op_npu.py → python/paddle/fluid/tests/unittests/npu/test_assign_op_npu.py
浏览文件 @ 712f9fe5
...@@ -27,8 +27,6 @@ paddle.enable_static() ...@@ -27,8 +27,6 @@ paddle.enable_static()
SEED = 2021 SEED = 2021
@unittest.skipIf(not paddle.is_compiled_with_npu(),
"core is not compiled with NPU")
class TestAssign(OpTest): class TestAssign(OpTest):
def setUp(self): def setUp(self):
self.set_npu() self.set_npu()
...@@ -49,7 +47,7 @@ class TestAssign(OpTest): ...@@ -49,7 +47,7 @@ class TestAssign(OpTest):
self.dtype = np.float32 self.dtype = np.float32
def test_check_output(self): def test_check_output(self):
self.check_output_with_place(self.place, check_dygraph=False) self.check_output_with_place(self.place)
if __name__ == '__main__': if __name__ == '__main__':
......
python/paddle/fluid/tests/unittests/npu/test_bce_loss_npu.py
浏览文件 @ 712f9fe5
...@@ -147,8 +147,6 @@ def calc_bceloss(input_np, label_np, reduction='mean', weight_np=None): ...@@ -147,8 +147,6 @@ def calc_bceloss(input_np, label_np, reduction='mean', weight_np=None):
return expected return expected
@unittest.skipIf(not paddle.is_compiled_with_npu(),
"core is not compiled with NPU")
class TestBCELoss(unittest.TestCase): class TestBCELoss(unittest.TestCase):
def test_BCELoss(self): def test_BCELoss(self):
input_np = np.random.uniform(0.1, 0.8, size=(20, 30)).astype(np.float32) input_np = np.random.uniform(0.1, 0.8, size=(20, 30)).astype(np.float32)
...@@ -220,8 +218,6 @@ def bce_loss(input, label): ...@@ -220,8 +218,6 @@ def bce_loss(input, label):
return -1 * (label * np.log(input) + (1. - label) * np.log(1. - input)) return -1 * (label * np.log(input) + (1. - label) * np.log(1. - input))
@unittest.skipIf(not paddle.is_compiled_with_npu(),
"core is not compiled with NPU")
class TestBceLossOp(OpTest): class TestBceLossOp(OpTest):
def setUp(self): def setUp(self):
self.set_npu() self.set_npu()
...@@ -248,15 +244,11 @@ class TestBceLossOp(OpTest): ...@@ -248,15 +244,11 @@ class TestBceLossOp(OpTest):
self.shape = [10, 10] self.shape = [10, 10]
@unittest.skipIf(not paddle.is_compiled_with_npu(),
"core is not compiled with NPU")
class TestBceLossOpCase1(OpTest): class TestBceLossOpCase1(OpTest):
def init_test_cast(self): def init_test_cast(self):
self.shape = [2, 3, 4, 5] self.shape = [2, 3, 4, 5]
@unittest.skipIf(not paddle.is_compiled_with_npu(),
"core is not compiled with NPU")
class TestBceLossOpCase2(OpTest): class TestBceLossOpCase2(OpTest):
def init_test_cast(self): def init_test_cast(self):
self.shape = [2, 3, 20] self.shape = [2, 3, 20]
......
python/paddle/fluid/tests/unittests/npu/test_cast_op_npu.py
浏览文件 @ 712f9fe5
...@@ -27,8 +27,6 @@ paddle.enable_static() ...@@ -27,8 +27,6 @@ paddle.enable_static()
SEED = 2021 SEED = 2021
@unittest.skipIf(not paddle.is_compiled_with_npu(),
"core is not compiled with NPU")
class TestCast1(OpTest): class TestCast1(OpTest):
def setUp(self): def setUp(self):
self.set_npu() self.set_npu()
...@@ -48,7 +46,7 @@ class TestCast1(OpTest): ...@@ -48,7 +46,7 @@ class TestCast1(OpTest):
self.__class__.use_npu = True self.__class__.use_npu = True
def test_check_output(self): def test_check_output(self):
self.check_output_with_place(self.place, check_dygraph=False) self.check_output_with_place(self.place)
class TestCast2(OpTest): class TestCast2(OpTest):
...@@ -70,7 +68,7 @@ class TestCast2(OpTest): ...@@ -70,7 +68,7 @@ class TestCast2(OpTest):
self.__class__.use_npu = True self.__class__.use_npu = True
def test_check_output(self): def test_check_output(self):
self.check_output_with_place(self.place, check_dygraph=False, atol=1e-3) self.check_output_with_place(self.place, atol=1e-3)
class TestCast3(OpTest): class TestCast3(OpTest):
...@@ -92,7 +90,7 @@ class TestCast3(OpTest): ...@@ -92,7 +90,7 @@ class TestCast3(OpTest):
self.__class__.use_npu = True self.__class__.use_npu = True
def test_check_output(self): def test_check_output(self):
self.check_output_with_place(self.place, check_dygraph=False, atol=1e-3) self.check_output_with_place(self.place, atol=1e-3)
if __name__ == '__main__': if __name__ == '__main__':
......
python/paddle/fluid/tests/unittests/npu/test_coalesce_tensor_op_npu.py
浏览文件 @ 712f9fe5
...@@ -28,8 +28,6 @@ SEED = 2021 ...@@ -28,8 +28,6 @@ SEED = 2021
alignment = 512 alignment = 512
@unittest.skipIf(not paddle.is_compiled_with_npu(),
"core is not compiled with NPU")
class TestAllocContinuousSpace(OpTest): class TestAllocContinuousSpace(OpTest):
def setUp(self): def setUp(self):
self.__class__.use_npu = True self.__class__.use_npu = True
...@@ -82,12 +80,9 @@ class TestAllocContinuousSpace(OpTest): ...@@ -82,12 +80,9 @@ class TestAllocContinuousSpace(OpTest):
self.check_output_with_place( self.check_output_with_place(
place=paddle.NPUPlace(0), place=paddle.NPUPlace(0),
no_check_set=["FusedOutput"], no_check_set=["FusedOutput"],
atol=1e-5, atol=1e-5, )
check_dygraph=False)
@unittest.skipIf(not paddle.is_compiled_with_npu(),
"core is not compiled with NPU")
class TestAllocContinuousSpace2(TestAllocContinuousSpace): class TestAllocContinuousSpace2(TestAllocContinuousSpace):
def init_attr(self): def init_attr(self):
return { return {
...@@ -102,8 +97,7 @@ class TestAllocContinuousSpace2(TestAllocContinuousSpace): ...@@ -102,8 +97,7 @@ class TestAllocContinuousSpace2(TestAllocContinuousSpace):
self.check_output_with_place( self.check_output_with_place(
place=paddle.NPUPlace(0), place=paddle.NPUPlace(0),
no_check_set=["FusedOutput"], no_check_set=["FusedOutput"],
atol=1e-5, atol=1e-5, )
check_dygraph=False)
if __name__ == '__main__': if __name__ == '__main__':
......
python/paddle/fluid/tests/unittests/npu/test_compare_op_npu.py
浏览文件 @ 712f9fe5
...@@ -26,8 +26,6 @@ paddle.enable_static() ...@@ -26,8 +26,6 @@ paddle.enable_static()
SEED = 2021 SEED = 2021
@unittest.skipIf(not paddle.is_compiled_with_npu(),
"core is not compiled with NPU")
class TestEqual(OpTest): class TestEqual(OpTest):
def setUp(self): def setUp(self):
self.set_npu() self.set_npu()
...@@ -53,11 +51,9 @@ class TestEqual(OpTest): ...@@ -53,11 +51,9 @@ class TestEqual(OpTest):
self.dtype = np.float32 self.dtype = np.float32
def test_check_output(self): def test_check_output(self):
self.check_output_with_place(self.place, check_dygraph=False) self.check_output_with_place(self.place)
@unittest.skipIf(not paddle.is_compiled_with_npu(),
"core is not compiled with NPU")
class TestLessthan(OpTest): class TestLessthan(OpTest):
def setUp(self): def setUp(self):
self.set_npu() self.set_npu()
...@@ -83,7 +79,7 @@ class TestLessthan(OpTest): ...@@ -83,7 +79,7 @@ class TestLessthan(OpTest):
self.dtype = np.float32 self.dtype = np.float32
def test_check_output(self): def test_check_output(self):
self.check_output_with_place(self.place, check_dygraph=False) self.check_output_with_place(self.place)
class TestEqual2(TestEqual): class TestEqual2(TestEqual):
......
python/paddle/fluid/tests/unittests/npu/test_concat_op_npu.py
浏览文件 @ 712f9fe5
...@@ -26,8 +26,6 @@ paddle.enable_static() ...@@ -26,8 +26,6 @@ paddle.enable_static()
SEED = 2021 SEED = 2021
@unittest.skipIf(not paddle.is_compiled_with_npu(),
"core is not compiled with NPU")
class TestConcat(OpTest): class TestConcat(OpTest):
def setUp(self): def setUp(self):
self.set_npu() self.set_npu()
...@@ -56,7 +54,7 @@ class TestConcat(OpTest): ...@@ -56,7 +54,7 @@ class TestConcat(OpTest):
self.dtype = np.float32 self.dtype = np.float32
def test_check_output(self): def test_check_output(self):
self.check_output_with_place(self.place, check_dygraph=False) self.check_output_with_place(self.place)
def init_test_data(self): def init_test_data(self):
self.x0 = np.random.random((1, 4, 50)).astype(self.dtype) self.x0 = np.random.random((1, 4, 50)).astype(self.dtype)
...@@ -65,12 +63,9 @@ class TestConcat(OpTest): ...@@ -65,12 +63,9 @@ class TestConcat(OpTest):
self.axis = 0 self.axis = 0
def test_check_grad(self): def test_check_grad(self):
self.check_grad_with_place( self.check_grad_with_place(self.place, ['x0', 'x2'], 'Out')
self.place, ['x0', 'x2'], 'Out', check_dygraph=False) self.check_grad_with_place(self.place, ['x1'], 'Out')
self.check_grad_with_place( self.check_grad_with_place(self.place, ['x2'], 'Out')
self.place, ['x1'], 'Out', check_dygraph=False)
self.check_grad_with_place(
self.place, ['x2'], 'Out', check_dygraph=False)
class TestConcatFP16(OpTest): class TestConcatFP16(OpTest):
...@@ -102,7 +97,7 @@ class TestConcatFP16(OpTest): ...@@ -102,7 +97,7 @@ class TestConcatFP16(OpTest):
self.dtype = np.float16 self.dtype = np.float16
def test_check_output(self): def test_check_output(self):
self.check_output_with_place(self.place, check_dygraph=False) self.check_output_with_place(self.place)
def init_test_data(self): def init_test_data(self):
self.x0 = np.random.random((1, 4, 50)).astype(self.dtype) self.x0 = np.random.random((1, 4, 50)).astype(self.dtype)
......
python/paddle/fluid/tests/unittests/npu/test_dropout_op_npu.py
浏览文件 @ 712f9fe5
...@@ -28,8 +28,6 @@ SEED = 2021 ...@@ -28,8 +28,6 @@ SEED = 2021
EPOCH = 100 EPOCH = 100
@unittest.skipIf(not paddle.is_compiled_with_npu(),
"core is not compiled with NPU")
class TestDropoutOp(OpTest): class TestDropoutOp(OpTest):
def setUp(self): def setUp(self):
self.op_type = "dropout" self.op_type = "dropout"
...@@ -55,17 +53,14 @@ class TestDropoutOp(OpTest): ...@@ -55,17 +53,14 @@ class TestDropoutOp(OpTest):
self.place = paddle.NPUPlace(0) self.place = paddle.NPUPlace(0)
def test_check_output(self): def test_check_output(self):
self.check_output_with_place(self.place, check_dygraph=False) self.check_output_with_place(self.place)
def test_check_grad_normal(self): def test_check_grad_normal(self):
if self.dtype == np.float16: if self.dtype == np.float16:
return return
self.check_grad_with_place( self.check_grad_with_place(self.place, ['X'], 'Out')
self.place, ['X'], 'Out', check_dygraph=False)
@unittest.skipIf(not paddle.is_compiled_with_npu(),
"core is not compiled with NPU")
class TestDropoutOpInput1d(TestDropoutOp): class TestDropoutOpInput1d(TestDropoutOp):
# change input shape # change input shape
def setUp(self): def setUp(self):
...@@ -85,15 +80,13 @@ class TestDropoutOpInput1d(TestDropoutOp): ...@@ -85,15 +80,13 @@ class TestDropoutOpInput1d(TestDropoutOp):
} }
@unittest.skipIf(not paddle.is_compiled_with_npu(),
"core is not compiled with NPU")
class TestDropoutOpInput1d(TestDropoutOp): class TestDropoutOpInput1d(TestDropoutOp):
# the input is 1-D # the input is 1-D
def setUp(self): def setUp(self):
self.op_type = "dropout" self.op_type = "dropout"
self.set_npu() self.set_npu()
self.init_dtype() self.init_dtype()
self.inputs = {'X': np.random.random((2000, )).astype(self.dtype)} self.inputs = {'X': np.random.random((2000)).astype(self.dtype)}
self.attrs = { self.attrs = {
'dropout_prob': 0.0, 'dropout_prob': 0.0,
'fix_seed': True, 'fix_seed': True,
...@@ -106,8 +99,6 @@ class TestDropoutOpInput1d(TestDropoutOp): ...@@ -106,8 +99,6 @@ class TestDropoutOpInput1d(TestDropoutOp):
} }
@unittest.skipIf(not paddle.is_compiled_with_npu(),
"core is not compiled with NPU")
class TestDropoutOp2(TestDropoutOp): class TestDropoutOp2(TestDropoutOp):
# the dropout_prob is 1.0 # the dropout_prob is 1.0
def setUp(self): def setUp(self):
...@@ -127,8 +118,6 @@ class TestDropoutOp2(TestDropoutOp): ...@@ -127,8 +118,6 @@ class TestDropoutOp2(TestDropoutOp):
} }
@unittest.skipIf(not paddle.is_compiled_with_npu(),
"core is not compiled with NPU")
class TestDropoutOp3(TestDropoutOp): class TestDropoutOp3(TestDropoutOp):
# the input dim is 3 # the input dim is 3
def setUp(self): def setUp(self):
...@@ -148,8 +137,6 @@ class TestDropoutOp3(TestDropoutOp): ...@@ -148,8 +137,6 @@ class TestDropoutOp3(TestDropoutOp):
} }
@unittest.skipIf(not paddle.is_compiled_with_npu(),
"core is not compiled with NPU")
@skip_check_grad_ci(reason="For inference, check_grad is not required.") @skip_check_grad_ci(reason="For inference, check_grad is not required.")
class TestDropoutOpInference(OpTest): class TestDropoutOpInference(OpTest):
# is_test = True # is_test = True
...@@ -174,11 +161,9 @@ class TestDropoutOpInference(OpTest): ...@@ -174,11 +161,9 @@ class TestDropoutOpInference(OpTest):
self.place = paddle.NPUPlace(0) self.place = paddle.NPUPlace(0)
def test_check_output(self): def test_check_output(self):
self.check_output_with_place(self.place, check_dygraph=False) self.check_output_with_place(self.place)
@unittest.skipIf(not paddle.is_compiled_with_npu(),
"core is not compiled with NPU")
@skip_check_grad_ci(reason="For inference, check_grad is not required.") @skip_check_grad_ci(reason="For inference, check_grad is not required.")
class TestDropoutOpInference2(TestDropoutOpInference): class TestDropoutOpInference2(TestDropoutOpInference):
def setUp(self): def setUp(self):
...@@ -194,8 +179,6 @@ class TestDropoutOpInference2(TestDropoutOpInference): ...@@ -194,8 +179,6 @@ class TestDropoutOpInference2(TestDropoutOpInference):
self.outputs = {'Out': self.inputs['X']} self.outputs = {'Out': self.inputs['X']}
@unittest.skipIf(not paddle.is_compiled_with_npu(),
"core is not compiled with NPU")
class TestDropoutOpWithSeed(TestDropoutOp): class TestDropoutOpWithSeed(TestDropoutOp):
# the seed is a Tensor # the seed is a Tensor
def setUp(self): def setUp(self):
...@@ -218,8 +201,6 @@ class TestDropoutOpWithSeed(TestDropoutOp): ...@@ -218,8 +201,6 @@ class TestDropoutOpWithSeed(TestDropoutOp):
} }
@unittest.skipIf(not paddle.is_compiled_with_npu(),
"core is not compiled with NPU")
class TestDropoutOpFp16(TestDropoutOp): class TestDropoutOpFp16(TestDropoutOp):
# float16 # float16
def init_dtype(self): def init_dtype(self):
...@@ -231,8 +212,6 @@ class TestDropoutOpFp16(TestDropoutOp): ...@@ -231,8 +212,6 @@ class TestDropoutOpFp16(TestDropoutOp):
self.place = paddle.NPUPlace(0) self.place = paddle.NPUPlace(0)
@unittest.skipIf(not paddle.is_compiled_with_npu(),
"core is not compiled with NPU")
class TestDropoutAPI(unittest.TestCase): class TestDropoutAPI(unittest.TestCase):
def setUp(self): def setUp(self):
np.random.seed(123) np.random.seed(123)
......
python/paddle/fluid/tests/unittests/npu/test_elementwise_add_op_npu.py
浏览文件 @ 712f9fe5
...@@ -25,8 +25,6 @@ import paddle.fluid as fluid ...@@ -25,8 +25,6 @@ import paddle.fluid as fluid
paddle.enable_static() paddle.enable_static()
@unittest.skipIf(not paddle.is_compiled_with_npu(),
"core is not compiled with NPU")
class TestElementwiseAddOp(OpTest): class TestElementwiseAddOp(OpTest):
def setUp(self): def setUp(self):
self.set_npu() self.set_npu()
...@@ -62,34 +60,32 @@ class TestElementwiseAddOp(OpTest): ...@@ -62,34 +60,32 @@ class TestElementwiseAddOp(OpTest):
self.axis = -1 self.axis = -1
def test_check_output(self): def test_check_output(self):
self.check_output_with_place(self.place, check_dygraph=False) self.check_output_with_place(self.place)
def test_check_grad_normal(self): def test_check_grad_normal(self):
self.check_grad_with_place( self.check_grad_with_place(
self.place, ['X', 'Y'], self.place,
['X', 'Y'],
'Out', 'Out',
max_relative_error=0.006, max_relative_error=0.006, )
check_dygraph=False)
def test_check_grad_ingore_x(self): def test_check_grad_ingore_x(self):
self.check_grad_with_place( self.check_grad_with_place(
self.place, ['Y'], self.place,
['Y'],
'Out', 'Out',
no_grad_set=set("X"), no_grad_set=set("X"),
max_relative_error=0.006, max_relative_error=0.006, )
check_dygraph=False)
def test_check_grad_ingore_y(self): def test_check_grad_ingore_y(self):
self.check_grad_with_place( self.check_grad_with_place(
self.place, ['X'], self.place,
['X'],
'Out', 'Out',
no_grad_set=set("Y"), no_grad_set=set("Y"),
max_relative_error=0.006, max_relative_error=0.006, )
check_dygraph=False)
@unittest.skipIf(not paddle.is_compiled_with_npu(),
"core is not compiled with NPU")
class TestAddAPI(unittest.TestCase): class TestAddAPI(unittest.TestCase):
def test_name(self): def test_name(self):
with paddle.static.program_guard(paddle.static.Program()): with paddle.static.program_guard(paddle.static.Program()):
...@@ -134,8 +130,6 @@ class TestAddAPI(unittest.TestCase): ...@@ -134,8 +130,6 @@ class TestAddAPI(unittest.TestCase):
msg="z_value = {}, but expected {}".format(z_value, z_expected)) msg="z_value = {}, but expected {}".format(z_value, z_expected))
@unittest.skipIf(not paddle.is_compiled_with_npu(),
"core is not compiled with NPU")
class TestAddError(unittest.TestCase): class TestAddError(unittest.TestCase):
def test_errors(self): def test_errors(self):
with paddle.static.program_guard(paddle.static.Program()): with paddle.static.program_guard(paddle.static.Program()):
......
python/paddle/fluid/tests/unittests/npu/test_elementwise_div_op_npu.py
浏览文件 @ 712f9fe5
...@@ -26,8 +26,6 @@ paddle.enable_static() ...@@ -26,8 +26,6 @@ paddle.enable_static()
SEED = 2021 SEED = 2021
@unittest.skipIf(not paddle.is_compiled_with_npu(),
"core is not compiled with NPU")
class TestElementwiseDiv(OpTest): class TestElementwiseDiv(OpTest):
def setUp(self): def setUp(self):
self.set_npu() self.set_npu()
...@@ -54,30 +52,28 @@ class TestElementwiseDiv(OpTest): ...@@ -54,30 +52,28 @@ class TestElementwiseDiv(OpTest):
self.dtype = np.float32 self.dtype = np.float32
def test_check_output(self): def test_check_output(self):
self.check_output_with_place(self.place, check_dygraph=False) self.check_output_with_place(self.place)
def test_check_grad_normal(self): def test_check_grad_normal(self):
self.check_grad_with_place( self.check_grad_with_place(
self.place, ['X', 'Y'], self.place,
['X', 'Y'],
'Out', 'Out',
max_relative_error=0.007, max_relative_error=0.007, )
check_dygraph=False)
def test_check_grad_ingore_x(self): def test_check_grad_ingore_x(self):
self.check_grad_with_place( self.check_grad_with_place(
self.place, ['Y'], self.place,
['Y'],
'Out', 'Out',
max_relative_error=0.007, max_relative_error=0.007,
no_grad_set=set("X"), no_grad_set=set("X"), )
check_dygraph=False)
def test_check_grad_ingore_y(self): def test_check_grad_ingore_y(self):
self.check_grad_with_place( self.check_grad_with_place(
self.place, ['X'], 'Out', no_grad_set=set("Y"), check_dygraph=False) self.place, ['X'], 'Out', no_grad_set=set("Y"))
@unittest.skipIf(not paddle.is_compiled_with_npu(),
"core is not compiled with NPU")
class TestElementwiseDivFp16(OpTest): class TestElementwiseDivFp16(OpTest):
def setUp(self): def setUp(self):
self.set_npu() self.set_npu()
...@@ -105,11 +101,9 @@ class TestElementwiseDivFp16(OpTest): ...@@ -105,11 +101,9 @@ class TestElementwiseDivFp16(OpTest):
self.dtype = np.float16 self.dtype = np.float16
def test_check_output(self): def test_check_output(self):
self.check_output_with_place(self.place, check_dygraph=False, atol=1e-5) self.check_output_with_place(self.place, atol=1e-5)
@unittest.skipIf(not paddle.is_compiled_with_npu(),
"core is not compiled with NPU")
class TestElementwiseDivNet(unittest.TestCase): class TestElementwiseDivNet(unittest.TestCase):
def _test(self, run_npu=True): def _test(self, run_npu=True):
main_prog = paddle.static.Program() main_prog = paddle.static.Program()
......
python/paddle/fluid/tests/unittests/npu/test_elementwise_floordiv_op_npu.py
浏览文件 @ 712f9fe5
...@@ -24,8 +24,6 @@ import paddle ...@@ -24,8 +24,6 @@ import paddle
paddle.enable_static() paddle.enable_static()
@unittest.skipIf(not paddle.is_compiled_with_npu(),
"core is not compiled with NPU")
class TestElementwiseFloorDiv(OpTest): class TestElementwiseFloorDiv(OpTest):
def setUp(self): def setUp(self):
self.op_type = "elementwise_floordiv" self.op_type = "elementwise_floordiv"
...@@ -53,11 +51,9 @@ class TestElementwiseFloorDiv(OpTest): ...@@ -53,11 +51,9 @@ class TestElementwiseFloorDiv(OpTest):
self.dtype = "int64" self.dtype = "int64"
def test_check_output(self): def test_check_output(self):
self.check_output_with_place(self.place, check_dygraph=False) self.check_output_with_place(self.place)
@unittest.skipIf(not paddle.is_compiled_with_npu(),
"core is not compiled with NPU")
class TestElementwiseFloorDiv2(TestElementwiseFloorDiv): class TestElementwiseFloorDiv2(TestElementwiseFloorDiv):
def init_dtype(self): def init_dtype(self):
self.dtype = "int32" self.dtype = "int32"
......
python/paddle/fluid/tests/unittests/test_elementwise_max_op_npu.py → python/paddle/fluid/tests/unittests/npu/test_elementwise_max_op_npu.py
浏览文件 @ 712f9fe5
...@@ -26,8 +26,6 @@ paddle.enable_static() ...@@ -26,8 +26,6 @@ paddle.enable_static()
SEED = 2021 SEED = 2021
@unittest.skipIf(not paddle.is_compiled_with_npu(),
"core is not compiled with NPU")
class TestElementwiseMax(OpTest): class TestElementwiseMax(OpTest):
def setUp(self): def setUp(self):
self.set_npu() self.set_npu()
...@@ -54,7 +52,7 @@ class TestElementwiseMax(OpTest): ...@@ -54,7 +52,7 @@ class TestElementwiseMax(OpTest):
self.dtype = np.float32 self.dtype = np.float32
def test_check_output(self): def test_check_output(self):
self.check_output_with_place(self.place, check_dygraph=False) self.check_output_with_place(self.place)
# TODO(ascendrc): Max grad test # TODO(ascendrc): Max grad test
# def test_check_grad(self): # def test_check_grad(self):
...@@ -64,8 +62,6 @@ class TestElementwiseMax(OpTest): ...@@ -64,8 +62,6 @@ class TestElementwiseMax(OpTest):
# #
@unittest.skipIf(not paddle.is_compiled_with_npu(),
"core is not compiled with NPU")
class TestElementwiseMaxFp16(OpTest): class TestElementwiseMaxFp16(OpTest):
def setUp(self): def setUp(self):
self.set_npu() self.set_npu()
...@@ -93,11 +89,9 @@ class TestElementwiseMaxFp16(OpTest): ...@@ -93,11 +89,9 @@ class TestElementwiseMaxFp16(OpTest):
self.dtype = np.float16 self.dtype = np.float16
def test_check_output(self): def test_check_output(self):
self.check_output_with_place(self.place, check_dygraph=False, atol=1e-5) self.check_output_with_place(self.place, atol=1e-5)
@unittest.skipIf(not paddle.is_compiled_with_npu(),
"core is not compiled with NPU")
class TestElementwiseMaxNet(unittest.TestCase): class TestElementwiseMaxNet(unittest.TestCase):
def _test(self, run_npu=True): def _test(self, run_npu=True):
main_prog = paddle.static.Program() main_prog = paddle.static.Program()
......
python/paddle/fluid/tests/unittests/npu/test_elementwise_min_op_npu.py
浏览文件 @ 712f9fe5
...@@ -26,8 +26,6 @@ paddle.enable_static() ...@@ -26,8 +26,6 @@ paddle.enable_static()
SEED = 2021 SEED = 2021
@unittest.skipIf(not paddle.is_compiled_with_npu(),
"core is not compiled with NPU")
class TestElementwiseMin(OpTest): class TestElementwiseMin(OpTest):
def setUp(self): def setUp(self):
self.set_npu() self.set_npu()
...@@ -54,7 +52,7 @@ class TestElementwiseMin(OpTest): ...@@ -54,7 +52,7 @@ class TestElementwiseMin(OpTest):
self.dtype = np.float32 self.dtype = np.float32
def test_check_output(self): def test_check_output(self):
self.check_output_with_place(self.place, check_dygraph=False) self.check_output_with_place(self.place)
# TODO(ascendrc): Min grad test # TODO(ascendrc): Min grad test
# def test_check_grad(self): # def test_check_grad(self):
...@@ -64,8 +62,6 @@ class TestElementwiseMin(OpTest): ...@@ -64,8 +62,6 @@ class TestElementwiseMin(OpTest):
# #
@unittest.skipIf(not paddle.is_compiled_with_npu(),
"core is not compiled with NPU")
class TestElementwiseMinFp16(OpTest): class TestElementwiseMinFp16(OpTest):
def setUp(self): def setUp(self):
self.set_npu() self.set_npu()
...@@ -93,11 +89,9 @@ class TestElementwiseMinFp16(OpTest): ...@@ -93,11 +89,9 @@ class TestElementwiseMinFp16(OpTest):
self.dtype = np.float16 self.dtype = np.float16
def test_check_output(self): def test_check_output(self):
self.check_output_with_place(self.place, check_dygraph=False, atol=1e-5) self.check_output_with_place(self.place, atol=1e-5)
@unittest.skipIf(not paddle.is_compiled_with_npu(),
"core is not compiled with NPU")
class TestElementwiseMinNet(unittest.TestCase): class TestElementwiseMinNet(unittest.TestCase):
def _test(self, run_npu=True): def _test(self, run_npu=True):
main_prog = paddle.static.Program() main_prog = paddle.static.Program()
......
python/paddle/fluid/tests/unittests/npu/test_elementwise_mul_op_npu.py
浏览文件 @ 712f9fe5
...@@ -26,8 +26,6 @@ paddle.enable_static() ...@@ -26,8 +26,6 @@ paddle.enable_static()
SEED = 2021 SEED = 2021
@unittest.skipIf(not paddle.is_compiled_with_npu(),
"core is not compiled with NPU")
class TestElementwiseMul(OpTest): class TestElementwiseMul(OpTest):
def setUp(self): def setUp(self):
self.set_npu() self.set_npu()
...@@ -54,7 +52,7 @@ class TestElementwiseMul(OpTest): ...@@ -54,7 +52,7 @@ class TestElementwiseMul(OpTest):
self.dtype = np.float32 self.dtype = np.float32
def test_check_output(self): def test_check_output(self):
self.check_output_with_place(self.place, check_dygraph=False) self.check_output_with_place(self.place)
# TODO(ascendrc): Mul grad test # TODO(ascendrc): Mul grad test
# def test_check_grad(self): # def test_check_grad(self):
...@@ -64,8 +62,6 @@ class TestElementwiseMul(OpTest): ...@@ -64,8 +62,6 @@ class TestElementwiseMul(OpTest):
# #
@unittest.skipIf(not paddle.is_compiled_with_npu(),
"core is not compiled with NPU")
class TestElementwiseMulFp16(OpTest): class TestElementwiseMulFp16(OpTest):
def setUp(self): def setUp(self):
self.set_npu() self.set_npu()
...@@ -93,11 +89,9 @@ class TestElementwiseMulFp16(OpTest): ...@@ -93,11 +89,9 @@ class TestElementwiseMulFp16(OpTest):
self.dtype = np.float16 self.dtype = np.float16
def test_check_output(self): def test_check_output(self):
self.check_output_with_place(self.place, check_dygraph=False, atol=1e-5) self.check_output_with_place(self.place, atol=1e-5)
@unittest.skipIf(not paddle.is_compiled_with_npu(),
"core is not compiled with NPU")
class TestElementwiseMulNet(unittest.TestCase): class TestElementwiseMulNet(unittest.TestCase):
def _test(self, run_npu=True): def _test(self, run_npu=True):
main_prog = paddle.static.Program() main_prog = paddle.static.Program()
......
python/paddle/fluid/tests/unittests/npu/test_elementwise_pow_op_npu.py
浏览文件 @ 712f9fe5
...@@ -26,8 +26,6 @@ paddle.enable_static() ...@@ -26,8 +26,6 @@ paddle.enable_static()
SEED = 2021 SEED = 2021
@unittest.skipIf(not paddle.is_compiled_with_npu(),
"core is not compiled with NPU")
class TestElementwisePow(OpTest): class TestElementwisePow(OpTest):
def setUp(self): def setUp(self):
self.set_npu() self.set_npu()
...@@ -54,7 +52,7 @@ class TestElementwisePow(OpTest): ...@@ -54,7 +52,7 @@ class TestElementwisePow(OpTest):
self.dtype = np.float32 self.dtype = np.float32
def test_check_output(self): def test_check_output(self):
self.check_output_with_place(self.place, check_dygraph=False) self.check_output_with_place(self.place)
# TODO(ascendrc): Pow grad test # TODO(ascendrc): Pow grad test
# def test_check_grad(self): # def test_check_grad(self):
...@@ -64,8 +62,6 @@ class TestElementwisePow(OpTest): ...@@ -64,8 +62,6 @@ class TestElementwisePow(OpTest):
# #
@unittest.skipIf(not paddle.is_compiled_with_npu(),
"core is not compiled with NPU")
class TestElementwisePowFp16(OpTest): class TestElementwisePowFp16(OpTest):
def setUp(self): def setUp(self):
self.set_npu() self.set_npu()
...@@ -93,11 +89,9 @@ class TestElementwisePowFp16(OpTest): ...@@ -93,11 +89,9 @@ class TestElementwisePowFp16(OpTest):
self.dtype = np.float16 self.dtype = np.float16
def test_check_output(self): def test_check_output(self):
self.check_output_with_place(self.place, check_dygraph=False, atol=1e-5) self.check_output_with_place(self.place, atol=1e-5)
@unittest.skipIf(not paddle.is_compiled_with_npu(),
"core is not compiled with NPU")
class TestElementwisePowNet(unittest.TestCase): class TestElementwisePowNet(unittest.TestCase):
def _test(self, run_npu=True): def _test(self, run_npu=True):
main_prog = paddle.static.Program() main_prog = paddle.static.Program()
......
python/paddle/fluid/tests/unittests/npu/test_elementwise_sub_op_npu.py
浏览文件 @ 712f9fe5
...@@ -27,8 +27,6 @@ paddle.enable_static() ...@@ -27,8 +27,6 @@ paddle.enable_static()
SEED = 2021 SEED = 2021
@unittest.skipIf(not paddle.is_compiled_with_npu(),
"core is not compiled with NPU")
class TestElementwiseSubOp(OpTest): class TestElementwiseSubOp(OpTest):
def setUp(self): def setUp(self):
self.set_npu() self.set_npu()
...@@ -64,7 +62,7 @@ class TestElementwiseSubOp(OpTest): ...@@ -64,7 +62,7 @@ class TestElementwiseSubOp(OpTest):
self.axis = 0 self.axis = 0
def test_check_output(self): def test_check_output(self):
self.check_output_with_place(self.place, check_dygraph=False) self.check_output_with_place(self.place)
# TODO(ascendrc): For grad tests, OpTest raises FatalError:Segmentation fault # TODO(ascendrc): For grad tests, OpTest raises FatalError:Segmentation fault
# when call op.run, which may be caused by system environment exception # when call op.run, which may be caused by system environment exception
...@@ -74,7 +72,7 @@ class TestElementwiseSubOp(OpTest): ...@@ -74,7 +72,7 @@ class TestElementwiseSubOp(OpTest):
# self.place, ['X', 'Y'], # self.place, ['X', 'Y'],
# 'Out', # 'Out',
# max_relative_error=0.006, # max_relative_error=0.006,
# check_dygraph=False) # )
# #
# def test_check_grad_ingore_x(self): # def test_check_grad_ingore_x(self):
# self.check_grad_with_place( # self.check_grad_with_place(
...@@ -82,18 +80,16 @@ class TestElementwiseSubOp(OpTest): ...@@ -82,18 +80,16 @@ class TestElementwiseSubOp(OpTest):
# 'Out', # 'Out',
# no_grad_set=set("X"), # no_grad_set=set("X"),
# max_relative_error=0.006, # max_relative_error=0.006,
# check_dygraph=False) # )
# #
# def test_check_grad_ingore_y(self): # def test_check_grad_ingore_y(self):
# self.check_grad_with_place( # self.check_grad_with_place(
# self.place, ['X'], # self.place, ['X'],
# 'Out', # 'Out',
# no_grad_set=set("Y"), # no_grad_set=set("Y"),
# max_relative_error=0.006,check_dygraph=False) # max_relative_error=0.006,)
@unittest.skipIf(not paddle.is_compiled_with_npu(),
"core is not compiled with NPU")
class TestSubtractAPI(unittest.TestCase): class TestSubtractAPI(unittest.TestCase):
def test_name(self): def test_name(self):
with paddle.static.program_guard(paddle.static.Program()): with paddle.static.program_guard(paddle.static.Program()):
...@@ -138,8 +134,6 @@ class TestSubtractAPI(unittest.TestCase): ...@@ -138,8 +134,6 @@ class TestSubtractAPI(unittest.TestCase):
msg="z_value = {}, but expected {}".format(z_value, z_expected)) msg="z_value = {}, but expected {}".format(z_value, z_expected))
@unittest.skipIf(not paddle.is_compiled_with_npu(),
"core is not compiled with NPU")
class TestSubtractError(unittest.TestCase): class TestSubtractError(unittest.TestCase):
def test_errors(self): def test_errors(self):
with paddle.static.program_guard(paddle.static.Program()): with paddle.static.program_guard(paddle.static.Program()):
...@@ -158,8 +152,6 @@ class TestSubtractError(unittest.TestCase): ...@@ -158,8 +152,6 @@ class TestSubtractError(unittest.TestCase):
self.assertRaises(TypeError, paddle.subtract, x2, y2) self.assertRaises(TypeError, paddle.subtract, x2, y2)
@unittest.skipIf(not paddle.is_compiled_with_npu(),
"core is not compiled with NPU")
class TestSubtractNet(unittest.TestCase): class TestSubtractNet(unittest.TestCase):
def _test(self, run_npu=True): def _test(self, run_npu=True):
main_prog = paddle.static.Program() main_prog = paddle.static.Program()
......
python/paddle/fluid/tests/unittests/npu/test_expand_op_npu.py
浏览文件 @ 712f9fe5
...@@ -26,8 +26,6 @@ paddle.enable_static() ...@@ -26,8 +26,6 @@ paddle.enable_static()
SEED = 2021 SEED = 2021
@unittest.skipIf(not paddle.is_compiled_with_npu(),
"core is not compiled with NPU")
class TestExpand(OpTest): class TestExpand(OpTest):
def setUp(self): def setUp(self):
self.set_npu() self.set_npu()
...@@ -50,7 +48,7 @@ class TestExpand(OpTest): ...@@ -50,7 +48,7 @@ class TestExpand(OpTest):
self.dtype = np.float32 self.dtype = np.float32
def test_check_output(self): def test_check_output(self):
self.check_output_with_place(self.place, check_dygraph=False) self.check_output_with_place(self.place)
# TODO(ascendrc): Add grad test # TODO(ascendrc): Add grad test
# def test_check_grad(self): # def test_check_grad(self):
...@@ -60,8 +58,6 @@ class TestExpand(OpTest): ...@@ -60,8 +58,6 @@ class TestExpand(OpTest):
# #
@unittest.skipIf(not paddle.is_compiled_with_npu(),
"core is not compiled with NPU")
class TestExpandV2(TestExpand): class TestExpandV2(TestExpand):
def setUp(self): def setUp(self):
self.set_npu() self.set_npu()
...@@ -82,8 +78,6 @@ class TestExpandV2(TestExpand): ...@@ -82,8 +78,6 @@ class TestExpandV2(TestExpand):
self.outputs = {'Out': out} self.outputs = {'Out': out}
@unittest.skipIf(not paddle.is_compiled_with_npu(),
"core is not compiled with NPU")
class TestExpandFp16(TestExpand): class TestExpandFp16(TestExpand):
no_need_check_grad = True no_need_check_grad = True
...@@ -91,8 +85,6 @@ class TestExpandFp16(TestExpand): ...@@ -91,8 +85,6 @@ class TestExpandFp16(TestExpand):
self.dtype = np.float16 self.dtype = np.float16
@unittest.skipIf(not paddle.is_compiled_with_npu(),
"core is not compiled with NPU")
class TestExpandNet(unittest.TestCase): class TestExpandNet(unittest.TestCase):
def _test(self, run_npu=True): def _test(self, run_npu=True):
main_prog = paddle.static.Program() main_prog = paddle.static.Program()
......
python/paddle/fluid/tests/unittests/npu/test_fill_constant_op_npu.py
浏览文件 @ 712f9fe5
...@@ -27,8 +27,6 @@ paddle.enable_static() ...@@ -27,8 +27,6 @@ paddle.enable_static()
SEED = 2021 SEED = 2021
@unittest.skipIf(not paddle.is_compiled_with_npu(),
"core is not compiled with NPU")
class TestFillConstant(OpTest): class TestFillConstant(OpTest):
def setUp(self): def setUp(self):
self.set_npu() self.set_npu()
...@@ -47,7 +45,7 @@ class TestFillConstant(OpTest): ...@@ -47,7 +45,7 @@ class TestFillConstant(OpTest):
self.dtype = np.float32 self.dtype = np.float32
def test_check_output(self): def test_check_output(self):
self.check_output_with_place(self.place, check_dygraph=False) self.check_output_with_place(self.place)
class TestFillConstantInt(OpTest): class TestFillConstantInt(OpTest):
...@@ -71,7 +69,7 @@ class TestFillConstantInt(OpTest): ...@@ -71,7 +69,7 @@ class TestFillConstantInt(OpTest):
self.dtype = np.int32 self.dtype = np.int32
def test_check_output(self): def test_check_output(self):
self.check_output_with_place(self.place, check_dygraph=False) self.check_output_with_place(self.place)
class TestFillConstantFP16(OpTest): class TestFillConstantFP16(OpTest):
...@@ -95,7 +93,7 @@ class TestFillConstantFP16(OpTest): ...@@ -95,7 +93,7 @@ class TestFillConstantFP16(OpTest):
self.dtype = np.float16 self.dtype = np.float16
def test_check_output(self): def test_check_output(self):
self.check_output_with_place(self.place, check_dygraph=False, atol=1e-3) self.check_output_with_place(self.place, atol=1e-3)
if __name__ == '__main__': if __name__ == '__main__':
......
python/paddle/fluid/tests/unittests/npu/test_gather_op_npu.py
浏览文件 @ 712f9fe5
...@@ -34,8 +34,6 @@ def gather_numpy(x, index, axis): ...@@ -34,8 +34,6 @@ def gather_numpy(x, index, axis):
return gather return gather
@unittest.skipIf(not paddle.is_compiled_with_npu(),
"core is not compiled with NPU")
class TestGatherOp(OpTest): class TestGatherOp(OpTest):
def setUp(self): def setUp(self):
self.set_npu() self.set_npu()
...@@ -53,14 +51,14 @@ class TestGatherOp(OpTest): ...@@ -53,14 +51,14 @@ class TestGatherOp(OpTest):
self.__class__.use_npu = True self.__class__.use_npu = True
def test_check_output(self): def test_check_output(self):
self.check_output_with_place(self.place, check_dygraph=False) self.check_output_with_place(self.place)
def test_check_grad(self): def test_check_grad(self):
self.check_grad_with_place( self.check_grad_with_place(
self.place, ['X'], self.place,
['X'],
'Out', 'Out',
max_relative_error=0.006, max_relative_error=0.006, )
check_dygraph=False)
def config(self): def config(self):
""" """
...@@ -72,8 +70,6 @@ class TestGatherOp(OpTest): ...@@ -72,8 +70,6 @@ class TestGatherOp(OpTest):
self.index_type = "int32" self.index_type = "int32"
@unittest.skipIf(not paddle.is_compiled_with_npu(),
"core is not compiled with NPU")
class TestCase1(TestGatherOp): class TestCase1(TestGatherOp):
def config(self): def config(self):
""" """
...@@ -85,8 +81,6 @@ class TestCase1(TestGatherOp): ...@@ -85,8 +81,6 @@ class TestCase1(TestGatherOp):
self.index_type = "int32" self.index_type = "int32"
@unittest.skipIf(not paddle.is_compiled_with_npu(),
"core is not compiled with NPU")
class API_TestGather(unittest.TestCase): class API_TestGather(unittest.TestCase):
def test_out1(self): def test_out1(self):
with fluid.program_guard(fluid.Program(), fluid.Program()): with fluid.program_guard(fluid.Program(), fluid.Program()):
...@@ -120,8 +114,6 @@ class API_TestGather(unittest.TestCase): ...@@ -120,8 +114,6 @@ class API_TestGather(unittest.TestCase):
self.assertTrue(np.allclose(result, expected_output)) self.assertTrue(np.allclose(result, expected_output))
@unittest.skipIf(not paddle.is_compiled_with_npu(),
"core is not compiled with NPU")
class TestGatherGrad(unittest.TestCase): class TestGatherGrad(unittest.TestCase):
def _test(self, run_npu=True): def _test(self, run_npu=True):
main_prog = paddle.static.Program() main_prog = paddle.static.Program()
......
python/paddle/fluid/tests/unittests/npu/test_gaussian_random_op_npu.py
浏览文件 @ 712f9fe5
...@@ -26,8 +26,6 @@ from test_gaussian_random_op import TestGaussianRandomOp ...@@ -26,8 +26,6 @@ from test_gaussian_random_op import TestGaussianRandomOp
paddle.enable_static() paddle.enable_static()
@unittest.skipIf(not paddle.is_compiled_with_npu(),
"core is not compiled with NPU")
class TestNPUGaussianRandomOp(OpTest): class TestNPUGaussianRandomOp(OpTest):
def setUp(self): def setUp(self):
self.set_npu() self.set_npu()
......
python/paddle/fluid/tests/unittests/npu/test_gelu_op_npu.py
浏览文件 @ 712f9fe5
...@@ -32,8 +32,6 @@ def np_gelu(x): ...@@ -32,8 +32,6 @@ def np_gelu(x):
return y return y
@unittest.skipIf(not paddle.is_compiled_with_npu(),
"core is not compiled with NPU")
class TestGelu(OpTest): class TestGelu(OpTest):
def setUp(self): def setUp(self):
self.set_npu() self.set_npu()
...@@ -56,18 +54,13 @@ class TestGelu(OpTest): ...@@ -56,18 +54,13 @@ class TestGelu(OpTest):
self.dtype = np.float32 self.dtype = np.float32
def test_check_output(self): def test_check_output(self):
self.check_output_with_place(self.place, check_dygraph=False, atol=1e-3) self.check_output_with_place(self.place, atol=1e-3)
def test_check_grad(self): def test_check_grad(self):
self.check_grad_with_place( self.check_grad_with_place(
self.place, ['X'], self.place, ['X'], 'Out', max_relative_error=0.007)
'Out',
check_dygraph=False,
max_relative_error=0.007)
@unittest.skipIf(not paddle.is_compiled_with_npu(),
"core is not compiled with NPU")
class TestGeluFp16(OpTest): class TestGeluFp16(OpTest):
def setUp(self): def setUp(self):
self.set_npu() self.set_npu()
...@@ -91,11 +84,9 @@ class TestGeluFp16(OpTest): ...@@ -91,11 +84,9 @@ class TestGeluFp16(OpTest):
self.dtype = np.float16 self.dtype = np.float16
def test_check_output(self): def test_check_output(self):
self.check_output_with_place(self.place, check_dygraph=False, atol=1e-3) self.check_output_with_place(self.place, atol=1e-3)
@unittest.skipIf(not paddle.is_compiled_with_npu(),
"core is not compiled with NPU")
class TestGeluNet(unittest.TestCase): class TestGeluNet(unittest.TestCase):
def _test(self, run_npu=True): def _test(self, run_npu=True):
main_prog = paddle.static.Program() main_prog = paddle.static.Program()
......
python/paddle/fluid/tests/unittests/npu/test_increment_op_npu.py
浏览文件 @ 712f9fe5
...@@ -29,8 +29,6 @@ SEED = 2021 ...@@ -29,8 +29,6 @@ SEED = 2021
NPUPlace = 0 NPUPlace = 0
@unittest.skipIf(not paddle.is_compiled_with_npu(),
"core is not compiled with NPU")
class TestIncrement(OpTest): class TestIncrement(OpTest):
def setUp(self): def setUp(self):
self.set_npu() self.set_npu()
...@@ -54,11 +52,9 @@ class TestIncrement(OpTest): ...@@ -54,11 +52,9 @@ class TestIncrement(OpTest):
self.dtype = np.int64 self.dtype = np.int64
def test_check_output(self): def test_check_output(self):
self.check_output_with_place(self.place, check_dygraph=False) self.check_output_with_place(self.place)
@unittest.skipIf(not paddle.is_compiled_with_npu(),
"core is not compiled with NPU")
class TestIncrementFP16(OpTest): class TestIncrementFP16(OpTest):
def setUp(self): def setUp(self):
self.set_npu() self.set_npu()
...@@ -82,11 +78,9 @@ class TestIncrementFP16(OpTest): ...@@ -82,11 +78,9 @@ class TestIncrementFP16(OpTest):
self.dtype = np.float16 self.dtype = np.float16
def test_check_output(self): def test_check_output(self):
self.check_output_with_place(self.place, check_dygraph=False) self.check_output_with_place(self.place)
@unittest.skipIf(not paddle.is_compiled_with_npu(),
"core is not compiled with NPU")
class TestIncrementInplace(unittest.TestCase): class TestIncrementInplace(unittest.TestCase):
def test_npu(self): def test_npu(self):
main_prog = paddle.static.Program() main_prog = paddle.static.Program()
......
python/paddle/fluid/tests/unittests/npu/test_layer_norm_op_npu.py
浏览文件 @ 712f9fe5
...@@ -36,8 +36,6 @@ from op_test import _set_use_system_allocator ...@@ -36,8 +36,6 @@ from op_test import _set_use_system_allocator
_set_use_system_allocator(False) _set_use_system_allocator(False)
@unittest.skipIf(not paddle.is_compiled_with_npu(),
"core is not compiled with NPU")
class TestLayerNormOp(unittest.TestCase): class TestLayerNormOp(unittest.TestCase):
def setUp(self): def setUp(self):
self.use_cudnn = True self.use_cudnn = True
...@@ -191,8 +189,6 @@ class TestLayerNormOp(unittest.TestCase): ...@@ -191,8 +189,6 @@ class TestLayerNormOp(unittest.TestCase):
self.check_forward_backward(shape=[2, 3, 4, 5], begin_norm_axis=3) self.check_forward_backward(shape=[2, 3, 4, 5], begin_norm_axis=3)
@unittest.skipIf(not paddle.is_compiled_with_npu(),
"core is not compiled with NPU")
class TestLayerNormOpFP16(TestLayerNormOp): class TestLayerNormOpFP16(TestLayerNormOp):
def init_dtype(self): def init_dtype(self):
self.dtype = np.float16 self.dtype = np.float16
......
python/paddle/fluid/tests/unittests/npu/test_log_op_npu.py
浏览文件 @ 712f9fe5
...@@ -26,8 +26,6 @@ paddle.enable_static() ...@@ -26,8 +26,6 @@ paddle.enable_static()
SEED = 2021 SEED = 2021
@unittest.skipIf(not paddle.is_compiled_with_npu(),
"core is not compiled with NPU")
class TestLog(OpTest): class TestLog(OpTest):
def setUp(self): def setUp(self):
self.set_npu() self.set_npu()
...@@ -50,7 +48,7 @@ class TestLog(OpTest): ...@@ -50,7 +48,7 @@ class TestLog(OpTest):
self.dtype = np.float32 self.dtype = np.float32
def test_check_output(self): def test_check_output(self):
self.check_output_with_place(self.place, check_dygraph=False) self.check_output_with_place(self.place)
# TODO(ascendrc): Add grad test # TODO(ascendrc): Add grad test
# def test_check_grad(self): # def test_check_grad(self):
...@@ -60,8 +58,6 @@ class TestLog(OpTest): ...@@ -60,8 +58,6 @@ class TestLog(OpTest):
# #
@unittest.skipIf(not paddle.is_compiled_with_npu(),
"core is not compiled with NPU")
class TestLogFp16(OpTest): class TestLogFp16(OpTest):
def setUp(self): def setUp(self):
self.set_npu() self.set_npu()
...@@ -85,11 +81,9 @@ class TestLogFp16(OpTest): ...@@ -85,11 +81,9 @@ class TestLogFp16(OpTest):
self.dtype = np.float16 self.dtype = np.float16
def test_check_output(self): def test_check_output(self):
self.check_output_with_place(self.place, check_dygraph=False, atol=1e-5) self.check_output_with_place(self.place, atol=1e-5)
@unittest.skipIf(not paddle.is_compiled_with_npu(),
"core is not compiled with NPU")
class TestLogNet(unittest.TestCase): class TestLogNet(unittest.TestCase):
def _test(self, run_npu=True): def _test(self, run_npu=True):
main_prog = paddle.static.Program() main_prog = paddle.static.Program()
......
python/paddle/fluid/tests/unittests/npu/test_logical_op_npu.py
浏览文件 @ 712f9fe5
...@@ -220,8 +220,6 @@ def type_map_factory(): ...@@ -220,8 +220,6 @@ def type_map_factory():
} for x_type in x_type_list for y_type in y_type_list] } for x_type in x_type_list for y_type in y_type_list]
@unittest.skipIf(not paddle.is_compiled_with_npu(),
"core is not compiled with NPU")
class TestCPU(unittest.TestCase): class TestCPU(unittest.TestCase):
def test(self): def test(self):
test(self) test(self)
...@@ -235,8 +233,6 @@ class TestCPU(unittest.TestCase): ...@@ -235,8 +233,6 @@ class TestCPU(unittest.TestCase):
test_type_error(self, False, type_map) test_type_error(self, False, type_map)
@unittest.skipIf(not paddle.is_compiled_with_npu(),
"core is not compiled with NPU")
class TestNPU(unittest.TestCase): class TestNPU(unittest.TestCase):
def test(self): def test(self):
test(self, True) test(self, True)
......
python/paddle/fluid/tests/unittests/npu/test_lookup_table_v2_op_npu.py
浏览文件 @ 712f9fe5
...@@ -26,8 +26,6 @@ paddle.enable_static() ...@@ -26,8 +26,6 @@ paddle.enable_static()
SEED = 2021 SEED = 2021
@unittest.skipIf(not paddle.is_compiled_with_npu(),
"core is not compiled with NPU")
class TestLookupTableV2(OpTest): class TestLookupTableV2(OpTest):
def setUp(self): def setUp(self):
self.set_npu() self.set_npu()
...@@ -67,17 +65,14 @@ class TestLookupTableV2(OpTest): ...@@ -67,17 +65,14 @@ class TestLookupTableV2(OpTest):
self.dim = 20 self.dim = 20
def test_check_output(self): def test_check_output(self):
self.check_output_with_place(self.place, check_dygraph=False) self.check_output_with_place(self.place)
def test_check_grad(self): def test_check_grad(self):
if self.dtype == np.float16: if self.dtype == np.float16:
return return
self.check_grad_with_place( self.check_grad_with_place(self.place, ['W'], 'Out')
self.place, ['W'], 'Out', check_dygraph=False)
@unittest.skipIf(not paddle.is_compiled_with_npu(),
"core is not compiled with NPU")
class TestLookupTableV2FP16(TestLookupTableV2): class TestLookupTableV2FP16(TestLookupTableV2):
no_need_check_grad = True no_need_check_grad = True
...@@ -89,16 +84,12 @@ class TestLookupTableV2FP16(TestLookupTableV2): ...@@ -89,16 +84,12 @@ class TestLookupTableV2FP16(TestLookupTableV2):
self.__class__.no_need_check_grad = True self.__class__.no_need_check_grad = True
@unittest.skipIf(not paddle.is_compiled_with_npu(),
"core is not compiled with NPU")
class TestLookupTableV2Dim32(TestLookupTableV2): class TestLookupTableV2Dim32(TestLookupTableV2):
def init_dim(self): def init_dim(self):
# embedding_dim is multiple of 32 # embedding_dim is multiple of 32
self.dim = 64 self.dim = 64
@unittest.skipIf(not paddle.is_compiled_with_npu(),
"core is not compiled with NPU")
class TestLookupTableV2Dim32FP16(TestLookupTableV2): class TestLookupTableV2Dim32FP16(TestLookupTableV2):
no_need_check_grad = True no_need_check_grad = True
......
python/paddle/fluid/tests/unittests/npu/test_matmulv2_op_npu.py
浏览文件 @ 712f9fe5
...@@ -26,15 +26,13 @@ paddle.enable_static() ...@@ -26,15 +26,13 @@ paddle.enable_static()
SEED = 2021 SEED = 2021
@unittest.skipIf(not paddle.is_compiled_with_npu(),
"core is not compiled with NPU")
def reference_matmul(X, Y, transpose_X=False, transpose_Y=False): def reference_matmul(X, Y, transpose_X=False, transpose_Y=False):
"""Reference forward implementation using np.matmul.""" """Reference forward implementation using np.matmul."""
# np.matmul does not support the transpose flags, so we manually # np.matmul does not support the transpose flags, so we manually
# transpose X and Y appropriately. # transpose X and Y appropriately.
if transpose_X: if transpose_X:
if X.ndim == 1: if X.ndim == 1:
X = X.reshape((X.size, )) X = X.reshape((X.size))
elif X.ndim == 2: elif X.ndim == 2:
X = X.T X = X.T
else: else:
...@@ -43,7 +41,7 @@ def reference_matmul(X, Y, transpose_X=False, transpose_Y=False): ...@@ -43,7 +41,7 @@ def reference_matmul(X, Y, transpose_X=False, transpose_Y=False):
X = np.transpose(X, tuple(dim)) X = np.transpose(X, tuple(dim))
if transpose_Y: if transpose_Y:
if Y.ndim == 1: if Y.ndim == 1:
Y = Y.reshape((Y.size, )) Y = Y.reshape((Y.size))
else: else:
dim = [i for i in range(len(Y.shape))] dim = [i for i in range(len(Y.shape))]
dim[-1], dim[len(Y.shape) - 2] = dim[len(Y.shape) - 2], dim[-1] dim[-1], dim[len(Y.shape) - 2] = dim[len(Y.shape) - 2], dim[-1]
...@@ -53,7 +51,7 @@ def reference_matmul(X, Y, transpose_X=False, transpose_Y=False): ...@@ -53,7 +51,7 @@ def reference_matmul(X, Y, transpose_X=False, transpose_Y=False):
if not Out.shape: if not Out.shape:
# We do not support 0-dimensional Tensors (scalars). So where # We do not support 0-dimensional Tensors (scalars). So where
# np.matmul outputs a scalar, we must convert to a Tensor of # np.matmul outputs a scalar, we must convert to a Tensor of
# shape (1, ) instead. # shape (1) instead.
# Everywhere else, we are compatible with np.matmul. # Everywhere else, we are compatible with np.matmul.
Out = np.array([Out], dtype="float64") Out = np.array([Out], dtype="float64")
return Out return Out
...@@ -95,7 +93,7 @@ class TestMatMul(OpTest): ...@@ -95,7 +93,7 @@ class TestMatMul(OpTest):
self.dtype = np.float32 self.dtype = np.float32
def test_check_output(self): def test_check_output(self):
self.check_output_with_place(self.place, check_dygraph=False, atol=1e-5) self.check_output_with_place(self.place, atol=1e-5)
# TODO(ascendrc): Add grad test # TODO(ascendrc): Add grad test
...@@ -137,8 +135,6 @@ class TestMatMul4(TestMatMul): ...@@ -137,8 +135,6 @@ class TestMatMul4(TestMatMul):
self.trans_y = False self.trans_y = False
@unittest.skipIf(not paddle.is_compiled_with_npu(),
"core is not compiled with NPU")
class TestMatMulNet(unittest.TestCase): class TestMatMulNet(unittest.TestCase):
def _test(self, run_npu=True): def _test(self, run_npu=True):
main_prog = paddle.static.Program() main_prog = paddle.static.Program()
...@@ -207,8 +203,8 @@ class TestMatMulNet(unittest.TestCase): ...@@ -207,8 +203,8 @@ class TestMatMulNet(unittest.TestCase):
# The precision is aligned in NPU and GPU separately, which is only used for the usage method. # The precision is aligned in NPU and GPU separately, which is only used for the usage method.
@unittest.skipIf(not paddle.is_compiled_with_npu(),
"core is not compiled with NPU")
class TestMatMulNet3_2(unittest.TestCase): class TestMatMulNet3_2(unittest.TestCase):
def _test(self, run_npu=True): def _test(self, run_npu=True):
main_prog = paddle.static.Program() main_prog = paddle.static.Program()
......
python/paddle/fluid/tests/unittests/npu/test_mean_op_npu.py
浏览文件 @ 712f9fe5
...@@ -27,8 +27,6 @@ paddle.enable_static() ...@@ -27,8 +27,6 @@ paddle.enable_static()
SEED = 2021 SEED = 2021
@unittest.skipIf(not paddle.is_compiled_with_npu(),
"core is not compiled with NPU")
class TestMean(OpTest): class TestMean(OpTest):
def setUp(self): def setUp(self):
self.set_npu() self.set_npu()
...@@ -50,15 +48,12 @@ class TestMean(OpTest): ...@@ -50,15 +48,12 @@ class TestMean(OpTest):
self.dtype = np.float32 self.dtype = np.float32
def test_check_output(self): def test_check_output(self):
self.check_output_with_place(self.place, check_dygraph=False) self.check_output_with_place(self.place)
def test_check_grad(self): def test_check_grad(self):
self.check_grad_with_place( self.check_grad_with_place(self.place, ['X'], 'Out')
self.place, ['X'], 'Out', check_dygraph=False)
@unittest.skipIf(not paddle.is_compiled_with_npu(),
"core is not compiled with NPU")
class TestMeanFP16(OpTest): class TestMeanFP16(OpTest):
def setUp(self): def setUp(self):
self.set_npu() self.set_npu()
...@@ -81,7 +76,7 @@ class TestMeanFP16(OpTest): ...@@ -81,7 +76,7 @@ class TestMeanFP16(OpTest):
self.dtype = np.float16 self.dtype = np.float16
def test_check_output(self): def test_check_output(self):
self.check_output_with_place(self.place, check_dygraph=False) self.check_output_with_place(self.place)
if __name__ == '__main__': if __name__ == '__main__':
......
python/paddle/fluid/tests/unittests/npu/test_memcpy_op_npu.py
浏览文件 @ 712f9fe5
...@@ -28,8 +28,6 @@ paddle.enable_static() ...@@ -28,8 +28,6 @@ paddle.enable_static()
SEED = 2021 SEED = 2021
@unittest.skipIf(not paddle.is_compiled_with_npu(),
"core is not compiled with NPU")
class TestMemcpy_FillConstant(unittest.TestCase): class TestMemcpy_FillConstant(unittest.TestCase):
def get_prog(self): def get_prog(self):
paddle.enable_static() paddle.enable_static()
......
python/paddle/fluid/tests/unittests/npu/test_mul_op_npu.py
浏览文件 @ 712f9fe5
...@@ -52,30 +52,30 @@ class TestMul(OpTest): ...@@ -52,30 +52,30 @@ class TestMul(OpTest):
self.dtype = np.float32 self.dtype = np.float32
def test_check_output(self): def test_check_output(self):
self.check_output_with_place(self.place, check_dygraph=False, atol=1e-5) self.check_output_with_place(self.place, atol=1e-5)
def test_check_grad_normal(self): def test_check_grad_normal(self):
self.check_grad_with_place( self.check_grad_with_place(
self.place, ['X', 'Y'], self.place,
['X', 'Y'],
'Out', 'Out',
max_relative_error=0.0065, max_relative_error=0.0065, )
check_dygraph=False)
def test_check_grad_ingore_x(self): def test_check_grad_ingore_x(self):
self.check_grad_with_place( self.check_grad_with_place(
self.place, ['Y'], self.place,
['Y'],
'Out', 'Out',
no_grad_set=set("X"), no_grad_set=set("X"),
max_relative_error=0.0065, max_relative_error=0.0065, )
check_dygraph=False)
def test_check_grad_ingore_y(self): def test_check_grad_ingore_y(self):
self.check_grad_with_place( self.check_grad_with_place(
self.place, ['X'], self.place,
['X'],
'Out', 'Out',
no_grad_set=set("Y"), no_grad_set=set("Y"),
max_relative_error=0.0065, max_relative_error=0.0065, )
check_dygraph=False)
@skip_check_grad_ci( @skip_check_grad_ci(
...@@ -170,8 +170,6 @@ class TestMul3FP16(TestMul3): ...@@ -170,8 +170,6 @@ class TestMul3FP16(TestMul3):
pass pass
@unittest.skipIf(not paddle.is_compiled_with_npu(),
"core is not compiled with NPU")
class TestMulNet(unittest.TestCase): class TestMulNet(unittest.TestCase):
def init_dtype(self): def init_dtype(self):
self.dtype = np.float32 self.dtype = np.float32
...@@ -243,8 +241,6 @@ class TestMulNet(unittest.TestCase): ...@@ -243,8 +241,6 @@ class TestMulNet(unittest.TestCase):
self.assertTrue(np.allclose(npu_loss, cpu_loss)) self.assertTrue(np.allclose(npu_loss, cpu_loss))
@unittest.skipIf(not paddle.is_compiled_with_npu(),
"core is not compiled with NPU")
class TestMulNet3_2(unittest.TestCase): class TestMulNet3_2(unittest.TestCase):
def init_dtype(self): def init_dtype(self):
self.dtype = np.float32 self.dtype = np.float32
...@@ -317,8 +313,6 @@ class TestMulNet3_2(unittest.TestCase): ...@@ -317,8 +313,6 @@ class TestMulNet3_2(unittest.TestCase):
self.assertTrue(np.allclose(npu_loss, cpu_loss, atol=1e-5)) self.assertTrue(np.allclose(npu_loss, cpu_loss, atol=1e-5))
@unittest.skipIf(not paddle.is_compiled_with_npu(),
"core is not compiled with NPU")
class TestMulNet3_2_xc2(unittest.TestCase): class TestMulNet3_2_xc2(unittest.TestCase):
def init_dtype(self): def init_dtype(self):
self.dtype = np.float32 self.dtype = np.float32
......
python/paddle/fluid/tests/unittests/npu/test_npu_place.py
浏览文件 @ 712f9fe5
...@@ -22,8 +22,6 @@ from paddle.fluid import core ...@@ -22,8 +22,6 @@ from paddle.fluid import core
paddle.enable_static() paddle.enable_static()
@unittest.skipIf(not paddle.is_compiled_with_npu(),
"core is not compiled with NPU")
class TestNpuPlace(unittest.TestCase): class TestNpuPlace(unittest.TestCase):
def test(self): def test(self):
p = core.Place() p = core.Place()
...@@ -33,8 +31,6 @@ class TestNpuPlace(unittest.TestCase): ...@@ -33,8 +31,6 @@ class TestNpuPlace(unittest.TestCase):
self.assertEqual(p.npu_device_id(), 0) self.assertEqual(p.npu_device_id(), 0)
@unittest.skipIf(not paddle.is_compiled_with_npu(),
"core is not compiled with NPU")
class TestNpuPlaceError(unittest.TestCase): class TestNpuPlaceError(unittest.TestCase):
def test_static(self): def test_static(self):
# NPU is not supported in ParallelExecutor # NPU is not supported in ParallelExecutor
......
python/paddle/fluid/tests/unittests/npu/test_pow_op_npu.py
浏览文件 @ 712f9fe5
...@@ -26,8 +26,6 @@ paddle.enable_static() ...@@ -26,8 +26,6 @@ paddle.enable_static()
SEED = 2021 SEED = 2021
@unittest.skipIf(not paddle.is_compiled_with_npu(),
"core is not compiled with NPU")
class TestPow(OpTest): class TestPow(OpTest):
def setUp(self): def setUp(self):
self.set_npu() self.set_npu()
...@@ -50,15 +48,12 @@ class TestPow(OpTest): ...@@ -50,15 +48,12 @@ class TestPow(OpTest):
self.dtype = np.float32 self.dtype = np.float32
def test_check_output(self): def test_check_output(self):
self.check_output_with_place(self.place, check_dygraph=False) self.check_output_with_place(self.place)
def test_check_grad(self): def test_check_grad(self):
self.check_grad_with_place( self.check_grad_with_place(self.place, ['X'], 'Out')
self.place, ['X'], 'Out', check_dygraph=False)
@unittest.skipIf(not paddle.is_compiled_with_npu(),
"core is not compiled with NPU")
class TestPowFp16(OpTest): class TestPowFp16(OpTest):
def setUp(self): def setUp(self):
self.set_npu() self.set_npu()
...@@ -82,11 +77,9 @@ class TestPowFp16(OpTest): ...@@ -82,11 +77,9 @@ class TestPowFp16(OpTest):
self.dtype = np.float16 self.dtype = np.float16
def test_check_output(self): def test_check_output(self):
self.check_output_with_place(self.place, check_dygraph=False, atol=1e-5) self.check_output_with_place(self.place, atol=1e-5)
@unittest.skipIf(not paddle.is_compiled_with_npu(),
"core is not compiled with NPU")
class TestPowNet(unittest.TestCase): class TestPowNet(unittest.TestCase):
def _test(self, run_npu=True): def _test(self, run_npu=True):
main_prog = paddle.static.Program() main_prog = paddle.static.Program()
......
python/paddle/fluid/tests/unittests/npu/test_reduce_any_op_npu.py
浏览文件 @ 712f9fe5
...@@ -28,8 +28,6 @@ from paddle.fluid.framework import convert_np_dtype_to_dtype_ ...@@ -28,8 +28,6 @@ from paddle.fluid.framework import convert_np_dtype_to_dtype_
paddle.enable_static() paddle.enable_static()
@unittest.skipIf(not paddle.is_compiled_with_npu(),
"core is not compiled with NPU")
class TestAny8DOp(OpTest): class TestAny8DOp(OpTest):
def setUp(self): def setUp(self):
self.set_npu() self.set_npu()
...@@ -46,11 +44,9 @@ class TestAny8DOp(OpTest): ...@@ -46,11 +44,9 @@ class TestAny8DOp(OpTest):
self.__class__.use_npu = True self.__class__.use_npu = True
def test_check_output(self): def test_check_output(self):
self.check_output_with_place(self.place, check_dygraph=False) self.check_output_with_place(self.place)
@unittest.skipIf(not paddle.is_compiled_with_npu(),
"core is not compiled with NPU")
class TestAnyOpWithDim(OpTest): class TestAnyOpWithDim(OpTest):
def setUp(self): def setUp(self):
self.set_npu() self.set_npu()
...@@ -64,11 +60,9 @@ class TestAnyOpWithDim(OpTest): ...@@ -64,11 +60,9 @@ class TestAnyOpWithDim(OpTest):
self.__class__.use_npu = True self.__class__.use_npu = True
def test_check_output(self): def test_check_output(self):
self.check_output_with_place(self.place, check_dygraph=False) self.check_output_with_place(self.place)
@unittest.skipIf(not paddle.is_compiled_with_npu(),
"core is not compiled with NPU")
class TestAny8DOpWithDim(OpTest): class TestAny8DOpWithDim(OpTest):
def setUp(self): def setUp(self):
self.set_npu() self.set_npu()
...@@ -85,18 +79,16 @@ class TestAny8DOpWithDim(OpTest): ...@@ -85,18 +79,16 @@ class TestAny8DOpWithDim(OpTest):
self.__class__.use_npu = True self.__class__.use_npu = True
def test_check_output(self): def test_check_output(self):
self.check_output_with_place(self.place, check_dygraph=False) self.check_output_with_place(self.place)
@unittest.skipIf(not paddle.is_compiled_with_npu(),
"core is not compiled with NPU")
class TestAnyOpWithKeepDim(OpTest): class TestAnyOpWithKeepDim(OpTest):
def setUp(self): def setUp(self):
self.set_npu() self.set_npu()
self.op_type = "reduce_any" self.op_type = "reduce_any"
self.place = paddle.NPUPlace(0) self.place = paddle.NPUPlace(0)
self.inputs = {'X': np.random.randint(0, 2, (5, 6, 10)).astype("bool")} self.inputs = {'X': np.random.randint(0, 2, (5, 6, 10)).astype("bool")}
self.attrs = {'dim': (1, ), 'keep_dim': True} self.attrs = {'dim': (1), 'keep_dim': True}
self.outputs = { self.outputs = {
'Out': np.expand_dims( 'Out': np.expand_dims(
self.inputs['X'].any(axis=self.attrs['dim']), axis=1) self.inputs['X'].any(axis=self.attrs['dim']), axis=1)
...@@ -106,7 +98,7 @@ class TestAnyOpWithKeepDim(OpTest): ...@@ -106,7 +98,7 @@ class TestAnyOpWithKeepDim(OpTest):
self.__class__.use_npu = True self.__class__.use_npu = True
def test_check_output(self): def test_check_output(self):
self.check_output_with_place(self.place, check_dygraph=False) self.check_output_with_place(self.place)
class TestAny8DOpWithKeepDim(OpTest): class TestAny8DOpWithKeepDim(OpTest):
...@@ -118,7 +110,7 @@ class TestAny8DOpWithKeepDim(OpTest): ...@@ -118,7 +110,7 @@ class TestAny8DOpWithKeepDim(OpTest):
'X': np.random.randint(0, 2, 'X': np.random.randint(0, 2,
(2, 5, 3, 2, 2, 3, 4, 2)).astype("bool") (2, 5, 3, 2, 2, 3, 4, 2)).astype("bool")
} }
self.attrs = {'dim': (1, ), 'keep_dim': True} self.attrs = {'dim': (1), 'keep_dim': True}
self.outputs = { self.outputs = {
'Out': np.expand_dims( 'Out': np.expand_dims(
self.inputs['X'].any(axis=self.attrs['dim']), axis=1) self.inputs['X'].any(axis=self.attrs['dim']), axis=1)
...@@ -128,7 +120,7 @@ class TestAny8DOpWithKeepDim(OpTest): ...@@ -128,7 +120,7 @@ class TestAny8DOpWithKeepDim(OpTest):
self.__class__.use_npu = True self.__class__.use_npu = True
def test_check_output(self): def test_check_output(self):
self.check_output_with_place(self.place, check_dygraph=False) self.check_output_with_place(self.place)
if __name__ == '__main__': if __name__ == '__main__':
......
python/paddle/fluid/tests/unittests/npu/test_reduce_sum_op_npu.py
浏览文件 @ 712f9fe5
...@@ -26,8 +26,6 @@ paddle.enable_static() ...@@ -26,8 +26,6 @@ paddle.enable_static()
SEED = 2021 SEED = 2021
@unittest.skipIf(not paddle.is_compiled_with_npu(),
"core is not compiled with NPU")
class TestReduceSum(OpTest): class TestReduceSum(OpTest):
def setUp(self): def setUp(self):
np.random.seed(SEED) np.random.seed(SEED)
...@@ -66,10 +64,10 @@ class TestReduceSum(OpTest): ...@@ -66,10 +64,10 @@ class TestReduceSum(OpTest):
def initTestCase(self): def initTestCase(self):
self.shape = (5, 6) self.shape = (5, 6)
self.axis = (0, ) self.axis = (0)
def test_check_output(self): def test_check_output(self):
self.check_output_with_place(self.place, check_dygraph=False) self.check_output_with_place(self.place)
# TODO(ascendrc): Add grad test # TODO(ascendrc): Add grad test
# def test_check_grad(self): # def test_check_grad(self):
...@@ -84,8 +82,6 @@ class TestReduceSum2(OpTest): ...@@ -84,8 +82,6 @@ class TestReduceSum2(OpTest):
self.dtype = np.int32 self.dtype = np.int32
@unittest.skipIf(not paddle.is_compiled_with_npu(),
"core is not compiled with NPU")
class TestReduceSumNet(unittest.TestCase): class TestReduceSumNet(unittest.TestCase):
def set_reduce_sum_function(self, x): def set_reduce_sum_function(self, x):
# keep_dim = False # keep_dim = False
...@@ -151,16 +147,12 @@ class TestReduceSumNet(unittest.TestCase): ...@@ -151,16 +147,12 @@ class TestReduceSumNet(unittest.TestCase):
self.assertTrue(np.allclose(npu_loss, cpu_loss)) self.assertTrue(np.allclose(npu_loss, cpu_loss))
@unittest.skipIf(not paddle.is_compiled_with_npu(),
"core is not compiled with NPU")
class TestReduceSumNet2(TestReduceSumNet): class TestReduceSumNet2(TestReduceSumNet):
def set_reduce_sum_function(self, x): def set_reduce_sum_function(self, x):
# keep_dim = True # keep_dim = True
return paddle.fluid.layers.reduce_sum(x, dim=-1, keep_dim=True) return paddle.fluid.layers.reduce_sum(x, dim=-1, keep_dim=True)
@unittest.skipIf(not paddle.is_compiled_with_npu(),
"core is not compiled with NPU")
class TestReduceSumNet3(TestReduceSumNet): class TestReduceSumNet3(TestReduceSumNet):
def _test(self, run_npu=True): def _test(self, run_npu=True):
main_prog = paddle.static.Program() main_prog = paddle.static.Program()
......
python/paddle/fluid/tests/unittests/npu/test_relu_op_npu.py
浏览文件 @ 712f9fe5
...@@ -26,8 +26,6 @@ paddle.enable_static() ...@@ -26,8 +26,6 @@ paddle.enable_static()
SEED = 2021 SEED = 2021
@unittest.skipIf(not paddle.is_compiled_with_npu(),
"core is not compiled with NPU")
class TestRelu(OpTest): class TestRelu(OpTest):
def setUp(self): def setUp(self):
self.set_npu() self.set_npu()
...@@ -50,11 +48,9 @@ class TestRelu(OpTest): ...@@ -50,11 +48,9 @@ class TestRelu(OpTest):
self.dtype = np.float32 self.dtype = np.float32
def test_check_output(self): def test_check_output(self):
self.check_output_with_place(self.place, check_dygraph=False) self.check_output_with_place(self.place)
@unittest.skipIf(not paddle.is_compiled_with_npu(),
"core is not compiled with NPU")
class TestReluFp16(OpTest): class TestReluFp16(OpTest):
def setUp(self): def setUp(self):
self.set_npu() self.set_npu()
...@@ -78,11 +74,9 @@ class TestReluFp16(OpTest): ...@@ -78,11 +74,9 @@ class TestReluFp16(OpTest):
self.dtype = np.float16 self.dtype = np.float16
def test_check_output(self): def test_check_output(self):
self.check_output_with_place(self.place, check_dygraph=False, atol=1e-5) self.check_output_with_place(self.place, atol=1e-5)
@unittest.skipIf(not paddle.is_compiled_with_npu(),
"core is not compiled with NPU")
class TestReluNeg(OpTest): class TestReluNeg(OpTest):
def setUp(self): def setUp(self):
self.set_npu() self.set_npu()
...@@ -105,13 +99,13 @@ class TestReluNeg(OpTest): ...@@ -105,13 +99,13 @@ class TestReluNeg(OpTest):
self.dtype = np.float32 self.dtype = np.float32
def test_check_output(self): def test_check_output(self):
self.check_output_with_place(self.place, check_dygraph=False) self.check_output_with_place(self.place)
# #
# #
@unittest.skipIf(not paddle.is_compiled_with_npu(),
"core is not compiled with NPU")
class TestReluNet(unittest.TestCase): class TestReluNet(unittest.TestCase):
def _test(self, run_npu=True): def _test(self, run_npu=True):
main_prog = paddle.static.Program() main_prog = paddle.static.Program()
......
python/paddle/fluid/tests/unittests/npu/test_reshape2_op_npu.py
浏览文件 @ 712f9fe5
...@@ -26,8 +26,6 @@ paddle.enable_static() ...@@ -26,8 +26,6 @@ paddle.enable_static()
SEED = 2021 SEED = 2021
@unittest.skipIf(not paddle.is_compiled_with_npu(),
"core is not compiled with NPU")
class TestReshape2(OpTest): class TestReshape2(OpTest):
def setUp(self): def setUp(self):
self.set_npu() self.set_npu()
...@@ -51,12 +49,10 @@ class TestReshape2(OpTest): ...@@ -51,12 +49,10 @@ class TestReshape2(OpTest):
self.infered_shape = (20, 10) self.infered_shape = (20, 10)
def test_check_output(self): def test_check_output(self):
self.check_output_with_place( self.check_output_with_place(self.place, no_check_set=['XShape'])
self.place, check_dygraph=False, no_check_set=['XShape'])
def test_check_grad_normal(self): def test_check_grad_normal(self):
self.check_grad_with_place( self.check_grad_with_place(self.place, ['X'], 'Out')
self.place, ['X'], 'Out', check_dygraph=False)
class TestReshape2_case2(TestReshape2): class TestReshape2_case2(TestReshape2):
......
python/paddle/fluid/tests/unittests/npu/test_save_load_npu.py
浏览文件 @ 712f9fe5
...@@ -36,56 +36,42 @@ from test_static_save_load import * ...@@ -36,56 +36,42 @@ from test_static_save_load import *
paddle.enable_static() paddle.enable_static()
@unittest.skipIf(not paddle.is_compiled_with_npu(),
"core is not compiled with NPU")
class TestNPUSaveLoadBase(TestSaveLoadBase): class TestNPUSaveLoadBase(TestSaveLoadBase):
def set_place(self): def set_place(self):
return fluid.CPUPlace() if not core.is_compiled_with_npu( return fluid.CPUPlace() if not core.is_compiled_with_npu(
) else paddle.NPUPlace(0) ) else paddle.NPUPlace(0)
@unittest.skipIf(not paddle.is_compiled_with_npu(),
"core is not compiled with NPU")
class TestNPUSaveLoadPartial(TestSaveLoadPartial): class TestNPUSaveLoadPartial(TestSaveLoadPartial):
def set_place(self): def set_place(self):
return fluid.CPUPlace() if not core.is_compiled_with_npu( return fluid.CPUPlace() if not core.is_compiled_with_npu(
) else paddle.NPUPlace(0) ) else paddle.NPUPlace(0)
@unittest.skipIf(not paddle.is_compiled_with_npu(),
"core is not compiled with NPU")
class TestNPUSaveLoadSetStateDict(TestSaveLoadSetStateDict): class TestNPUSaveLoadSetStateDict(TestSaveLoadSetStateDict):
def set_place(self): def set_place(self):
return fluid.CPUPlace() if not core.is_compiled_with_npu( return fluid.CPUPlace() if not core.is_compiled_with_npu(
) else paddle.NPUPlace(0) ) else paddle.NPUPlace(0)
@unittest.skipIf(not paddle.is_compiled_with_npu(),
"core is not compiled with NPU")
class TestNPUProgramStatePartial(TestProgramStatePartial): class TestNPUProgramStatePartial(TestProgramStatePartial):
def set_place(self): def set_place(self):
return fluid.CPUPlace() if not core.is_compiled_with_npu( return fluid.CPUPlace() if not core.is_compiled_with_npu(
) else paddle.NPUPlace(0) ) else paddle.NPUPlace(0)
@unittest.skipIf(not paddle.is_compiled_with_npu(),
"core is not compiled with NPU")
class TestNPULoadFromOldInterface(TestLoadFromOldInterface): class TestNPULoadFromOldInterface(TestLoadFromOldInterface):
def set_place(self): def set_place(self):
return fluid.CPUPlace() if not core.is_compiled_with_npu( return fluid.CPUPlace() if not core.is_compiled_with_npu(
) else paddle.NPUPlace(0) ) else paddle.NPUPlace(0)
@unittest.skipIf(not paddle.is_compiled_with_npu(),
"core is not compiled with NPU")
class TestNPULoadFromOldInterfaceSingleFile(TestLoadFromOldInterfaceSingleFile): class TestNPULoadFromOldInterfaceSingleFile(TestLoadFromOldInterfaceSingleFile):
def set_place(self): def set_place(self):
return fluid.CPUPlace() if not core.is_compiled_with_npu( return fluid.CPUPlace() if not core.is_compiled_with_npu(
) else paddle.NPUPlace(0) ) else paddle.NPUPlace(0)
@unittest.skipIf(not paddle.is_compiled_with_npu(),
"core is not compiled with NPU")
class TestNPUProgramStateOldSave(TestProgramStateOldSave): class TestNPUProgramStateOldSave(TestProgramStateOldSave):
def setUp(self): def setUp(self):
self.test_dygraph = False self.test_dygraph = False
...@@ -95,8 +81,6 @@ class TestNPUProgramStateOldSave(TestProgramStateOldSave): ...@@ -95,8 +81,6 @@ class TestNPUProgramStateOldSave(TestProgramStateOldSave):
) else paddle.NPUPlace(0) ) else paddle.NPUPlace(0)
@unittest.skipIf(not paddle.is_compiled_with_npu(),
"core is not compiled with NPU")
class TestNPUProgramStateOldSaveSingleModel(TestProgramStateOldSaveSingleModel): class TestNPUProgramStateOldSaveSingleModel(TestProgramStateOldSaveSingleModel):
def set_place(self): def set_place(self):
return fluid.CPUPlace() if not core.is_compiled_with_npu( return fluid.CPUPlace() if not core.is_compiled_with_npu(
......
python/paddle/fluid/tests/unittests/npu/test_scale_op_npu.py
浏览文件 @ 712f9fe5
...@@ -26,8 +26,6 @@ paddle.enable_static() ...@@ -26,8 +26,6 @@ paddle.enable_static()
SEED = 2021 SEED = 2021
@unittest.skipIf(not paddle.is_compiled_with_npu(),
"core is not compiled with NPU")
class TestScale(OpTest): class TestScale(OpTest):
def setUp(self): def setUp(self):
self.set_npu() self.set_npu()
...@@ -51,7 +49,7 @@ class TestScale(OpTest): ...@@ -51,7 +49,7 @@ class TestScale(OpTest):
self.dtype = np.float32 self.dtype = np.float32
def test_check_output(self): def test_check_output(self):
self.check_output_with_place(self.place, check_dygraph=False) self.check_output_with_place(self.place)
class TestFP16Scale(TestScale): class TestFP16Scale(TestScale):
...@@ -82,7 +80,7 @@ class TestBiasAfterScale(OpTest): ...@@ -82,7 +80,7 @@ class TestBiasAfterScale(OpTest):
self.dtype = np.float32 self.dtype = np.float32
def test_check_output(self): def test_check_output(self):
self.check_output_with_place(self.place, check_dygraph=False) self.check_output_with_place(self.place)
if __name__ == '__main__': if __name__ == '__main__':
......
python/paddle/fluid/tests/unittests/npu/test_scatter_op_npu.py
浏览文件 @ 712f9fe5
...@@ -27,8 +27,6 @@ paddle.enable_static() ...@@ -27,8 +27,6 @@ paddle.enable_static()
SEED = 2021 SEED = 2021
@unittest.skipIf(not paddle.is_compiled_with_npu(),
"core is not compiled with NPU")
class TestCast1(OpTest): class TestCast1(OpTest):
def setUp(self): def setUp(self):
self.set_npu() self.set_npu()
...@@ -49,7 +47,7 @@ class TestCast1(OpTest): ...@@ -49,7 +47,7 @@ class TestCast1(OpTest):
self.__class__.use_npu = True self.__class__.use_npu = True
def test_check_output(self): def test_check_output(self):
self.check_output_with_place(self.place, check_dygraph=False) self.check_output_with_place(self.place)
class TestCast2(OpTest): class TestCast2(OpTest):
...@@ -72,7 +70,7 @@ class TestCast2(OpTest): ...@@ -72,7 +70,7 @@ class TestCast2(OpTest):
self.__class__.use_npu = True self.__class__.use_npu = True
def test_check_output(self): def test_check_output(self):
self.check_output_with_place(self.place, check_dygraph=False) self.check_output_with_place(self.place)
class TestCast3(OpTest): class TestCast3(OpTest):
...@@ -95,7 +93,7 @@ class TestCast3(OpTest): ...@@ -95,7 +93,7 @@ class TestCast3(OpTest):
self.__class__.use_npu = True self.__class__.use_npu = True
def test_check_output(self): def test_check_output(self):
self.check_output_with_place(self.place, check_dygraph=False) self.check_output_with_place(self.place)
class TestCast4(OpTest): class TestCast4(OpTest):
...@@ -119,7 +117,7 @@ class TestCast4(OpTest): ...@@ -119,7 +117,7 @@ class TestCast4(OpTest):
self.__class__.use_npu = True self.__class__.use_npu = True
def test_check_output(self): def test_check_output(self):
self.check_output_with_place(self.place, check_dygraph=False) self.check_output_with_place(self.place)
if __name__ == '__main__': if __name__ == '__main__':
......
python/paddle/fluid/tests/unittests/npu/test_seed_op_npu.py
浏览文件 @ 712f9fe5
...@@ -26,8 +26,6 @@ import paddle.fluid.core as core ...@@ -26,8 +26,6 @@ import paddle.fluid.core as core
paddle.enable_static() paddle.enable_static()
@unittest.skipIf(not paddle.is_compiled_with_npu(),
"core is not compiled with NPU")
class TestSeedOpFixSeed(OpTest): class TestSeedOpFixSeed(OpTest):
def setUp(self): def setUp(self):
self.set_npu() self.set_npu()
...@@ -43,8 +41,6 @@ class TestSeedOpFixSeed(OpTest): ...@@ -43,8 +41,6 @@ class TestSeedOpFixSeed(OpTest):
self.check_output_with_place(paddle.NPUPlace(0)) self.check_output_with_place(paddle.NPUPlace(0))
@unittest.skipIf(not paddle.is_compiled_with_npu(),
"core is not compiled with NPU")
class TestSeedOpDiffSeed(OpTest): class TestSeedOpDiffSeed(OpTest):
def setUp(self): def setUp(self):
self.set_npu() self.set_npu()
......
python/paddle/fluid/tests/unittests/npu/test_sgd_op_npu.py
浏览文件 @ 712f9fe5
...@@ -24,8 +24,6 @@ paddle.enable_static() ...@@ -24,8 +24,6 @@ paddle.enable_static()
SEED = 2021 SEED = 2021
@unittest.skipIf(not paddle.is_compiled_with_npu(),
"core is not compiled with NPU")
class TestSGD(OpTest): class TestSGD(OpTest):
def setUp(self): def setUp(self):
self.set_npu() self.set_npu()
...@@ -50,11 +48,9 @@ class TestSGD(OpTest): ...@@ -50,11 +48,9 @@ class TestSGD(OpTest):
self.w = 15 self.w = 15
def test_check_output(self): def test_check_output(self):
self.check_output_with_place(self.place, check_dygraph=False) self.check_output_with_place(self.place)
@unittest.skipIf(not paddle.is_compiled_with_npu(),
"core is not compiled with NPU")
class TestNet(unittest.TestCase): class TestNet(unittest.TestCase):
def _test(self, run_npu=True): def _test(self, run_npu=True):
main_prog = paddle.static.Program() main_prog = paddle.static.Program()
......
python/paddle/fluid/tests/unittests/npu/test_shape_op_npu.py
浏览文件 @ 712f9fe5
...@@ -26,8 +26,6 @@ paddle.enable_static() ...@@ -26,8 +26,6 @@ paddle.enable_static()
SEED = 2021 SEED = 2021
@unittest.skipIf(not paddle.is_compiled_with_npu(),
"core is not compiled with NPU")
class TestShape(OpTest): class TestShape(OpTest):
def setUp(self): def setUp(self):
self.set_npu() self.set_npu()
...@@ -50,7 +48,7 @@ class TestShape(OpTest): ...@@ -50,7 +48,7 @@ class TestShape(OpTest):
self.dtype = np.float32 self.dtype = np.float32
def test_check_output(self): def test_check_output(self):
self.check_output_with_place(self.place, check_dygraph=False) self.check_output_with_place(self.place)
if __name__ == '__main__': if __name__ == '__main__':
......
python/paddle/fluid/tests/unittests/npu/test_slice_op_npu.py
浏览文件 @ 712f9fe5
...@@ -27,8 +27,6 @@ SEED = 2021 ...@@ -27,8 +27,6 @@ SEED = 2021
EPOCH = 100 EPOCH = 100
@unittest.skipIf(not paddle.is_compiled_with_npu(),
"core is not compiled with NPU")
class TestSliceOp(OpTest): class TestSliceOp(OpTest):
def setUp(self): def setUp(self):
self.op_type = "slice" self.op_type = "slice"
...@@ -60,13 +58,12 @@ class TestSliceOp(OpTest): ...@@ -60,13 +58,12 @@ class TestSliceOp(OpTest):
self.place = paddle.NPUPlace(0) self.place = paddle.NPUPlace(0)
def test_check_output(self): def test_check_output(self):
self.check_output_with_place(self.place, check_dygraph=False) self.check_output_with_place(self.place)
def test_check_grad_normal(self): def test_check_grad_normal(self):
if self.dtype == np.float16: if self.dtype == np.float16:
return return
self.check_grad_with_place( self.check_grad_with_place(self.place, ['Input'], 'Out')
self.place, ['Input'], 'Out', check_dygraph=False)
class TestSliceOp2(TestSliceOp): class TestSliceOp2(TestSliceOp):
...@@ -79,8 +76,6 @@ class TestSliceOp2(TestSliceOp): ...@@ -79,8 +76,6 @@ class TestSliceOp2(TestSliceOp):
self.out = self.input[:, 0:1, :] self.out = self.input[:, 0:1, :]
@unittest.skipIf(not paddle.is_compiled_with_npu(),
"core is not compiled with NPU")
class TestSliceOpFp16(TestSliceOp): class TestSliceOpFp16(TestSliceOp):
def init_dtype(self): def init_dtype(self):
self.dtype = np.float16 self.dtype = np.float16
...@@ -147,8 +142,6 @@ class TestSliceOpTensor2(TestSliceOpTensor): ...@@ -147,8 +142,6 @@ class TestSliceOpTensor2(TestSliceOpTensor):
self.out = self.input[:, 0:1, :] self.out = self.input[:, 0:1, :]
@unittest.skipIf(not paddle.is_compiled_with_npu(),
"core is not compiled with NPU")
class TestSliceOpFp16Tensor(TestSliceOpTensor): class TestSliceOpFp16Tensor(TestSliceOpTensor):
def init_dtype(self): def init_dtype(self):
self.dtype = np.float16 self.dtype = np.float16
...@@ -237,8 +230,6 @@ class TestSliceOpTensorList2(TestSliceOpTensorList): ...@@ -237,8 +230,6 @@ class TestSliceOpTensorList2(TestSliceOpTensorList):
self.out = self.input[:, 0:1, :] self.out = self.input[:, 0:1, :]
@unittest.skipIf(not paddle.is_compiled_with_npu(),
"core is not compiled with NPU")
class TestSliceOpFp16TensorList(TestSliceOpTensorList): class TestSliceOpFp16TensorList(TestSliceOpTensorList):
def init_dtype(self): def init_dtype(self):
self.dtype = np.float16 self.dtype = np.float16
...@@ -249,8 +240,6 @@ class TestSliceOpFp16TensorList(TestSliceOpTensorList): ...@@ -249,8 +240,6 @@ class TestSliceOpFp16TensorList(TestSliceOpTensorList):
self.place = paddle.NPUPlace(0) self.place = paddle.NPUPlace(0)
@unittest.skipIf(not paddle.is_compiled_with_npu(),
"core is not compiled with NPU")
class TestSliceNet(unittest.TestCase): class TestSliceNet(unittest.TestCase):
def _test(self, run_npu=True): def _test(self, run_npu=True):
main_prog = paddle.static.Program() main_prog = paddle.static.Program()
......
python/paddle/fluid/tests/unittests/npu/test_softmax_op_npu.py
浏览文件 @ 712f9fe5
...@@ -27,8 +27,6 @@ paddle.enable_static() ...@@ -27,8 +27,6 @@ paddle.enable_static()
SEED = 2021 SEED = 2021
@unittest.skipIf(not paddle.is_compiled_with_npu(),
"core is not compiled with NPU")
class TestSoftmax(OpTest): class TestSoftmax(OpTest):
def setUp(self): def setUp(self):
self.set_npu() self.set_npu()
...@@ -51,11 +49,9 @@ class TestSoftmax(OpTest): ...@@ -51,11 +49,9 @@ class TestSoftmax(OpTest):
self.dtype = np.float32 self.dtype = np.float32
def test_check_output(self): def test_check_output(self):
self.check_output_with_place(self.place, check_dygraph=False) self.check_output_with_place(self.place)
@unittest.skipIf(not paddle.is_compiled_with_npu(),
"core is not compiled with NPU")
class TestSoftmaxNet(unittest.TestCase): class TestSoftmaxNet(unittest.TestCase):
def _test(self, run_npu=True): def _test(self, run_npu=True):
main_prog = paddle.static.Program() main_prog = paddle.static.Program()
......
python/paddle/fluid/tests/unittests/npu/test_softmax_with_cross_entropy_op_npu.py
浏览文件 @ 712f9fe5
...@@ -28,8 +28,6 @@ paddle.enable_static() ...@@ -28,8 +28,6 @@ paddle.enable_static()
SEED = 2021 SEED = 2021
@unittest.skipIf(not paddle.is_compiled_with_npu(),
"core is not compiled with NPU")
class TestSoftmaxWithCrossEntropyOp(OpTest): class TestSoftmaxWithCrossEntropyOp(OpTest):
def set_npu(self): def set_npu(self):
self.__class__.use_npu = True self.__class__.use_npu = True
...@@ -86,7 +84,7 @@ class TestSoftmaxWithCrossEntropyOp(OpTest): ...@@ -86,7 +84,7 @@ class TestSoftmaxWithCrossEntropyOp(OpTest):
self.attrs['axis'] = self.axis self.attrs['axis'] = self.axis
def test_check_output(self): def test_check_output(self):
self.check_output_with_place(self.place, check_dygraph=False) self.check_output_with_place(self.place)
def test_check_grad(self): def test_check_grad(self):
if self.dtype == np.float16: if self.dtype == np.float16:
...@@ -95,13 +93,10 @@ class TestSoftmaxWithCrossEntropyOp(OpTest): ...@@ -95,13 +93,10 @@ class TestSoftmaxWithCrossEntropyOp(OpTest):
self.check_grad_with_place( self.check_grad_with_place(
self.place, ['Logits'], self.place, ['Logits'],
'Loss', 'Loss',
check_dygraph=False,
numeric_grad_delta=0.001, numeric_grad_delta=0.001,
max_relative_error=0.5) max_relative_error=0.5)
@unittest.skipIf(not paddle.is_compiled_with_npu(),
"core is not compiled with NPU")
class TestPowNet(unittest.TestCase): class TestPowNet(unittest.TestCase):
def _test(self, run_npu=True): def _test(self, run_npu=True):
main_prog = paddle.static.Program() main_prog = paddle.static.Program()
......
python/paddle/fluid/tests/unittests/npu/test_sqrt_op_npu.py
浏览文件 @ 712f9fe5
...@@ -26,8 +26,6 @@ paddle.enable_static() ...@@ -26,8 +26,6 @@ paddle.enable_static()
SEED = 2021 SEED = 2021
@unittest.skipIf(not paddle.is_compiled_with_npu(),
"core is not compiled with NPU")
class TestSqrt(OpTest): class TestSqrt(OpTest):
def setUp(self): def setUp(self):
self.set_npu() self.set_npu()
...@@ -50,7 +48,7 @@ class TestSqrt(OpTest): ...@@ -50,7 +48,7 @@ class TestSqrt(OpTest):
self.dtype = np.float32 self.dtype = np.float32
def test_check_output(self): def test_check_output(self):
self.check_output_with_place(self.place, check_dygraph=False) self.check_output_with_place(self.place)
# TODO(ascendrc): Add grad test # TODO(ascendrc): Add grad test
# def test_check_grad(self): # def test_check_grad(self):
...@@ -60,8 +58,6 @@ class TestSqrt(OpTest): ...@@ -60,8 +58,6 @@ class TestSqrt(OpTest):
# #
@unittest.skipIf(not paddle.is_compiled_with_npu(),
"core is not compiled with NPU")
class TestSqrtFp16(OpTest): class TestSqrtFp16(OpTest):
def setUp(self): def setUp(self):
self.set_npu() self.set_npu()
...@@ -85,11 +81,9 @@ class TestSqrtFp16(OpTest): ...@@ -85,11 +81,9 @@ class TestSqrtFp16(OpTest):
self.dtype = np.float16 self.dtype = np.float16
def test_check_output(self): def test_check_output(self):
self.check_output_with_place(self.place, check_dygraph=False, atol=1e-5) self.check_output_with_place(self.place, atol=1e-5)
@unittest.skipIf(not paddle.is_compiled_with_npu(),
"core is not compiled with NPU")
class TestSqrtNet(unittest.TestCase): class TestSqrtNet(unittest.TestCase):
def _test(self, run_npu=True): def _test(self, run_npu=True):
main_prog = paddle.static.Program() main_prog = paddle.static.Program()
......
python/paddle/fluid/tests/unittests/npu/test_square_op_npu.py
浏览文件 @ 712f9fe5
...@@ -26,8 +26,6 @@ paddle.enable_static() ...@@ -26,8 +26,6 @@ paddle.enable_static()
SEED = 2021 SEED = 2021
@unittest.skipIf(not paddle.is_compiled_with_npu(),
"core is not compiled with NPU")
class TestSquare(OpTest): class TestSquare(OpTest):
def setUp(self): def setUp(self):
self.set_npu() self.set_npu()
...@@ -50,7 +48,7 @@ class TestSquare(OpTest): ...@@ -50,7 +48,7 @@ class TestSquare(OpTest):
self.dtype = np.float32 self.dtype = np.float32
def test_check_output(self): def test_check_output(self):
self.check_output_with_place(self.place, check_dygraph=False) self.check_output_with_place(self.place)
# TODO(ascendrc): Add grad test # TODO(ascendrc): Add grad test
# def test_check_grad(self): # def test_check_grad(self):
...@@ -60,8 +58,6 @@ class TestSquare(OpTest): ...@@ -60,8 +58,6 @@ class TestSquare(OpTest):
# #
@unittest.skipIf(not paddle.is_compiled_with_npu(),
"core is not compiled with NPU")
class TestSquareFp16(OpTest): class TestSquareFp16(OpTest):
def setUp(self): def setUp(self):
self.set_npu() self.set_npu()
...@@ -85,11 +81,9 @@ class TestSquareFp16(OpTest): ...@@ -85,11 +81,9 @@ class TestSquareFp16(OpTest):
self.dtype = np.float16 self.dtype = np.float16
def test_check_output(self): def test_check_output(self):
self.check_output_with_place(self.place, check_dygraph=False, atol=1e-5) self.check_output_with_place(self.place, atol=1e-5)
@unittest.skipIf(not paddle.is_compiled_with_npu(),
"core is not compiled with NPU")
class TestSquareNet(unittest.TestCase): class TestSquareNet(unittest.TestCase):
def _test(self, run_npu=True): def _test(self, run_npu=True):
main_prog = paddle.static.Program() main_prog = paddle.static.Program()
......
python/paddle/fluid/tests/unittests/npu/test_squeeze_op_npu.py
浏览文件 @ 712f9fe5
...@@ -26,10 +26,9 @@ from paddle.fluid import Program, program_guard ...@@ -26,10 +26,9 @@ from paddle.fluid import Program, program_guard
paddle.enable_static() paddle.enable_static()
# Correct: General. # Correct: General.
@unittest.skipIf(not paddle.is_compiled_with_npu(),
"core is not compiled with NPU")
class TestSqueezeOp(OpTest): class TestSqueezeOp(OpTest):
def setUp(self): def setUp(self):
self.set_npu() self.set_npu()
...@@ -58,8 +57,8 @@ class TestSqueezeOp(OpTest): ...@@ -58,8 +57,8 @@ class TestSqueezeOp(OpTest):
# Correct: There is mins axis. # Correct: There is mins axis.
@unittest.skipIf(not paddle.is_compiled_with_npu(),
"core is not compiled with NPU")
class TestSqueezeOp1(TestSqueezeOp): class TestSqueezeOp1(TestSqueezeOp):
def init_test_case(self): def init_test_case(self):
self.ori_shape = (1, 3, 1, 40) self.ori_shape = (1, 3, 1, 40)
...@@ -68,8 +67,8 @@ class TestSqueezeOp1(TestSqueezeOp): ...@@ -68,8 +67,8 @@ class TestSqueezeOp1(TestSqueezeOp):
# Correct: No axes input. # Correct: No axes input.
@unittest.skipIf(not paddle.is_compiled_with_npu(),
"core is not compiled with NPU")
class TestSqueezeOp2(TestSqueezeOp): class TestSqueezeOp2(TestSqueezeOp):
def init_test_case(self): def init_test_case(self):
self.ori_shape = (1, 20, 1, 5) self.ori_shape = (1, 20, 1, 5)
...@@ -78,8 +77,8 @@ class TestSqueezeOp2(TestSqueezeOp): ...@@ -78,8 +77,8 @@ class TestSqueezeOp2(TestSqueezeOp):
# Correct: Just part of axes be squeezed. # Correct: Just part of axes be squeezed.
@unittest.skipIf(not paddle.is_compiled_with_npu(),
"core is not compiled with NPU")
class TestSqueezeOp3(TestSqueezeOp): class TestSqueezeOp3(TestSqueezeOp):
def init_test_case(self): def init_test_case(self):
self.ori_shape = (6, 1, 5, 1, 4, 1) self.ori_shape = (6, 1, 5, 1, 4, 1)
...@@ -88,8 +87,8 @@ class TestSqueezeOp3(TestSqueezeOp): ...@@ -88,8 +87,8 @@ class TestSqueezeOp3(TestSqueezeOp):
# Correct: The demension of axis is not of size 1 remains unchanged. # Correct: The demension of axis is not of size 1 remains unchanged.
@unittest.skipIf(not paddle.is_compiled_with_npu(),
"core is not compiled with NPU")
class TestSqueezeOp4(TestSqueezeOp): class TestSqueezeOp4(TestSqueezeOp):
def init_test_case(self): def init_test_case(self):
self.ori_shape = (6, 1, 5, 1, 4, 1) self.ori_shape = (6, 1, 5, 1, 4, 1)
......
python/paddle/fluid/tests/unittests/npu/test_stack_op_npu.py
浏览文件 @ 712f9fe5
...@@ -26,8 +26,6 @@ import paddle.fluid.core as core ...@@ -26,8 +26,6 @@ import paddle.fluid.core as core
paddle.enable_static() paddle.enable_static()
@unittest.skipIf(not paddle.is_compiled_with_npu(),
"core is not compiled with NPU")
class TestStackOpBase(OpTest): class TestStackOpBase(OpTest):
def initDefaultParameters(self): def initDefaultParameters(self):
self.num_inputs = 4 self.num_inputs = 4
...@@ -77,50 +75,36 @@ class TestStackOpBase(OpTest): ...@@ -77,50 +75,36 @@ class TestStackOpBase(OpTest):
self.check_grad_with_place(self.place, self.get_x_names(), 'Y') self.check_grad_with_place(self.place, self.get_x_names(), 'Y')
@unittest.skipIf(not paddle.is_compiled_with_npu(),
"core is not compiled with NPU")
class TestStackOp1(TestStackOpBase): class TestStackOp1(TestStackOpBase):
def initParameters(self): def initParameters(self):
self.num_inputs = 16 self.num_inputs = 16
@unittest.skipIf(not paddle.is_compiled_with_npu(),
"core is not compiled with NPU")
class TestStackOp2(TestStackOpBase): class TestStackOp2(TestStackOpBase):
def initParameters(self): def initParameters(self):
self.num_inputs = 20 self.num_inputs = 20
@unittest.skipIf(not paddle.is_compiled_with_npu(),
"core is not compiled with NPU")
class TestStackOp3(TestStackOpBase): class TestStackOp3(TestStackOpBase):
def initParameters(self): def initParameters(self):
self.axis = -1 self.axis = -1
@unittest.skipIf(not paddle.is_compiled_with_npu(),
"core is not compiled with NPU")
class TestStackOp4(TestStackOpBase): class TestStackOp4(TestStackOpBase):
def initParameters(self): def initParameters(self):
self.axis = -4 self.axis = -4
@unittest.skipIf(not paddle.is_compiled_with_npu(),
"core is not compiled with NPU")
class TestStackOp5(TestStackOpBase): class TestStackOp5(TestStackOpBase):
def initParameters(self): def initParameters(self):
self.axis = 1 self.axis = 1
@unittest.skipIf(not paddle.is_compiled_with_npu(),
"core is not compiled with NPU")
class TestStackOp6(TestStackOpBase): class TestStackOp6(TestStackOpBase):
def initParameters(self): def initParameters(self):
self.axis = 3 self.axis = 3
@unittest.skipIf(not paddle.is_compiled_with_npu(),
"core is not compiled with NPU")
class TestStackAPIWithLoDTensorArray(unittest.TestCase): class TestStackAPIWithLoDTensorArray(unittest.TestCase):
""" """
Test stack api when the input(x) is a LoDTensorArray. Test stack api when the input(x) is a LoDTensorArray.
...@@ -157,8 +141,6 @@ class TestStackAPIWithLoDTensorArray(unittest.TestCase): ...@@ -157,8 +141,6 @@ class TestStackAPIWithLoDTensorArray(unittest.TestCase):
[self.x] * self.iter_num, axis=self.axis))) [self.x] * self.iter_num, axis=self.axis)))
@unittest.skipIf(not paddle.is_compiled_with_npu(),
"core is not compiled with NPU")
class TestTensorStackAPIWithLoDTensorArray(unittest.TestCase): class TestTensorStackAPIWithLoDTensorArray(unittest.TestCase):
""" """
Test stack api when the input(x) is a LoDTensorArray. Test stack api when the input(x) is a LoDTensorArray.
...@@ -195,8 +177,6 @@ class TestTensorStackAPIWithLoDTensorArray(unittest.TestCase): ...@@ -195,8 +177,6 @@ class TestTensorStackAPIWithLoDTensorArray(unittest.TestCase):
[self.x] * self.iter_num, axis=self.axis))) [self.x] * self.iter_num, axis=self.axis)))
@unittest.skipIf(not paddle.is_compiled_with_npu(),
"core is not compiled with NPU")
class API_test(unittest.TestCase): class API_test(unittest.TestCase):
def test_out(self): def test_out(self):
with fluid.program_guard(fluid.Program(), fluid.Program()): with fluid.program_guard(fluid.Program(), fluid.Program()):
...@@ -223,8 +203,6 @@ class API_test(unittest.TestCase): ...@@ -223,8 +203,6 @@ class API_test(unittest.TestCase):
self.assertRaises(TypeError, paddle.stack, x) self.assertRaises(TypeError, paddle.stack, x)
@unittest.skipIf(not paddle.is_compiled_with_npu(),
"core is not compiled with NPU")
class API_DygraphTest(unittest.TestCase): class API_DygraphTest(unittest.TestCase):
def test_out(self): def test_out(self):
data1 = np.array([[1.0, 2.0]]) data1 = np.array([[1.0, 2.0]])
......
python/paddle/fluid/tests/unittests/npu/test_sum_op_npu.py
浏览文件 @ 712f9fe5
...@@ -27,8 +27,6 @@ paddle.enable_static() ...@@ -27,8 +27,6 @@ paddle.enable_static()
SEED = 2021 SEED = 2021
@unittest.skipIf(not paddle.is_compiled_with_npu(),
"core is not compiled with NPU")
class TestSum1(OpTest): class TestSum1(OpTest):
def setUp(self): def setUp(self):
self.set_npu() self.set_npu()
...@@ -52,7 +50,7 @@ class TestSum1(OpTest): ...@@ -52,7 +50,7 @@ class TestSum1(OpTest):
self.__class__.use_npu = True self.__class__.use_npu = True
def test_check_output(self): def test_check_output(self):
self.check_output_with_place(self.place, check_dygraph=False) self.check_output_with_place(self.place)
class TestSum2(OpTest): class TestSum2(OpTest):
...@@ -86,7 +84,7 @@ class TestSum2(OpTest): ...@@ -86,7 +84,7 @@ class TestSum2(OpTest):
self.__class__.use_npu = True self.__class__.use_npu = True
def test_check_output(self): def test_check_output(self):
self.check_output_with_place(self.place, check_dygraph=False) self.check_output_with_place(self.place)
class TestSum3(OpTest): class TestSum3(OpTest):
...@@ -111,7 +109,7 @@ class TestSum3(OpTest): ...@@ -111,7 +109,7 @@ class TestSum3(OpTest):
self.__class__.use_npu = True self.__class__.use_npu = True
def test_check_output(self): def test_check_output(self):
self.check_output_with_place(self.place, check_dygraph=False) self.check_output_with_place(self.place)
if __name__ == '__main__': if __name__ == '__main__':
......
python/paddle/fluid/tests/unittests/npu/test_tanh_op_npu.py
浏览文件 @ 712f9fe5
...@@ -26,8 +26,6 @@ paddle.enable_static() ...@@ -26,8 +26,6 @@ paddle.enable_static()
SEED = 2021 SEED = 2021
@unittest.skipIf(not paddle.is_compiled_with_npu(),
"core is not compiled with NPU")
class TestTanh(OpTest): class TestTanh(OpTest):
def setUp(self): def setUp(self):
self.set_npu() self.set_npu()
...@@ -50,7 +48,7 @@ class TestTanh(OpTest): ...@@ -50,7 +48,7 @@ class TestTanh(OpTest):
self.dtype = np.float32 self.dtype = np.float32
def test_check_output(self): def test_check_output(self):
self.check_output_with_place(self.place, check_dygraph=False) self.check_output_with_place(self.place)
# TODO(ascendrc): Add grad test # TODO(ascendrc): Add grad test
# def test_check_grad(self): # def test_check_grad(self):
...@@ -60,8 +58,6 @@ class TestTanh(OpTest): ...@@ -60,8 +58,6 @@ class TestTanh(OpTest):
# #
@unittest.skipIf(not paddle.is_compiled_with_npu(),
"core is not compiled with NPU")
class TestTanhFp16(OpTest): class TestTanhFp16(OpTest):
def setUp(self): def setUp(self):
self.set_npu() self.set_npu()
...@@ -85,11 +81,9 @@ class TestTanhFp16(OpTest): ...@@ -85,11 +81,9 @@ class TestTanhFp16(OpTest):
self.dtype = np.float16 self.dtype = np.float16
def test_check_output(self): def test_check_output(self):
self.check_output_with_place(self.place, check_dygraph=False, atol=1e-3) self.check_output_with_place(self.place, atol=1e-3)
@unittest.skipIf(not paddle.is_compiled_with_npu(),
"core is not compiled with NPU")
class TestTanhNet(unittest.TestCase): class TestTanhNet(unittest.TestCase):
def _test(self, run_npu=True): def _test(self, run_npu=True):
main_prog = paddle.static.Program() main_prog = paddle.static.Program()
......
python/paddle/fluid/tests/unittests/npu/test_top_k_op_npu.py
浏览文件 @ 712f9fe5
...@@ -27,8 +27,6 @@ paddle.enable_static() ...@@ -27,8 +27,6 @@ paddle.enable_static()
SEED = 2021 SEED = 2021
@unittest.skipIf(not paddle.is_compiled_with_npu(),
"core is not compiled with NPU")
class TestTopk(OpTest): class TestTopk(OpTest):
def setUp(self): def setUp(self):
self.set_npu() self.set_npu()
...@@ -56,11 +54,9 @@ class TestTopk(OpTest): ...@@ -56,11 +54,9 @@ class TestTopk(OpTest):
self.dtype = np.float16 self.dtype = np.float16
def test_check_output(self): def test_check_output(self):
self.check_output_with_place(self.place, check_dygraph=False) self.check_output_with_place(self.place)
@unittest.skipIf(not paddle.is_compiled_with_npu(),
"core is not compiled with NPU")
class TestTopkV2(OpTest): class TestTopkV2(OpTest):
def setUp(self): def setUp(self):
self.set_npu() self.set_npu()
...@@ -88,7 +84,7 @@ class TestTopkV2(OpTest): ...@@ -88,7 +84,7 @@ class TestTopkV2(OpTest):
self.dtype = np.float16 self.dtype = np.float16
def test_check_output(self): def test_check_output(self):
self.check_output_with_place(self.place, check_dygraph=False) self.check_output_with_place(self.place)
if __name__ == '__main__': if __name__ == '__main__':
......
python/paddle/fluid/tests/unittests/npu/test_transpose_op_npu.py
浏览文件 @ 712f9fe5
...@@ -25,8 +25,6 @@ import paddle.fluid as fluid ...@@ -25,8 +25,6 @@ import paddle.fluid as fluid
paddle.enable_static() paddle.enable_static()
@unittest.skipIf(not paddle.is_compiled_with_npu(),
"core is not compiled with NPU")
class TestTransposeOp(OpTest): class TestTransposeOp(OpTest):
def setUp(self): def setUp(self):
self.set_npu() self.set_npu()
...@@ -58,11 +56,9 @@ class TestTransposeOp(OpTest): ...@@ -58,11 +56,9 @@ class TestTransposeOp(OpTest):
self.axis = -1 self.axis = -1
def test_check_output(self): def test_check_output(self):
self.check_output_with_place(self.place, check_dygraph=False) self.check_output_with_place(self.place)
@unittest.skipIf(not paddle.is_compiled_with_npu(),
"core is not compiled with NPU")
class TestTransposeOpFP16(TestTransposeOp): class TestTransposeOpFP16(TestTransposeOp):
no_need_check_grad = True no_need_check_grad = True
......
python/paddle/fluid/tests/unittests/npu/test_truncated_gaussian_random_op_npu.py
浏览文件 @ 712f9fe5
...@@ -29,8 +29,6 @@ paddle.enable_static() ...@@ -29,8 +29,6 @@ paddle.enable_static()
SEED = 2021 SEED = 2021
@unittest.skipIf(not paddle.is_compiled_with_npu(),
"core is not compiled with NPU")
class TestTruncatedNormal(unittest.TestCase): class TestTruncatedNormal(unittest.TestCase):
def _test(self, run_npu=True): def _test(self, run_npu=True):
main_prog = paddle.static.Program() main_prog = paddle.static.Program()
......
python/paddle/fluid/tests/unittests/npu/test_uniform_random_op_npu.py
浏览文件 @ 712f9fe5
...@@ -39,8 +39,6 @@ def output_hist(out): ...@@ -39,8 +39,6 @@ def output_hist(out):
return hist, prob return hist, prob
@unittest.skipIf(not paddle.is_compiled_with_npu(),
"core is not compiled with NPU")
class TestNPUUniformRandomOp(OpTest): class TestNPUUniformRandomOp(OpTest):
def setUp(self): def setUp(self):
self.set_npu() self.set_npu()
...@@ -76,8 +74,6 @@ class TestNPUUniformRandomOp(OpTest): ...@@ -76,8 +74,6 @@ class TestNPUUniformRandomOp(OpTest):
hist, prob, rtol=0, atol=0.01), "hist: " + str(hist)) hist, prob, rtol=0, atol=0.01), "hist: " + str(hist))
@unittest.skipIf(not paddle.is_compiled_with_npu(),
"core is not compiled with NPU")
class TestNPUUniformRandomOpSelectedRows(unittest.TestCase): class TestNPUUniformRandomOpSelectedRows(unittest.TestCase):
def get_places(self): def get_places(self):
places = [core.CPUPlace()] places = [core.CPUPlace()]
......
python/paddle/fluid/tests/unittests/npu/test_unstack_op_npu.py
浏览文件 @ 712f9fe5
...@@ -24,8 +24,6 @@ import paddle ...@@ -24,8 +24,6 @@ import paddle
paddle.enable_static() paddle.enable_static()
@unittest.skipIf(not paddle.is_compiled_with_npu(),
"core is not compiled with NPU")
class TestUnStackOpBase(OpTest): class TestUnStackOpBase(OpTest):
def initDefaultParameters(self): def initDefaultParameters(self):
self.input_dim = (5, 6, 7) self.input_dim = (5, 6, 7)
...@@ -75,29 +73,21 @@ class TestUnStackOpBase(OpTest): ...@@ -75,29 +73,21 @@ class TestUnStackOpBase(OpTest):
self.check_grad_with_place(self.place, ['X'], self.get_y_names()) self.check_grad_with_place(self.place, ['X'], self.get_y_names())
@unittest.skipIf(not paddle.is_compiled_with_npu(),
"core is not compiled with NPU")
class TestStackOp3(TestUnStackOpBase): class TestStackOp3(TestUnStackOpBase):
def initParameters(self): def initParameters(self):
self.axis = -1 self.axis = -1
@unittest.skipIf(not paddle.is_compiled_with_npu(),
"core is not compiled with NPU")
class TestStackOp4(TestUnStackOpBase): class TestStackOp4(TestUnStackOpBase):
def initParameters(self): def initParameters(self):
self.axis = -3 self.axis = -3
@unittest.skipIf(not paddle.is_compiled_with_npu(),
"core is not compiled with NPU")
class TestStackOp5(TestUnStackOpBase): class TestStackOp5(TestUnStackOpBase):
def initParameters(self): def initParameters(self):
self.axis = 1 self.axis = 1
@unittest.skipIf(not paddle.is_compiled_with_npu(),
"core is not compiled with NPU")
class TestStackOp6(TestUnStackOpBase): class TestStackOp6(TestUnStackOpBase):
def initParameters(self): def initParameters(self):
self.axis = 2 self.axis = 2
......
python/paddle/fluid/tests/unittests/npu/test_update_loss_scaling_op_npu.py
浏览文件 @ 712f9fe5
...@@ -25,8 +25,6 @@ paddle.enable_static() ...@@ -25,8 +25,6 @@ paddle.enable_static()
SEED = 2021 SEED = 2021
@unittest.skipIf(not paddle.is_compiled_with_npu(),
"core is not compiled with NPU")
class TestUpdateLossScalingOp(OpTest): class TestUpdateLossScalingOp(OpTest):
def setUp(self): def setUp(self):
self.set_npu() self.set_npu()
...@@ -71,7 +69,7 @@ class TestUpdateLossScalingOp(OpTest): ...@@ -71,7 +69,7 @@ class TestUpdateLossScalingOp(OpTest):
} }
def test_check_output(self): def test_check_output(self):
self.check_output_with_place(self.place, check_dygraph=False) self.check_output_with_place(self.place)
class TestUpdateLossScalingOpBad(TestUpdateLossScalingOp): class TestUpdateLossScalingOpBad(TestUpdateLossScalingOp):
...@@ -103,8 +101,6 @@ class TestUpdateLossScalingOpBad(TestUpdateLossScalingOp): ...@@ -103,8 +101,6 @@ class TestUpdateLossScalingOpBad(TestUpdateLossScalingOp):
} }
@unittest.skipIf(not paddle.is_compiled_with_npu(),
"core is not compiled with NPU")
class TestUpdateLossScalingLayer(unittest.TestCase): class TestUpdateLossScalingLayer(unittest.TestCase):
def loss_scaling_check(self, use_npu=True, scope=fluid.Scope()): def loss_scaling_check(self, use_npu=True, scope=fluid.Scope()):
a = fluid.data(name="a", shape=[1024, 1024], dtype='float32') a = fluid.data(name="a", shape=[1024, 1024], dtype='float32')
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或