From 6d2dca421da11ece464706dcf240c87222ec0447 Mon Sep 17 00:00:00 2001 From: yh Date: Tue, 17 May 2022 13:21:16 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B5=8B=E8=AF=95=E4=B8=AD?= =?UTF-8?q?=E9=9C=80=E8=A6=81=E8=B6=85=E8=BF=872=E4=B8=AAgpu=E7=9A=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- fastNLP/core/callbacks/topk_saver.py | 2 +- tests/core/controllers/_test_distributed_launch_torch_1.py | 2 +- tests/core/controllers/test_trainer_event_trigger.py | 2 +- tests/core/dataloaders/jittor_dataloader/test_fdl.py | 5 ++++- .../drivers/torch_driver/test_initialize_torch_driver.py | 2 +- tests/core/metrics/test_accuracy_torch.py | 2 +- tests/core/metrics/test_classify_f1_pre_rec_metric_torch.py | 2 +- 7 files changed, 10 insertions(+), 7 deletions(-) diff --git a/fastNLP/core/callbacks/topk_saver.py b/fastNLP/core/callbacks/topk_saver.py index d2b9ad58..32341e7b 100644 --- a/fastNLP/core/callbacks/topk_saver.py +++ b/fastNLP/core/callbacks/topk_saver.py @@ -36,7 +36,7 @@ class Saver: model_save_fn:Callable=None, **kwargs): if folder is None: folder = Path.cwd().absolute() - logger.info(f"Parameter `folder` is None, and we will use {folder} to save and load your model.") + logger.info(f"Parameter `folder` is None, and fastNLP will use {folder} to save and load your model.") folder = Path(folder) if not folder.exists(): folder.mkdir(parents=True, exist_ok=True) diff --git a/tests/core/controllers/_test_distributed_launch_torch_1.py b/tests/core/controllers/_test_distributed_launch_torch_1.py index c0a2ba72..5e543770 100644 --- a/tests/core/controllers/_test_distributed_launch_torch_1.py +++ b/tests/core/controllers/_test_distributed_launch_torch_1.py @@ -6,7 +6,7 @@ python -m torch.distributed.launch --nproc_per_node 2 tests/core/controllers/_te import argparse import os -os.environ["CUDA_VISIBLE_DEVICES"] = "1,2" +os.environ["CUDA_VISIBLE_DEVICES"] = "0, 1" import sys path = os.path.abspath(__file__) diff --git a/tests/core/controllers/test_trainer_event_trigger.py b/tests/core/controllers/test_trainer_event_trigger.py index 3032d8fc..d1664741 100644 --- a/tests/core/controllers/test_trainer_event_trigger.py +++ b/tests/core/controllers/test_trainer_event_trigger.py @@ -224,7 +224,7 @@ def test_trainer_event_trigger_2( assert k in output[0] -@pytest.mark.parametrize("driver,device", [("torch", "cpu"), ("torch", 6)]) +@pytest.mark.parametrize("driver,device", [("torch", "cpu"), ("torch", 0)]) @pytest.mark.torch @magic_argv_env_context def test_trainer_event_trigger_3( diff --git a/tests/core/dataloaders/jittor_dataloader/test_fdl.py b/tests/core/dataloaders/jittor_dataloader/test_fdl.py index 508aa55b..a455c265 100644 --- a/tests/core/dataloaders/jittor_dataloader/test_fdl.py +++ b/tests/core/dataloaders/jittor_dataloader/test_fdl.py @@ -1,6 +1,9 @@ import pytest import numpy as np -from datasets import Dataset as HfDataset +from fastNLP.envs import _module_available + +if _module_available('datasets'): + from datasets import Dataset as HfDataset from fastNLP.core.dataloaders.jittor_dataloader import JittorDataLoader from fastNLP.core.dataset import DataSet as Fdataset diff --git a/tests/core/drivers/torch_driver/test_initialize_torch_driver.py b/tests/core/drivers/torch_driver/test_initialize_torch_driver.py index dc89ad0d..950477c1 100644 --- a/tests/core/drivers/torch_driver/test_initialize_torch_driver.py +++ b/tests/core/drivers/torch_driver/test_initialize_torch_driver.py @@ -40,7 +40,7 @@ def test_get_single_device(driver, device): @pytest.mark.torch @pytest.mark.parametrize( "device", - [[0, 2, 3], -1] + [[0, 1], -1] ) @pytest.mark.parametrize( "driver", diff --git a/tests/core/metrics/test_accuracy_torch.py b/tests/core/metrics/test_accuracy_torch.py index cadf4e0e..0909eedc 100644 --- a/tests/core/metrics/test_accuracy_torch.py +++ b/tests/core/metrics/test_accuracy_torch.py @@ -102,7 +102,7 @@ class TestAccuracy: metric_kwargs=metric_kwargs, sklearn_metric=sklearn_accuracy, ), - [(rank, processes, torch.device(f'cuda:{rank+4}')) for rank in range(processes)] + [(rank, processes, torch.device(f'cuda:{rank}')) for rank in range(processes)] ) else: device = torch.device( diff --git a/tests/core/metrics/test_classify_f1_pre_rec_metric_torch.py b/tests/core/metrics/test_classify_f1_pre_rec_metric_torch.py index 75203a3e..4d799e1f 100644 --- a/tests/core/metrics/test_classify_f1_pre_rec_metric_torch.py +++ b/tests/core/metrics/test_classify_f1_pre_rec_metric_torch.py @@ -177,6 +177,6 @@ class TestClassfiyFPreRecMetric: metric_class=ClassifyFPreRecMetric, metric_kwargs=metric_kwargs, metric_result=ground_truth), - [(rank, NUM_PROCESSES, torch.device(f'cuda:{rank+4}')) for rank in range(NUM_PROCESSES)]) + [(rank, NUM_PROCESSES, torch.device(f'cuda:{rank}')) for rank in range(NUM_PROCESSES)]) pool.close() pool.join()