diff --git a/datasets/flwr_datasets/common/__init__.py b/datasets/flwr_datasets/common/__init__.py index a6468bcf7fda..b4f12f8641b3 100644 --- a/datasets/flwr_datasets/common/__init__.py +++ b/datasets/flwr_datasets/common/__init__.py @@ -13,8 +13,3 @@ # limitations under the License. # ============================================================================== """Common components in Flower Datasets.""" - - -from .typing import Resplitter - -__all__ = ["Resplitter"] diff --git a/datasets/flwr_datasets/federated_dataset.py b/datasets/flwr_datasets/federated_dataset.py index cad137a98ba8..09eb840cf639 100644 --- a/datasets/flwr_datasets/federated_dataset.py +++ b/datasets/flwr_datasets/federated_dataset.py @@ -19,8 +19,8 @@ import datasets from datasets import Dataset, DatasetDict -from flwr_datasets.common import Resplitter from flwr_datasets.partitioner import Partitioner +from flwr_datasets.resplitter import Resplitter from flwr_datasets.utils import ( _check_if_dataset_tested, _instantiate_partitioners, diff --git a/datasets/flwr_datasets/resplitter/__init__.py b/datasets/flwr_datasets/resplitter/__init__.py index f778d2096b76..e0b2dc0dcc1c 100644 --- a/datasets/flwr_datasets/resplitter/__init__.py +++ b/datasets/flwr_datasets/resplitter/__init__.py @@ -16,7 +16,9 @@ from .merge_resplitter import MergeResplitter +from .resplitter import Resplitter __all__ = [ "MergeResplitter", + "Resplitter", ] diff --git a/datasets/flwr_datasets/common/typing.py b/datasets/flwr_datasets/resplitter/resplitter.py similarity index 95% rename from datasets/flwr_datasets/common/typing.py rename to datasets/flwr_datasets/resplitter/resplitter.py index 28e6bae4a505..206e2e85730c 100644 --- a/datasets/flwr_datasets/common/typing.py +++ b/datasets/flwr_datasets/resplitter/resplitter.py @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. # ============================================================================== -"""Flower Datasets type definitions.""" +"""Resplitter.""" from typing import Callable diff --git a/datasets/flwr_datasets/utils.py b/datasets/flwr_datasets/utils.py index 49c65e9893a7..24bfd6b11590 100644 --- a/datasets/flwr_datasets/utils.py +++ b/datasets/flwr_datasets/utils.py @@ -18,8 +18,8 @@ import warnings from typing import Dict, Optional, Tuple, Union, cast -from flwr_datasets.common import Resplitter from flwr_datasets.partitioner import IidPartitioner, Partitioner +from flwr_datasets.resplitter import Resplitter from flwr_datasets.resplitter.merge_resplitter import MergeResplitter tested_datasets = [