blazefl 2.0.0.dev2__tar.gz → 2.0.0.dev3__tar.gz

{blazefl-2.0.0.dev2 → blazefl-2.0.0.dev3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: blazefl
-Version: 2.0.0.dev2
+Version: 2.0.0.dev3
 Summary: A blazing-fast and lightweight simulation framework for Federated Learning.
 Author-email: kitsuyaazuma <kitsuyaazuma@gmail.com>
 License-File: LICENSE

{blazefl-2.0.0.dev2 → blazefl-2.0.0.dev3}/examples/experimental-freethreaded/main.py

@@ -12,11 +12,10 @@ from blazefl.contrib import (
     FedAvgServerHandler,
 )
 from blazefl.contrib.fedavg import FedAvgDownlinkPackage, FedAvgUplinkPackage
-from blazefl.core import ModelSelector, PartitionedDataset
+from blazefl.core import ModelSelector, MultiThreadClientTrainer, PartitionedDataset
 from blazefl.utils import seed_everything
 from omegaconf import DictConfig, OmegaConf
 
-from core.client_trainer import MultiThreadClientTrainer
 from dataset import PartitionedCIFAR10
 from models import FedAvgModelSelector
 

{blazefl-2.0.0.dev2 → blazefl-2.0.0.dev3}/examples/experimental-freethreaded/pyproject.toml

@@ -5,7 +5,7 @@ description = "Add your description here"
 readme = "README.md"
 requires-python = ">=3.13"
 dependencies = [
-    "blazefl>=2.0.0dev1",
+    "blazefl>=2.0.0dev2",
     "hydra-core>=1.3.2",
     "torch>=2.7.1",
     "torchvision>=0.22.1",

{blazefl-2.0.0.dev2 → blazefl-2.0.0.dev3}/examples/experimental-freethreaded/uv.lock

@@ -10,16 +10,16 @@ sdist = { url = "https://files.pythonhosted.org/packages/3e/38/7859ff46355f76f8d
 
 [[package]]
 name = "blazefl"
-version = "2.0.0.dev1"
+version = "2.0.0.dev2"
 source = { registry = "https://pypi.org/simple" }
 dependencies = [
     { name = "numpy" },
     { name = "torch" },
     { name = "tqdm" },
 ]
-sdist = { url = "https://files.pythonhosted.org/packages/9d/4a/b82e557a19b3dc957e43fc29c73bb3b9ddbb78575de20e2a98a7db954c51/blazefl-2.0.0.dev1.tar.gz", hash = "sha256:aeef9d1a6835ae240b9772144a1ca8ee2691a9252a980173b1c81d1c7c453596", size = 591232, upload_time = "2025-06-10T08:28:25.786Z" }
+sdist = { url = "https://files.pythonhosted.org/packages/9b/92/3f668d7259a81d13d5d2e6089d8022629a09058ddbcae33f5873d3871656/blazefl-2.0.0.dev2.tar.gz", hash = "sha256:28a3e09d6f6cec8d8e8bb4da90adaa0c795980c74f9d4ce65024ba762726b595", size = 613563, upload_time = "2025-06-10T09:24:08.981Z" }
 wheels = [
-    { url = "https://files.pythonhosted.org/packages/99/c0/3a4e12feee7a3a9e52a3eba30816a7ce7d4a11e3b11989b72c01419e1116/blazefl-2.0.0.dev1-py3-none-any.whl", hash = "sha256:1a158f673ac8f644b0a273d6cdb6d32b0ff17a1f479dffd930a06873f023042a", size = 23714, upload_time = "2025-06-10T08:28:24.297Z" },
+    { url = "https://files.pythonhosted.org/packages/e3/7c/841c8b9d22caaefc1dcc167076292fd1479309b3e11eb6fc1b24141792a8/blazefl-2.0.0.dev2-py3-none-any.whl", hash = "sha256:88639018166dafa79fde59aa5575bfb7277bf9e0e4497f22a59e9c7ec34efa4b", size = 23999, upload_time = "2025-06-10T09:24:07.553Z" },
 ]
 
 [[package]]
@@ -50,7 +50,7 @@ dev = [
 
 [package.metadata]
 requires-dist = [
-    { name = "blazefl", specifier = ">=2.0.0.dev1" },
+    { name = "blazefl", specifier = ">=2.0.0.dev2" },
     { name = "hydra-core", specifier = ">=1.3.2" },
     { name = "torch", specifier = ">=2.7.1" },
     { name = "torchvision", specifier = ">=0.22.1" },

{blazefl-2.0.0.dev2 → blazefl-2.0.0.dev3}/examples/quickstart-fedavg/main.py

@@ -6,9 +6,9 @@ import hydra
 import torch
 import torch.multiprocessing as mp
 from blazefl.contrib import (
-    FedAvgParallelClientTrainer,
-    FedAvgSerialClientTrainer,
-    FedAvgServerHandler,
+    FedAvgBaseClientTrainer,
+    FedAvgBaseServerHandler,
+    FedAvgProcessPoolClientTrainer,
 )
 from blazefl.utils import seed_everything
 from hydra.core import hydra_config
@@ -22,8 +22,8 @@ from models import FedAvgModelSelector
 class FedAvgPipeline:
     def __init__(
         self,
-        handler: FedAvgServerHandler,
-        trainer: FedAvgSerialClientTrainer | FedAvgParallelClientTrainer,
+        handler: FedAvgBaseServerHandler,
+        trainer: FedAvgBaseClientTrainer | FedAvgProcessPoolClientTrainer,
         writer: SummaryWriter,
     ) -> None:
         self.handler = handler
@@ -87,7 +87,7 @@ def main(cfg: DictConfig):
     )
     model_selector = FedAvgModelSelector(num_classes=10)
 
-    handler = FedAvgServerHandler(
+    handler = FedAvgBaseServerHandler(
         model_selector=model_selector,
         model_name=cfg.model_name,
         dataset=dataset,
@@ -97,9 +97,9 @@ def main(cfg: DictConfig):
         sample_ratio=cfg.sample_ratio,
         batch_size=cfg.batch_size,
     )
-    trainer: FedAvgSerialClientTrainer | FedAvgParallelClientTrainer | None = None
+    trainer: FedAvgBaseClientTrainer | FedAvgProcessPoolClientTrainer | None = None
     if cfg.serial:
-        trainer = FedAvgSerialClientTrainer(
+        trainer = FedAvgBaseClientTrainer(
             model_selector=model_selector,
             model_name=cfg.model_name,
             dataset=dataset,
@@ -110,7 +110,7 @@ def main(cfg: DictConfig):
             batch_size=cfg.batch_size,
         )
     else:
-        trainer = FedAvgParallelClientTrainer(
+        trainer = FedAvgProcessPoolClientTrainer(
             model_selector=model_selector,
             model_name=cfg.model_name,
             dataset=dataset,

blazefl-2.0.0.dev3/examples/step-by-step-dsfl/algorithm/__init__.py

@@ -0,0 +1,3 @@
+from algorithm.dsfl import DSFLBaseServerHandler, DSFLProcessPoolClientTrainer
+
+__all__ = ["DSFLBaseServerHandler", "DSFLProcessPoolClientTrainer"]

{blazefl-2.0.0.dev2 → blazefl-2.0.0.dev3}/examples/step-by-step-dsfl/algorithm/dsfl.py

@@ -7,8 +7,8 @@ from pathlib import Path
 import torch
 import torch.nn.functional as F
 from blazefl.core import (
-    ParallelClientTrainer,
-    ServerHandler,
+    BaseServerHandler,
+    ProcessPoolClientTrainer,
 )
 from blazefl.utils import (
     FilteredDataset,
@@ -35,7 +35,7 @@ class DSFLDownlinkPackage:
     next_indices: torch.Tensor
 
 
-class DSFLServerHandler(ServerHandler[DSFLUplinkPackage, DSFLDownlinkPackage]):
+class DSFLBaseServerHandler(BaseServerHandler[DSFLUplinkPackage, DSFLDownlinkPackage]):
     def __init__(
         self,
         model_selector: DSFLModelSelector,
@@ -116,7 +116,7 @@ class DSFLServerHandler(ServerHandler[DSFLUplinkPackage, DSFLDownlinkPackage]):
             era_soft_labels = F.softmax(mean_soft_labels / self.era_temperature, dim=0)
             global_soft_labels.append(era_soft_labels)
 
-        DSFLServerHandler.distill(
+        DSFLBaseServerHandler.distill(
             self.model,
             self.kd_optimizer,
             self.dataset,
@@ -205,7 +205,7 @@ class DSFLServerHandler(ServerHandler[DSFLUplinkPackage, DSFLDownlinkPackage]):
         return avg_loss, avg_acc
 
     def get_summary(self) -> dict[str, float]:
-        server_loss, server_acc = DSFLServerHandler.evaulate(
+        server_loss, server_acc = DSFLBaseServerHandler.evaulate(
             self.model,
             self.dataset.get_dataloader(
                 type_="test",
@@ -257,8 +257,8 @@ class DSFLClientState:
     kd_optimizer: dict[str, torch.Tensor] | None
 
 
-class DSFLParallelClientTrainer(
-    ParallelClientTrainer[DSFLUplinkPackage, DSFLDownlinkPackage, DSFLDiskSharedData]
+class DSFLProcessPoolClientTrainer(
+    ProcessPoolClientTrainer[DSFLUplinkPackage, DSFLDownlinkPackage, DSFLDiskSharedData]
 ):
     def __init__(
         self,
@@ -333,7 +333,7 @@ class DSFLParallelClientTrainer(
             global_indices = data.payload.indices.tolist()
             if kd_optimizer is None:
                 kd_optimizer = torch.optim.SGD(model.parameters(), lr=data.kd_lr)
-            DSFLServerHandler.distill(
+            DSFLBaseServerHandler.distill(
                 model=model,
                 optimizer=kd_optimizer,
                 dataset=data.dataset,
@@ -350,7 +350,7 @@ class DSFLParallelClientTrainer(
             cid=data.cid,
             batch_size=data.batch_size,
         )
-        DSFLParallelClientTrainer.train(
+        DSFLProcessPoolClientTrainer.train(
             model=model,
             optimizer=optimizer,
             train_loader=train_loader,
@@ -363,7 +363,7 @@ class DSFLParallelClientTrainer(
             Subset(open_dataset, data.payload.next_indices.tolist()),
             batch_size=data.batch_size,
         )
-        soft_labels = DSFLParallelClientTrainer.predict(
+        soft_labels = DSFLProcessPoolClientTrainer.predict(
             model=model,
             open_loader=open_loader,
             device=device,
@@ -375,7 +375,7 @@ class DSFLParallelClientTrainer(
             cid=data.cid,
             batch_size=data.batch_size,
         )
-        loss, acc = DSFLServerHandler.evaulate(
+        loss, acc = DSFLBaseServerHandler.evaulate(
             model=model,
             test_loader=test_loader,
             device=device,

{blazefl-2.0.0.dev2 → blazefl-2.0.0.dev3}/examples/step-by-step-dsfl/main.py

@@ -10,7 +10,7 @@ from hydra.core import hydra_config
 from omegaconf import DictConfig, OmegaConf
 from torch.utils.tensorboard.writer import SummaryWriter
 
-from algorithm import DSFLParallelClientTrainer, DSFLServerHandler
+from algorithm import DSFLBaseServerHandler, DSFLProcessPoolClientTrainer
 from dataset import DSFLPartitionedDataset
 from models import DSFLModelSelector
 
@@ -18,8 +18,8 @@ from models import DSFLModelSelector
 class DSFLPipeline:
     def __init__(
         self,
-        handler: DSFLServerHandler,
-        trainer: DSFLParallelClientTrainer,
+        handler: DSFLBaseServerHandler,
+        trainer: DSFLProcessPoolClientTrainer,
         writer: SummaryWriter,
     ) -> None:
         self.handler = handler
@@ -82,7 +82,7 @@ def main(
 
     match cfg.algorithm.name:
         case "dsfl":
-            handler = DSFLServerHandler(
+            handler = DSFLBaseServerHandler(
                 model_selector=model_selector,
                 model_name=cfg.model_name,
                 dataset=dataset,
@@ -96,7 +96,7 @@ def main(
                 device=device,
                 sample_ratio=cfg.sample_ratio,
             )
-            trainer = DSFLParallelClientTrainer(
+            trainer = DSFLProcessPoolClientTrainer(
                 model_selector=model_selector,
                 model_name=cfg.model_name,
                 dataset=dataset,

{blazefl-2.0.0.dev2 → blazefl-2.0.0.dev3}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "blazefl"
-version = "2.0.0.dev2"
+version = "2.0.0.dev3"
 description = "A blazing-fast and lightweight simulation framework for Federated Learning."
 readme = "README.md"
 authors = [

{blazefl-2.0.0.dev2 → blazefl-2.0.0.dev3}/src/blazefl/contrib/__init__.py

@@ -6,13 +6,13 @@ extending the core functionalities of BlazeFL.
 """
 
 from blazefl.contrib.fedavg import (
-    FedAvgParallelClientTrainer,
-    FedAvgSerialClientTrainer,
-    FedAvgServerHandler,
+    FedAvgBaseClientTrainer,
+    FedAvgBaseServerHandler,
+    FedAvgProcessPoolClientTrainer,
 )
 
 __all__ = [
-    "FedAvgServerHandler",
-    "FedAvgParallelClientTrainer",
-    "FedAvgSerialClientTrainer",
+    "FedAvgBaseServerHandler",
+    "FedAvgProcessPoolClientTrainer",
+    "FedAvgBaseClientTrainer",
 ]

{blazefl-2.0.0.dev2 → blazefl-2.0.0.dev3}/src/blazefl/contrib/fedavg.py

@@ -8,11 +8,11 @@ from torch.utils.data import DataLoader
 from tqdm import tqdm
 
 from blazefl.core import (
+    BaseClientTrainer,
+    BaseServerHandler,
     ModelSelector,
-    ParallelClientTrainer,
     PartitionedDataset,
-    SerialClientTrainer,
-    ServerHandler,
+    ProcessPoolClientTrainer,
 )
 from blazefl.utils import (
     RandomState,
@@ -53,7 +53,9 @@ class FedAvgDownlinkPackage:
     model_parameters: torch.Tensor
 
 
-class FedAvgServerHandler(ServerHandler[FedAvgUplinkPackage, FedAvgDownlinkPackage]):
+class FedAvgBaseServerHandler(
+    BaseServerHandler[FedAvgUplinkPackage, FedAvgDownlinkPackage]
+):
     """
     Server-side handler for the Federated Averaging (FedAvg) algorithm.
 
@@ -85,7 +87,7 @@ class FedAvgServerHandler(ServerHandler[FedAvgUplinkPackage, FedAvgDownlinkPacka
         batch_size: int,
     ) -> None:
         """
-        Initialize the FedAvgServerHandler.
+        Initialize the FedAvgBaseServerHandler.
 
         Args:
             model_selector (ModelSelector): Selector for initializing the model.
@@ -232,7 +234,7 @@ class FedAvgServerHandler(ServerHandler[FedAvgUplinkPackage, FedAvgDownlinkPacka
         return avg_loss, avg_acc
 
     def get_summary(self) -> dict[str, float]:
-        server_loss, server_acc = FedAvgServerHandler.evaluate(
+        server_loss, server_acc = FedAvgBaseServerHandler.evaluate(
             self.model,
             self.dataset.get_dataloader(
                 type_="test",
@@ -258,11 +260,11 @@ class FedAvgServerHandler(ServerHandler[FedAvgUplinkPackage, FedAvgDownlinkPacka
         return FedAvgDownlinkPackage(model_parameters)
 
 
-class FedAvgSerialClientTrainer(
-    SerialClientTrainer[FedAvgUplinkPackage, FedAvgDownlinkPackage]
+class FedAvgBaseClientTrainer(
+    BaseClientTrainer[FedAvgUplinkPackage, FedAvgDownlinkPackage]
 ):
     """
-    Serial client trainer for the Federated Averaging (FedAvg) algorithm.
+    Base client trainer for the Federated Averaging (FedAvg) algorithm.
 
     This trainer processes clients sequentially, training and evaluating a local model
     for each client based on the server-provided model parameters.
@@ -291,7 +293,7 @@ class FedAvgSerialClientTrainer(
         lr: float,
     ) -> None:
         """
-        Initialize the FedAvgSerialClientTrainer.
+        Initialize the FedAvgBaseClientTrainer.
 
         Args:
             model_selector (ModelSelector): Selector for initializing the local model.
@@ -462,8 +464,8 @@ class FedAvgDiskSharedData:
     state_path: Path
 
 
-class FedAvgParallelClientTrainer(
-    ParallelClientTrainer[
+class FedAvgProcessPoolClientTrainer(
+    ProcessPoolClientTrainer[
         FedAvgUplinkPackage, FedAvgDownlinkPackage, FedAvgDiskSharedData
     ]
 ):
@@ -573,7 +575,7 @@ class FedAvgParallelClientTrainer(
             cid=data.cid,
             batch_size=data.batch_size,
         )
-        package = FedAvgParallelClientTrainer.train(
+        package = FedAvgProcessPoolClientTrainer.train(
             model=model,
             model_parameters=data.payload.model_parameters,
             train_loader=train_loader,

{blazefl-2.0.0.dev2 → blazefl-2.0.0.dev3}/src/blazefl/core/__init__.py

@@ -6,19 +6,19 @@ including client trainers, model selectors, partitioned datasets, and server han
 """
 
 from blazefl.core.client_trainer import (
-    MultiThreadClientTrainer,
-    ParallelClientTrainer,
-    SerialClientTrainer,
+    BaseClientTrainer,
+    ProcessPoolClientTrainer,
+    ThreadPoolClientTrainer,
 )
 from blazefl.core.model_selector import ModelSelector
 from blazefl.core.partitioned_dataset import PartitionedDataset
-from blazefl.core.server_handler import ServerHandler
+from blazefl.core.server_handler import BaseServerHandler
 
 __all__ = [
-    "SerialClientTrainer",
-    "ParallelClientTrainer",
-    "MultiThreadClientTrainer",
+    "BaseClientTrainer",
+    "ProcessPoolClientTrainer",
+    "ThreadPoolClientTrainer",
     "ModelSelector",
     "PartitionedDataset",
-    "ServerHandler",
+    "BaseServerHandler",
 ]

blazefl-2.0.0.dev3/src/blazefl/core/__init__.pyi

@@ -0,0 +1,6 @@
+from blazefl.core.client_trainer import BaseClientTrainer as BaseClientTrainer, ProcessPoolClientTrainer as ProcessPoolClientTrainer, ThreadPoolClientTrainer as ThreadPoolClientTrainer
+from blazefl.core.model_selector import ModelSelector as ModelSelector
+from blazefl.core.partitioned_dataset import PartitionedDataset as PartitionedDataset
+from blazefl.core.server_handler import BaseServerHandler as BaseServerHandler
+
+__all__ = ['BaseClientTrainer', 'ProcessPoolClientTrainer', 'ThreadPoolClientTrainer', 'ModelSelector', 'PartitionedDataset', 'BaseServerHandler']

{blazefl-2.0.0.dev2 → blazefl-2.0.0.dev3}/src/blazefl/core/client_trainer.py

@@ -12,7 +12,7 @@ UplinkPackage = TypeVar("UplinkPackage")
 DownlinkPackage = TypeVar("DownlinkPackage", contravariant=True)
 
 
-class SerialClientTrainer(Protocol[UplinkPackage, DownlinkPackage]):
+class BaseClientTrainer(Protocol[UplinkPackage, DownlinkPackage]):
     """
     Abstract base class for serial client training in federated learning.
 
@@ -50,7 +50,8 @@ class SerialClientTrainer(Protocol[UplinkPackage, DownlinkPackage]):
 DiskSharedData = TypeVar("DiskSharedData", covariant=True)
 
 
-class ParallelClientTrainer(
+class ProcessPoolClientTrainer(
+    BaseClientTrainer[UplinkPackage, DownlinkPackage],
     Protocol[UplinkPackage, DownlinkPackage, DiskSharedData],
 ):
     """
@@ -74,16 +75,6 @@ class ParallelClientTrainer(
     device_count: int
     cache: list[UplinkPackage]
 
-    def uplink_package(self) -> list[UplinkPackage]:
-        """
-        Prepare the data package to be sent from the client to the server.
-
-        Returns:
-            list[UplinkPackage]: A list of data packages prepared for uplink
-            transmission.
-        """
-        ...
-
     def get_shared_data(self, cid: int, payload: DownlinkPackage) -> DiskSharedData:
         """
         Retrieve shared data for a given client ID and payload.
@@ -159,7 +150,10 @@ class ParallelClientTrainer(
                 self.cache.append(package)
 
 
-class MultiThreadClientTrainer(Protocol[UplinkPackage, DownlinkPackage]):
+class ThreadPoolClientTrainer(
+    BaseClientTrainer[UplinkPackage, DownlinkPackage],
+    Protocol[UplinkPackage, DownlinkPackage],
+):
     num_parallels: int
     device: str
     device_count: int

{blazefl-2.0.0.dev2 → blazefl-2.0.0.dev3}/src/blazefl/core/client_trainer.pyi

@@ -5,25 +5,24 @@ from typing import Protocol, TypeVar
 UplinkPackage = TypeVar('UplinkPackage')
 DownlinkPackage = TypeVar('DownlinkPackage', contravariant=True)
 
-class SerialClientTrainer(Protocol[UplinkPackage, DownlinkPackage]):
+class BaseClientTrainer(Protocol[UplinkPackage, DownlinkPackage]):
     def uplink_package(self) -> list[UplinkPackage]: ...
     def local_process(self, payload: DownlinkPackage, cid_list: list[int]) -> None: ...
 DiskSharedData = TypeVar('DiskSharedData', covariant=True)
 
-class ParallelClientTrainer(Protocol[UplinkPackage, DownlinkPackage, DiskSharedData]):
+class ProcessPoolClientTrainer(BaseClientTrainer[UplinkPackage, DownlinkPackage], Protocol[UplinkPackage, DownlinkPackage, DiskSharedData]):
     num_parallels: int
     share_dir: Path
     device: str
     device_count: int
     cache: list[UplinkPackage]
-    def uplink_package(self) -> list[UplinkPackage]: ...
     def get_shared_data(self, cid: int, payload: DownlinkPackage) -> DiskSharedData: ...
     def get_client_device(self, cid: int) -> str: ...
     @staticmethod
     def process_client(path: Path, device: str) -> Path: ...
     def local_process(self, payload: DownlinkPackage, cid_list: list[int]) -> None: ...
 
-class MultiThreadClientTrainer(Protocol[UplinkPackage, DownlinkPackage]):
+class ThreadPoolClientTrainer(BaseClientTrainer[UplinkPackage, DownlinkPackage], Protocol[UplinkPackage, DownlinkPackage]):
     num_parallels: int
     device: str
     device_count: int

{blazefl-2.0.0.dev2 → blazefl-2.0.0.dev3}/src/blazefl/core/server_handler.py

@@ -4,7 +4,7 @@ UplinkPackage = TypeVar("UplinkPackage")
 DownlinkPackage = TypeVar("DownlinkPackage", covariant=True)
 
 
-class ServerHandler(Protocol[UplinkPackage, DownlinkPackage]):
+class BaseServerHandler(Protocol[UplinkPackage, DownlinkPackage]):
     """
     Abstract base class for server-side operations in federated learning.
 

{blazefl-2.0.0.dev2 → blazefl-2.0.0.dev3}/src/blazefl/core/server_handler.pyi

@@ -3,7 +3,7 @@ from typing import Protocol, TypeVar
 UplinkPackage = TypeVar('UplinkPackage')
 DownlinkPackage = TypeVar('DownlinkPackage', covariant=True)
 
-class ServerHandler(Protocol[UplinkPackage, DownlinkPackage]):
+class BaseServerHandler(Protocol[UplinkPackage, DownlinkPackage]):
     def downlink_package(self) -> DownlinkPackage: ...
     def sample_clients(self) -> list[int]: ...
     def if_stop(self) -> bool: ...

{blazefl-2.0.0.dev2 → blazefl-2.0.0.dev3}/tests/test_contrib/test_fedavg.py

@@ -10,9 +10,9 @@ import torch
 from torch.utils.data import DataLoader, Dataset
 
 from src.blazefl.contrib.fedavg import (
-    FedAvgParallelClientTrainer,
-    FedAvgSerialClientTrainer,
-    FedAvgServerHandler,
+    FedAvgBaseClientTrainer,
+    FedAvgBaseServerHandler,
+    FedAvgProcessPoolClientTrainer,
 )
 from src.blazefl.core import ModelSelector, PartitionedDataset
 
@@ -86,7 +86,7 @@ def tmp_state_dir(tmp_path):
     return state_dir
 
 
-def test_server_and_serial_integration(model_selector, partitioned_dataset, device):
+def test_server_and_base_integration(model_selector, partitioned_dataset, device):
     model_name = "dummy"
     global_round = 1
     num_clients = 3
@@ -95,7 +95,7 @@ def test_server_and_serial_integration(model_selector, partitioned_dataset, devi
     batch_size = 2
     lr = 0.01
 
-    server = FedAvgServerHandler(
+    server = FedAvgBaseServerHandler(
         model_selector=model_selector,
         model_name=model_name,
         dataset=partitioned_dataset,
@@ -106,7 +106,7 @@ def test_server_and_serial_integration(model_selector, partitioned_dataset, devi
         batch_size=batch_size,
     )
 
-    trainer = FedAvgSerialClientTrainer(
+    trainer = FedAvgBaseClientTrainer(
         model_selector=model_selector,
         model_name=model_name,
         dataset=partitioned_dataset,
@@ -133,7 +133,7 @@ def test_server_and_serial_integration(model_selector, partitioned_dataset, devi
     assert server.if_stop() is True
 
 
-def test_server_and_parallel_integration(
+def test_server_and_process_pool_integration(
     model_selector, partitioned_dataset, device, tmp_share_dir, tmp_state_dir
 ):
     model_name = "dummy"
@@ -146,7 +146,7 @@ def test_server_and_parallel_integration(
     seed = 42
     num_parallels = 2
 
-    server = FedAvgServerHandler(
+    server = FedAvgBaseServerHandler(
         model_selector=model_selector,
         model_name=model_name,
         dataset=partitioned_dataset,
@@ -157,7 +157,7 @@ def test_server_and_parallel_integration(
         batch_size=batch_size,
     )
 
-    trainer = FedAvgParallelClientTrainer(
+    trainer = FedAvgProcessPoolClientTrainer(
         model_selector=model_selector,
         model_name=model_name,
         share_dir=tmp_share_dir,
@@ -193,7 +193,7 @@ def run_local_process(trainer, downlink, cids):
         trainer.local_process(downlink, cids)
 
 
-def test_server_and_parallel_integration_keyboard_interrupt(
+def test_server_and_process_pool_integration_keyboard_interrupt(
     model_selector, partitioned_dataset, device, tmp_share_dir, tmp_state_dir
 ):
     model_name = "dummy"
@@ -206,7 +206,7 @@ def test_server_and_parallel_integration_keyboard_interrupt(
     seed = 42
     num_parallels = 10
 
-    server = FedAvgServerHandler(
+    server = FedAvgBaseServerHandler(
         model_selector=model_selector,
         model_name=model_name,
         dataset=partitioned_dataset,
@@ -217,7 +217,7 @@ def test_server_and_parallel_integration_keyboard_interrupt(
         batch_size=batch_size,
     )
 
-    trainer = FedAvgParallelClientTrainer(
+    trainer = FedAvgProcessPoolClientTrainer(
         model_selector=model_selector,
         model_name=model_name,
         share_dir=tmp_share_dir,

{blazefl-2.0.0.dev2 → blazefl-2.0.0.dev3}/tests/test_core/test_client_trainer.py

@@ -4,7 +4,7 @@ from pathlib import Path
 import pytest
 import torch
 
-from src.blazefl.core import ParallelClientTrainer
+from src.blazefl.core import ProcessPoolClientTrainer
 
 
 @dataclass
@@ -24,8 +24,8 @@ class DiskSharedData:
     payload: DownlinkPackage
 
 
-class DummyParallelClientTrainer(
-    ParallelClientTrainer[UplinkPackage, DownlinkPackage, DiskSharedData]
+class DummyProcessPoolClientTrainer(
+    ProcessPoolClientTrainer[UplinkPackage, DownlinkPackage, DiskSharedData]
 ):
     def __init__(self, num_parallels: int, share_dir: Path, device: str):
         self.num_parallels = num_parallels
@@ -58,10 +58,10 @@ class DummyParallelClientTrainer(
 
 @pytest.mark.parametrize("num_parallels", [1, 2, 4])
 @pytest.mark.parametrize("cid_list", [[], [42], [0, 1, 2]])
-def test_parallel_client_trainer(
+def test_process_pool_client_trainer(
     tmp_path: Path, num_parallels: int, cid_list: list[int]
 ) -> None:
-    trainer = DummyParallelClientTrainer(
+    trainer = DummyProcessPoolClientTrainer(
         num_parallels=num_parallels, share_dir=tmp_path, device="cpu"
     )
 

{blazefl-2.0.0.dev2 → blazefl-2.0.0.dev3}/uv.lock

@@ -82,7 +82,7 @@ wheels = [
 
 [[package]]
 name = "blazefl"
-version = "2.0.0.dev2"
+version = "2.0.0.dev3"
 source = { editable = "." }
 dependencies = [
     { name = "numpy" },

blazefl-2.0.0.dev2/examples/experimental-freethreaded/core/__init__.py

@@ -1,5 +0,0 @@
-from core.client_trainer import MultiThreadClientTrainer
-
-__all__ = [
-    "MultiThreadClientTrainer",
-]

blazefl-2.0.0.dev2/examples/experimental-freethreaded/core/client_trainer.py

@@ -1,45 +0,0 @@
-from concurrent.futures import ThreadPoolExecutor, as_completed
-from typing import Protocol, TypeVar
-
-from tqdm import tqdm
-
-UplinkPackage = TypeVar("UplinkPackage")
-DownlinkPackage = TypeVar("DownlinkPackage", contravariant=True)
-
-
-class MultiThreadClientTrainer(Protocol[UplinkPackage, DownlinkPackage]):
-    num_parallels: int
-    device: str
-    device_count: int
-    cache: list[UplinkPackage]
-
-    def process_client(
-        self,
-        cid: int,
-        device: str,
-        payload: DownlinkPackage,
-    ) -> UplinkPackage: ...
-
-    def get_client_device(self, cid: int) -> str:
-        if self.device == "cuda":
-            return f"cuda:{cid % self.device_count}"
-        return self.device
-
-    def local_process(self, payload: DownlinkPackage, cid_list: list[int]) -> None:
-        with ThreadPoolExecutor(max_workers=self.num_parallels) as executor:
-            futures = []
-            for cid in cid_list:
-                device = self.get_client_device(cid)
-                future = executor.submit(
-                    self.process_client,
-                    cid,
-                    device,
-                    payload,
-                )
-                futures.append(future)
-
-            for future in tqdm(
-                as_completed(futures), total=len(futures), desc="Client", leave=False
-            ):
-                result = future.result()
-                self.cache.append(result)

blazefl-2.0.0.dev2/examples/step-by-step-dsfl/algorithm/__init__.py

@@ -1,3 +0,0 @@
-from algorithm.dsfl import DSFLParallelClientTrainer, DSFLServerHandler
-
-__all__ = ["DSFLServerHandler", "DSFLParallelClientTrainer"]

blazefl-2.0.0.dev2/src/blazefl/core/__init__.pyi

@@ -1,6 +0,0 @@
-from blazefl.core.client_trainer import MultiThreadClientTrainer as MultiThreadClientTrainer, ParallelClientTrainer as ParallelClientTrainer, SerialClientTrainer as SerialClientTrainer
-from blazefl.core.model_selector import ModelSelector as ModelSelector
-from blazefl.core.partitioned_dataset import PartitionedDataset as PartitionedDataset
-from blazefl.core.server_handler import ServerHandler as ServerHandler
-
-__all__ = ['SerialClientTrainer', 'ParallelClientTrainer', 'MultiThreadClientTrainer', 'ModelSelector', 'PartitionedDataset', 'ServerHandler']