combine __all__ in dataset/__init__.py and dataset/engine/__init__.py to be one

mindspore/dataset/__init__.py

@@ -24,18 +24,12 @@ while loading and processing data on Windows.
 """
 
 from .core import config
-from .engine.datasets import TFRecordDataset, ImageFolderDataset, MnistDataset, MindDataset, NumpySlicesDataset, \
-    GeneratorDataset, ManifestDataset, Cifar10Dataset, Cifar100Dataset, VOCDataset, CocoDataset, CelebADataset, \
-    TextFileDataset, CLUEDataset, CSVDataset, Schema, Shuffle, zip, RandomDataset, PaddedDataset
-from .engine.samplers import DistributedSampler, PKSampler, RandomSampler, SequentialSampler, SubsetRandomSampler, \
-    WeightedRandomSampler, Sampler
+from .engine import *
 from .engine.cache_client import DatasetCache
-from .engine.serializer_deserializer import serialize, deserialize, show
+from .engine.datasets import *
 from .engine.graphdata import GraphData
+from .engine.samplers import *
+from .engine.serializer_deserializer import compare, deserialize, serialize, show
 
-__all__ = ["config", "ImageFolderDataset", "MnistDataset", "PaddedDataset",
-           "MindDataset", "GeneratorDataset", "TFRecordDataset",
-           "ManifestDataset", "Cifar10Dataset", "Cifar100Dataset", "CelebADataset", "NumpySlicesDataset", "VOCDataset",
-           "CocoDataset", "TextFileDataset", "CLUEDataset", "CSVDataset", "Schema", "DistributedSampler", "PKSampler",
-           "RandomSampler", "SequentialSampler", "SubsetRandomSampler", "WeightedRandomSampler", "zip", "GraphData",
-           "DatasetCache"]
+__all__ = []
+__all__.extend(engine.__all__)

mindspore/dataset/engine/__init__.py

@@ -22,14 +22,17 @@ high performance and parse data precisely. It also provides the following
 operations for users to preprocess data: shuffle, batch, repeat, map, and zip.
 """
 
+from ..core import config
+from .cache_client import DatasetCache
 from .datasets import *
+from .graphdata import GraphData
 from .iterators import *
-from .serializer_deserializer import serialize, deserialize, show, compare
 from .samplers import *
-from ..core import config
+from .serializer_deserializer import compare, deserialize, serialize, show
 
-__all__ = ["config", "zip", "ImageFolderDataset", "MnistDataset",
-           "MindDataset", "GeneratorDataset", "TFRecordDataset", "CLUEDataset", "CSVDataset",
-           "ManifestDataset", "Cifar10Dataset", "Cifar100Dataset", "CelebADataset",
-           "VOCDataset", "CocoDataset", "TextFileDataset", "Schema", "DistributedSampler",
-           "PKSampler", "RandomSampler", "SequentialSampler", "SubsetRandomSampler", "WeightedRandomSampler"]
+__all__ = ["CelebADataset", "Cifar100Dataset", "Cifar10Dataset", "CLUEDataset", "CocoDataset", "CSVDataset",
+           "GeneratorDataset", "GraphData", "ImageFolderDataset", "ManifestDataset", "MindDataset", "MnistDataset",
+           "NumpySlicesDataset", "PaddedDataset", "TextFileDataset", "TFRecordDataset", "VOCDataset",
+           "DistributedSampler", "PKSampler", "RandomSampler", "SequentialSampler", "SubsetRandomSampler",
+           "WeightedRandomSampler",
+           "config", "DatasetCache", "Schema", "zip"]