diff --git a/datasets/flwr_datasets/partitioner/__init__.py b/datasets/flwr_datasets/partitioner/__init__.py index acb2e6e832f5..3fed4446db42 100644 --- a/datasets/flwr_datasets/partitioner/__init__.py +++ b/datasets/flwr_datasets/partitioner/__init__.py @@ -19,6 +19,7 @@ from .distribution_partitioner import DistributionPartitioner from .exponential_partitioner import ExponentialPartitioner from .grouped_natural_id_partitioner import GroupedNaturalIdPartitioner +from .id_to_size_fnc_partitioner import IdToSizeFncPartitioner from .iid_partitioner import IidPartitioner from .inner_dirichlet_partitioner import InnerDirichletPartitioner from .linear_partitioner import LinearPartitioner @@ -26,7 +27,6 @@ from .partitioner import Partitioner from .pathological_partitioner import PathologicalPartitioner from .shard_partitioner import ShardPartitioner -from .size_partitioner import SizePartitioner from .square_partitioner import SquarePartitioner __all__ = [ @@ -34,6 +34,7 @@ "DistributionPartitioner", "ExponentialPartitioner", "GroupedNaturalIdPartitioner", + "IdToSizeFncPartitioner", "IidPartitioner", "InnerDirichletPartitioner", "LinearPartitioner", @@ -41,6 +42,5 @@ "Partitioner", "PathologicalPartitioner", "ShardPartitioner", - "SizePartitioner", "SquarePartitioner", ] diff --git a/datasets/flwr_datasets/partitioner/exponential_partitioner.py b/datasets/flwr_datasets/partitioner/exponential_partitioner.py index 5d9f34352af1..1bf838df5909 100644 --- a/datasets/flwr_datasets/partitioner/exponential_partitioner.py +++ b/datasets/flwr_datasets/partitioner/exponential_partitioner.py @@ -17,10 +17,10 @@ import numpy as np -from flwr_datasets.partitioner.size_partitioner import SizePartitioner +from flwr_datasets.partitioner.id_to_size_fnc_partitioner import IdToSizeFncPartitioner -class ExponentialPartitioner(SizePartitioner): +class ExponentialPartitioner(IdToSizeFncPartitioner): """Partitioner creates partitions of size that are correlated with exp(id). The amount of data each client gets is correlated with the exponent of partition ID. diff --git a/datasets/flwr_datasets/partitioner/size_partitioner.py b/datasets/flwr_datasets/partitioner/id_to_size_fnc_partitioner.py similarity index 98% rename from datasets/flwr_datasets/partitioner/size_partitioner.py rename to datasets/flwr_datasets/partitioner/id_to_size_fnc_partitioner.py index 35937d8b9cc7..d7b3b21037de 100644 --- a/datasets/flwr_datasets/partitioner/size_partitioner.py +++ b/datasets/flwr_datasets/partitioner/id_to_size_fnc_partitioner.py @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. # ============================================================================== -"""SizePartitioner class.""" +"""IdToSizeFncPartitioner class.""" from typing import Callable, Dict, List, Union @@ -23,7 +23,7 @@ from flwr_datasets.partitioner.partitioner import Partitioner -class SizePartitioner(Partitioner): +class IdToSizeFncPartitioner(Partitioner): """Base class for the deterministic size partitioning based on the `partition_id`. The client with `partition_id` has the following relationship regarding the number diff --git a/datasets/flwr_datasets/partitioner/size_partitioner_test.py b/datasets/flwr_datasets/partitioner/id_to_size_fnc_partitioner_test.py similarity index 98% rename from datasets/flwr_datasets/partitioner/size_partitioner_test.py rename to datasets/flwr_datasets/partitioner/id_to_size_fnc_partitioner_test.py index 086ca3731e58..905aa8cc9303 100644 --- a/datasets/flwr_datasets/partitioner/size_partitioner_test.py +++ b/datasets/flwr_datasets/partitioner/id_to_size_fnc_partitioner_test.py @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. # ============================================================================== -"""SizePartitioner tests.""" +"""IdToSizeFuncitonPartitioner tests.""" import unittest diff --git a/datasets/flwr_datasets/partitioner/linear_partitioner.py b/datasets/flwr_datasets/partitioner/linear_partitioner.py index 840307edcac6..07fea16df5e0 100644 --- a/datasets/flwr_datasets/partitioner/linear_partitioner.py +++ b/datasets/flwr_datasets/partitioner/linear_partitioner.py @@ -15,10 +15,10 @@ """LinearPartitioner class.""" -from flwr_datasets.partitioner.size_partitioner import SizePartitioner +from flwr_datasets.partitioner.id_to_size_fnc_partitioner import IdToSizeFncPartitioner -class LinearPartitioner(SizePartitioner): +class LinearPartitioner(IdToSizeFncPartitioner): """Partitioner creates partitions of size that are linearly correlated with id. The amount of data each client gets is linearly correlated with the partition ID. diff --git a/datasets/flwr_datasets/partitioner/square_partitioner.py b/datasets/flwr_datasets/partitioner/square_partitioner.py index 0fa0a0803a0e..d48af247e5cb 100644 --- a/datasets/flwr_datasets/partitioner/square_partitioner.py +++ b/datasets/flwr_datasets/partitioner/square_partitioner.py @@ -17,10 +17,10 @@ import numpy as np -from flwr_datasets.partitioner.size_partitioner import SizePartitioner +from flwr_datasets.partitioner.id_to_size_fnc_partitioner import IdToSizeFncPartitioner -class SquarePartitioner(SizePartitioner): +class SquarePartitioner(IdToSizeFncPartitioner): """Partitioner creates partitions of size that are correlated with squared id. The amount of data each client gets is correlated with the squared partition ID.