Merge branch 'dev0.8.0' of github.com:fastnlp/fastNLP into dev0.8.0

tests/core/dataloaders/paddle_dataloader/test_fdl.py

@@ -1,10 +1,14 @@
 import pytest
+import numpy as np
 
 from fastNLP.core.dataloaders.paddle_dataloader.fdl import PaddleDataLoader
 from fastNLP.core.dataset import DataSet
-from paddle.io import Dataset, DataLoader
-import numpy as np
-import paddle
+from fastNLP.envs.imports import _NEED_IMPORT_PADDLE
+if _NEED_IMPORT_PADDLE:
+    from paddle.io import Dataset, DataLoader
+    import paddle
+else:
+    from fastNLP.core.utils.dummy_class import DummyClass as Dataset
 
 
 class RandomDataset(Dataset):

tests/core/drivers/paddle_driver/test_dist_utils.py

@@ -14,9 +14,10 @@ from fastNLP.core.drivers.paddle_driver.dist_utils import (
 )
 from fastNLP.core.drivers.paddle_driver.fleet_launcher import FleetLauncher
 from tests.helpers.utils import magic_argv_env_context
-
-import paddle
-import paddle.distributed as dist
+from fastNLP.envs.imports import _NEED_IMPORT_PADDLE
+if _NEED_IMPORT_PADDLE:
+    import paddle
+    import paddle.distributed as dist
 
 @pytest.mark.paddle
 class TestDistUtilsTools:

tests/core/drivers/paddle_driver/test_fleet.py

@@ -13,10 +13,11 @@ from tests.helpers.models.paddle_model import PaddleNormalModel_Classification_1
 from tests.helpers.datasets.paddle_data import PaddleNormalDataset, PaddleRandomMaxDataset
 from tests.helpers.utils import magic_argv_env_context
 from fastNLP.core import rank_zero_rm
-
-import paddle
-import paddle.distributed as dist
-from paddle.io import DataLoader, BatchSampler
+from fastNLP.envs.imports import _NEED_IMPORT_PADDLE
+if _NEED_IMPORT_PADDLE:
+    import paddle
+    import paddle.distributed as dist
+    from paddle.io import DataLoader, BatchSampler
 
 def generate_driver(num_labels, feature_dimension, device=[0,1], fp16=False, output_from_new_proc="only_error"):
     paddle_model = PaddleNormalModel_Classification_1(num_labels, feature_dimension)

tests/core/drivers/paddle_driver/test_initialize_paddle_driver.py

@@ -5,8 +5,9 @@ from fastNLP.core.drivers.paddle_driver.initialize_paddle_driver import initiali
 from fastNLP.envs import get_gpu_count
 from tests.helpers.models.paddle_model import PaddleNormalModel_Classification_1
 from tests.helpers.utils import magic_argv_env_context
-
-import paddle
+from fastNLP.envs.imports import _NEED_IMPORT_PADDLE
+if _NEED_IMPORT_PADDLE:
+    import paddle
 
 @pytest.mark.paddle
 def test_incorrect_driver():

tests/core/drivers/paddle_driver/test_single_device.py

@@ -8,10 +8,12 @@ from tests.helpers.datasets.paddle_data import PaddleNormalDataset, PaddleRandom
 from tests.helpers.datasets.torch_data import TorchNormalDataset
 from tests.helpers.models.torch_model import TorchNormalModel_Classification_1
 from fastNLP.core import rank_zero_rm
-
-import paddle
-from paddle.io import DataLoader, BatchSampler
-import torch
+from fastNLP.envs.imports import _NEED_IMPORT_PADDLE, _NEED_IMPORT_TORCH
+if _NEED_IMPORT_PADDLE:
+    import paddle
+    from paddle.io import DataLoader, BatchSampler
+if _NEED_IMPORT_TORCH:
+    import torch
 
 ############################################################################
 #

tests/core/drivers/paddle_driver/test_utils.py

@@ -7,9 +7,10 @@ from fastNLP.core.drivers.paddle_driver.utils import (
     replace_sampler,
 )
 from fastNLP.core.samplers import RandomBatchSampler, RandomSampler
-
-import paddle
-from paddle.io import DataLoader, BatchSampler
+from fastNLP.envs.imports import _NEED_IMPORT_PADDLE
+if _NEED_IMPORT_PADDLE:
+    import paddle
+    from paddle.io import DataLoader, BatchSampler
 
 from tests.helpers.datasets.paddle_data import PaddleNormalDataset
 

tests/core/drivers/torch_driver/test_single_device.py

@@ -8,10 +8,12 @@ from tests.helpers.datasets.torch_data import TorchNormalDataset, TorchArgMaxDat
 from tests.helpers.datasets.paddle_data import PaddleNormalDataset
 from tests.helpers.models.paddle_model import PaddleNormalModel_Classification_1
 from fastNLP.core import rank_zero_rm
-
-import torch
-from torch.utils.data import DataLoader, BatchSampler
-import paddle
+from fastNLP.envs.imports import _NEED_IMPORT_PADDLE, _NEED_IMPORT_TORCH
+if _NEED_IMPORT_TORCH:
+    import torch
+    from torch.utils.data import DataLoader, BatchSampler
+if _NEED_IMPORT_PADDLE:
+    import paddle
 
 def dataloader_with_randombatchsampler(dataset, batch_size, shuffle, drop_last):
     """

tests/core/metrics/test_accutacy_paddle.py → tests/core/metrics/test_accuracy_paddle.py

@@ -1,12 +1,14 @@
 import os
 
 import pytest
-import paddle
-import paddle.distributed
-import paddle.distributed.fleet.base.role_maker as role_maker
-import paddle.distributed.fleet as fleet
 from fastNLP.core.metrics import Accuracy
 from fastNLP.core.drivers.paddle_driver.fleet_launcher import FleetLauncher
+from fastNLP.envs.imports import _NEED_IMPORT_PADDLE
+if _NEED_IMPORT_PADDLE:
+    import paddle
+    import paddle.distributed
+    import paddle.distributed.fleet.base.role_maker as role_maker
+    import paddle.distributed.fleet as fleet
 
 
 ############################################################################

tests/core/utils/test_paddle_utils.py

@@ -1,7 +1,9 @@
 import pytest
-import paddle
 
 from fastNLP.core.utils.paddle_utils import paddle_to, paddle_move_data_to_device
+from fastNLP.envs.imports import _NEED_IMPORT_PADDLE
+if _NEED_IMPORT_PADDLE:
+    import paddle
 
 
 ############################################################################

tests/helpers/datasets/paddle_data.py

@@ -1,7 +1,12 @@
-import paddle
-from paddle.io import Dataset
 import numpy as np
 
+from fastNLP.envs.imports import _NEED_IMPORT_PADDLE
+if _NEED_IMPORT_PADDLE:
+    import paddle
+    from paddle.io import Dataset
+else:
+    from fastNLP.core.utils.dummy_class import DummyClass as Dataset
+
 
 class PaddleNormalDataset(Dataset):
     def __init__(self, num_of_data=1000):

tests/helpers/models/paddle_model.py

@@ -1,7 +1,12 @@
-import paddle
-import paddle.nn as nn
-
-class PaddleNormalModel_Classification_1(paddle.nn.Layer):
+from fastNLP.envs.imports import _NEED_IMPORT_PADDLE
+if _NEED_IMPORT_PADDLE:
+    import paddle
+    import paddle.nn as nn
+    from paddle.nn import Layer
+else:
+    from fastNLP.core.utils.dummy_class import DummyClass as Layer
+
+class PaddleNormalModel_Classification_1(Layer):
     """
     基础的paddle分类模型
     """
@@ -32,7 +37,7 @@ class PaddleNormalModel_Classification_1(paddle.nn.Layer):
         return {"pred": x, "target": y.reshape((-1,))}
 
 
-class PaddleNormalModel_Classification_2(paddle.nn.Layer):
+class PaddleNormalModel_Classification_2(Layer):
     """
     基础的paddle分类模型，只实现 forward 函数测试用户自己初始化了分布式的场景
     """