diff --git a/ppcls/data/__init__.py b/ppcls/data/__init__.py index c7efa2175f6f791765e81b9c858c2df2aa3003b5..de62cc5da0402d93d5f9dab9447c53e5978903b1 100644 --- a/ppcls/data/__init__.py +++ b/ppcls/data/__init__.py @@ -18,14 +18,14 @@ from paddle.io import DistributedBatchSampler, BatchSampler, DataLoader from ppcls.utils import logger -from . import dataset +from . import dataloader from . import imaug from . import samplers # dataset -from .dataset.imagenet_dataset import ImageNetDataset -from .dataset.multilabel_dataset import MultiLabelDataset -from .dataset.common_dataset import create_operators -from .dataset.vehicle_dataset import CompCars, VeriWild +from .dataloader.imagenet_dataset import ImageNetDataset +from .dataloader.multilabel_dataset import MultiLabelDataset +from .dataloader.common_dataset import create_operators +from .dataloader.vehicle_dataset import CompCars, VeriWild # sampler from .samplers import DistributedRandomIdentitySampler diff --git a/ppcls/data/samplers/DistributedRandomIdentitySampler.py b/ppcls/data/dataloader/DistributedRandomIdentitySampler.py similarity index 100% rename from ppcls/data/samplers/DistributedRandomIdentitySampler.py rename to ppcls/data/dataloader/DistributedRandomIdentitySampler.py diff --git a/ppcls/data/dataset/__init__.py b/ppcls/data/dataloader/__init__.py similarity index 100% rename from ppcls/data/dataset/__init__.py rename to ppcls/data/dataloader/__init__.py diff --git a/ppcls/data/dataset/common_dataset.py b/ppcls/data/dataloader/common_dataset.py similarity index 100% rename from ppcls/data/dataset/common_dataset.py rename to ppcls/data/dataloader/common_dataset.py diff --git a/ppcls/data/dataset/flowers102/__init__.py b/ppcls/data/dataloader/flowers102/__init__.py similarity index 100% rename from ppcls/data/dataset/flowers102/__init__.py rename to ppcls/data/dataloader/flowers102/__init__.py diff --git a/ppcls/data/dataset/flowers102/generate_flowers102_list.py b/ppcls/data/dataloader/flowers102/generate_flowers102_list.py similarity index 100% rename from ppcls/data/dataset/flowers102/generate_flowers102_list.py rename to ppcls/data/dataloader/flowers102/generate_flowers102_list.py diff --git a/ppcls/data/dataset/imagenet_dataset.py b/ppcls/data/dataloader/imagenet_dataset.py similarity index 100% rename from ppcls/data/dataset/imagenet_dataset.py rename to ppcls/data/dataloader/imagenet_dataset.py diff --git a/ppcls/data/dataset/multilabel_dataset.py b/ppcls/data/dataloader/multilabel_dataset.py similarity index 100% rename from ppcls/data/dataset/multilabel_dataset.py rename to ppcls/data/dataloader/multilabel_dataset.py diff --git a/ppcls/data/dataset/vehicle_dataset.py b/ppcls/data/dataloader/vehicle_dataset.py similarity index 100% rename from ppcls/data/dataset/vehicle_dataset.py rename to ppcls/data/dataloader/vehicle_dataset.py diff --git a/ppcls/data/samplers/__init__.py b/ppcls/data/samplers/__init__.py deleted file mode 100644 index a6fb850d6823c17452707f5d5b71ce38f4d10d29..0000000000000000000000000000000000000000 --- a/ppcls/data/samplers/__init__.py +++ /dev/null @@ -1 +0,0 @@ -from .DistributedRandomIdentitySampler import DistributedRandomIdentitySampler