diff --git a/tests/core/controllers/test_trainer_paddle.py b/tests/core/controllers/test_trainer_paddle.py index 3cf850c3..895e8517 100644 --- a/tests/core/controllers/test_trainer_paddle.py +++ b/tests/core/controllers/test_trainer_paddle.py @@ -27,7 +27,7 @@ class TrainPaddleConfig: @pytest.mark.parametrize("driver,device", [("paddle", "cpu"), ("paddle", 1), ("fleet", [0, 1])]) # @pytest.mark.parametrize("driver,device", [("fleet", [0, 1])]) @pytest.mark.parametrize("callbacks", [[RichCallback(5)]]) -@pytest.mark.paddle +@pytest.mark.paddledist @magic_argv_env_context def test_trainer_paddle( driver, diff --git a/tests/core/drivers/paddle_driver/test_dist_utils.py b/tests/core/drivers/paddle_driver/test_dist_utils.py index da40ad78..e3a3eb5d 100644 --- a/tests/core/drivers/paddle_driver/test_dist_utils.py +++ b/tests/core/drivers/paddle_driver/test_dist_utils.py @@ -19,7 +19,7 @@ if _NEED_IMPORT_PADDLE: import paddle import paddle.distributed as dist -@pytest.mark.paddle +@pytest.mark.paddledist class TestDistUtilsTools: """ 测试一些工具函数 @@ -79,14 +79,13 @@ class TestDistUtilsTools: assert res["int"] == paddle_dict["int"] assert res["string"] == paddle_dict["string"] - -@pytest.mark.paddle +@pytest.mark.paddledist class TestAllGatherAndBroadCast: @classmethod def setup_class(cls): devices = [0,1,2] - output_from_new_proc = "only_error" + output_from_new_proc = "all" launcher = FleetLauncher(devices=devices, output_from_new_proc=output_from_new_proc) cls.local_rank = int(os.getenv("PADDLE_RANK_IN_NODE", "0")) diff --git a/tests/core/drivers/paddle_driver/test_fleet.py b/tests/core/drivers/paddle_driver/test_fleet.py index a184bb11..4e09d3e2 100644 --- a/tests/core/drivers/paddle_driver/test_fleet.py +++ b/tests/core/drivers/paddle_driver/test_fleet.py @@ -39,7 +39,7 @@ def generate_driver(num_labels, feature_dimension, device=[0,1], fp16=False, out # ############################################################################ -@pytest.mark.paddle +@pytest.mark.paddledist class TestFleetDriverFunction: """ 测试 PaddleFleetDriver 一些简单函数的测试类,基本都是测试能否运行、是否存在 import 错误等问题 @@ -147,7 +147,7 @@ class TestFleetDriverFunction: # ############################################################################ -@pytest.mark.paddle +@pytest.mark.paddledist class TestSetDistReproDataloader: @classmethod @@ -521,7 +521,7 @@ class TestSetDistReproDataloader: # ############################################################################ -@pytest.mark.paddle +@pytest.mark.paddledist class TestSaveLoad: """ 测试多卡情况下 save 和 load 相关函数的表现 diff --git a/tests/pytest.ini b/tests/pytest.ini index d6a33a94..5015a002 100644 --- a/tests/pytest.ini +++ b/tests/pytest.ini @@ -2,5 +2,6 @@ markers = torch paddle + paddledist jittor torchpaddle \ No newline at end of file