flwr-nightly 1.12.0.dev20240915__tar.gz → 1.12.0.dev20240917__tar.gz

{flwr_nightly-1.12.0.dev20240915 → flwr_nightly-1.12.0.dev20240917}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: flwr-nightly
-Version: 1.12.0.dev20240915
+Version: 1.12.0.dev20240917
 Summary: Flower: A Friendly Federated Learning Framework
 Home-page: https://flower.ai
 License: Apache-2.0

{flwr_nightly-1.12.0.dev20240915 → flwr_nightly-1.12.0.dev20240917}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "poetry.core.masonry.api"
 
 [tool.poetry]
 name = "flwr-nightly"
-version = "1.12.0.dev20240915"
+version = "1.12.0.dev20240917"
 description = "Flower: A Friendly Federated Learning Framework"
 license = "Apache-2.0"
 authors = ["The Flower Authors <hello@flower.ai>"]
@@ -136,6 +136,7 @@ PyGithub = "==2.1.1"
 licensecheck = "==2024"
 pre-commit = "==3.5.0"
 sphinx-substitution-extensions = "2022.02.16"
+sphinxext-opengraph = "==0.9.1"
 
 [tool.isort]
 profile = "black"

{flwr_nightly-1.12.0.dev20240915 → flwr_nightly-1.12.0.dev20240917}/src/py/flwr/cli/new/templates/app/code/flwr_tune/client_app.py.tpl

@@ -2,7 +2,6 @@
 
 import os
 import warnings
-from collections import OrderedDict
 from typing import Dict, Tuple
 
 import torch
@@ -11,7 +10,7 @@ from flwr.common import Context
 from flwr.common.config import unflatten_dict
 from flwr.common.typing import NDArrays, Scalar
 from omegaconf import DictConfig
-from peft import get_peft_model_state_dict, set_peft_model_state_dict
+
 from transformers import TrainingArguments
 from trl import SFTTrainer
 
@@ -20,7 +19,12 @@ from $import_name.dataset import (
     load_data,
     replace_keys,
 )
-from $import_name.models import cosine_annealing, get_model
+from $import_name.models import (
+    cosine_annealing,
+    get_model,
+    set_parameters,
+    get_parameters,
+)
 
 # Avoid warnings
 os.environ["TOKENIZERS_PARALLELISM"] = "true"
@@ -92,20 +96,6 @@ class FlowerClient(NumPyClient):
         )
 
 
-def set_parameters(model, parameters: NDArrays) -> None:
-    """Change the parameters of the model using the given ones."""
-    peft_state_dict_keys = get_peft_model_state_dict(model).keys()
-    params_dict = zip(peft_state_dict_keys, parameters)
-    state_dict = OrderedDict({k: torch.Tensor(v) for k, v in params_dict})
-    set_peft_model_state_dict(model, state_dict)
-
-
-def get_parameters(model) -> NDArrays:
-    """Return the parameters of the current net."""
-    state_dict = get_peft_model_state_dict(model)
-    return [val.cpu().numpy() for _, val in state_dict.items()]
-
-
 def client_fn(context: Context) -> FlowerClient:
     """Create a Flower client representing a single organization."""
     partition_id = context.node_config["partition-id"]

{flwr_nightly-1.12.0.dev20240915 → flwr_nightly-1.12.0.dev20240917}/src/py/flwr/cli/new/templates/app/code/flwr_tune/models.py.tpl

@@ -4,10 +4,18 @@ import math
 
 import torch
 from omegaconf import DictConfig
-from peft import LoraConfig, get_peft_model
+from collections import OrderedDict
+from peft import (
+    LoraConfig,
+    get_peft_model,
+    get_peft_model_state_dict,
+    set_peft_model_state_dict,
+)
 from peft.utils import prepare_model_for_kbit_training
 from transformers import AutoModelForCausalLM, BitsAndBytesConfig
 
+from flwr.common.typing import NDArrays
+
 
 def cosine_annealing(
     current_round: int,
@@ -54,3 +62,17 @@ def get_model(model_cfg: DictConfig):
         model.config.use_cache = False
 
     return get_peft_model(model, peft_config)
+
+
+def set_parameters(model, parameters: NDArrays) -> None:
+    """Change the parameters of the model using the given ones."""
+    peft_state_dict_keys = get_peft_model_state_dict(model).keys()
+    params_dict = zip(peft_state_dict_keys, parameters)
+    state_dict = OrderedDict({k: torch.Tensor(v) for k, v in params_dict})
+    set_peft_model_state_dict(model, state_dict)
+
+
+def get_parameters(model) -> NDArrays:
+    """Return the parameters of the current net."""
+    state_dict = get_peft_model_state_dict(model)
+    return [val.cpu().numpy() for _, val in state_dict.items()]

{flwr_nightly-1.12.0.dev20240915 → flwr_nightly-1.12.0.dev20240917}/src/py/flwr/cli/new/templates/app/code/flwr_tune/server_app.py.tpl

@@ -8,8 +8,7 @@ from flwr.common.config import unflatten_dict
 from flwr.server import ServerApp, ServerAppComponents, ServerConfig
 from omegaconf import DictConfig
 
-from $import_name.client_app import get_parameters, set_parameters
-from $import_name.models import get_model
+from $import_name.models import get_model, get_parameters, set_parameters
 from $import_name.dataset import replace_keys
 from $import_name.strategy import FlowerTuneLlm
 

{flwr_nightly-1.12.0.dev20240915 → flwr_nightly-1.12.0.dev20240917}/src/py/flwr/cli/new/templates/app/pyproject.flowertune.toml.tpl

@@ -8,7 +8,7 @@ version = "1.0.0"
 description = ""
 license = "Apache-2.0"
 dependencies = [
-    "flwr[simulation]>=1.10.0",
+    "flwr[simulation]>=1.11.1",
     "flwr-datasets>=0.3.0",
     "trl==0.8.1",
     "bitsandbytes==0.43.0",