move DataLoader to paddle.io. test=develop

PaddlePaddle · Apr 13, 2023 · 78d2d3f · 78d2d3f
1 parent cbdba50
commit 78d2d3f
Show file tree

Hide file tree

Showing 30 changed files with 812 additions and 672 deletions.
diff --git a/python/paddle/distributed/auto_parallel/dist_loader.py b/python/paddle/distributed/auto_parallel/dist_loader.py
@@ -17,16 +17,16 @@
 import numpy as np
 
 import paddle
-from paddle.fluid.dataloader.batch_sampler import (
+from paddle.io import BatchSampler, IterableDataset
+from paddle.io.dataloader.batch_sampler import (
     DistributedBatchSampler,
     _InfiniteIterableSampler,
 )
-from paddle.fluid.dataloader.dataloader_iter import (
+from paddle.io.dataloader.dataloader_iter import (
     _DatasetKind,
     default_collate_fn,
     default_convert_fn,
 )
-from paddle.io import BatchSampler, IterableDataset
 
 
 class DistributedDataLoaderBase(metaclass=abc.ABCMeta):

diff --git a/python/paddle/fluid/dataloader/__init__.py b/python/paddle/fluid/dataloader/__init__.py
diff --git a/python/paddle/fluid/io.py b/python/paddle/fluid/io.py
@@ -55,8 +55,6 @@
 from . import reader
 from . import unique_name
 from .reader import *
-from . import dataloader
-from .dataloader import *
 from . import core
 from paddle.utils import deprecated
 from paddle.fluid.framework import static_only