Merge branch 'main' into fix-superlink-mem-issue

adap · Feb 17, 2025 · c917839 · c917839
2 parents 1d0cd13 + 47af5ba
commit c917839
Show file tree

Hide file tree

Showing 20 changed files with 33 additions and 33 deletions.
diff --git a/baselines/docs/source/conf.py b/baselines/docs/source/conf.py
@@ -37,7 +37,7 @@
 author = "The Flower Authors"
 
 # The full version, including alpha/beta/rc tags
-release = "1.16.0"
+release = "1.15.2"
 
 
 # -- General configuration ---------------------------------------------------

diff --git a/baselines/fedpft/pyproject.toml b/baselines/fedpft/pyproject.toml
@@ -44,7 +44,7 @@ torch = {url = "https://download.pytorch.org/whl/cu117/torch-1.13.0%2Bcu117-cp31
 scikit-learn = "1.5.0"
 flwr-datasets = "0.1.0"
 torchvision = {url = "https://download.pytorch.org/whl/cu117/torchvision-0.14.0%2Bcu117-cp310-cp310-linux_x86_64.whl"}
-transformers = "4.39.3"
+transformers = "4.48.0"
 datasets = "2.18.0"
 
 [tool.poetry.dev-dependencies]

diff --git a/baselines/fedwav2vec2/pyproject.toml b/baselines/fedwav2vec2/pyproject.toml
@@ -44,7 +44,7 @@ speechbrain = "0.5.15"
 pandas = "2.1.1"
 torch = { url = "https://download.pytorch.org/whl/cu116/torch-1.13.1%2Bcu116-cp310-cp310-linux_x86_64.whl" }
 torchaudio = { url = "https://download.pytorch.org/whl/cu116/torchaudio-0.13.1%2Bcu116-cp310-cp310-linux_x86_64.whl" }
-transformers = "4.38.0"
+transformers = "4.48.0"
 
 [tool.poetry.dev-dependencies]
 isort = "==5.13.2"

diff --git a/examples/docs/source/conf.py b/examples/docs/source/conf.py
@@ -29,7 +29,7 @@
 author = "The Flower Authors"
 
 # The full version, including alpha/beta/rc tags
-release = "1.16.0"
+release = "1.15.2"
 
 
 # -- General configuration ---------------------------------------------------

diff --git a/examples/flowertune-llm/pyproject.toml b/examples/flowertune-llm/pyproject.toml
@@ -16,7 +16,7 @@ dependencies = [
     "scipy==1.13.0",
     "peft==0.6.2",
     "fschat[model_worker,webui]==0.2.35",
-    "transformers==4.47.0",
+    "transformers==4.48.0",
     "sentencepiece==0.2.0",
     "omegaconf==2.3.0",
     "hf_transfer==0.1.8",

diff --git a/examples/whisper-federated-finetuning/pyproject.toml b/examples/whisper-federated-finetuning/pyproject.toml
@@ -10,7 +10,7 @@ license = "Apache-2.0"
 dependencies = [
     "flwr[simulation]>=1.15.1",
     "flwr-datasets[audio]>=0.5.0",
-    "transformers==4.44.2",
+    "transformers==4.48.0",
     "torch==2.5.1",
 ]
 

diff --git a/framework/docs/source/conf.py b/framework/docs/source/conf.py
@@ -89,7 +89,7 @@
 author = "The Flower Authors"
 
 # The full version of the next release, including alpha/beta/rc tags
-release = "1.16.0"
+release = "1.15.2"
 # The current released version
 rst_prolog = """
 .. |stable_flwr_version| replace:: 1.15.1

diff --git a/pyproject.toml b/pyproject.toml
@@ -4,7 +4,7 @@ build-backend = "poetry.core.masonry.api"
 
 [tool.poetry]
 name = "flwr"
-version = "1.16.0"
+version = "1.15.2"
 description = "Flower: A Friendly Federated AI Framework"
 license = "Apache-2.0"
 authors = ["The Flower Authors <[email protected]>"]

diff --git a/src/docker/complete/compose.yml b/src/docker/complete/compose.yml
@@ -1,7 +1,7 @@
 services:
   # create a SuperLink service
   superlink:
-    image: flwr/superlink:${FLWR_VERSION:-1.16.0}
+    image: flwr/superlink:${FLWR_VERSION:-1.15.2}
     command:
       - --insecure
       - --isolation
@@ -14,7 +14,7 @@ services:
     build:
       context: ${PROJECT_DIR:-.}
       dockerfile_inline: |
-        FROM flwr/serverapp:${FLWR_VERSION:-1.16.0}
+        FROM flwr/serverapp:${FLWR_VERSION:-1.15.2}
 
         # gcc is required for the fastai quickstart example
         USER root
@@ -40,7 +40,7 @@ services:
 
   # create two SuperNode services with different node configs
   supernode-1:
-    image: flwr/supernode:${FLWR_VERSION:-1.16.0}
+    image: flwr/supernode:${FLWR_VERSION:-1.15.2}
     command:
       - --insecure
       - --superlink
@@ -55,7 +55,7 @@ services:
       - superlink
 
   supernode-2:
-    image: flwr/supernode:${FLWR_VERSION:-1.16.0}
+    image: flwr/supernode:${FLWR_VERSION:-1.15.2}
     command:
       - --insecure
       - --superlink
@@ -72,7 +72,7 @@ services:
   # uncomment to add another SuperNode
   #
   # supernode-3:
-  #   image: flwr/supernode:${FLWR_VERSION:-1.16.0}
+  #   image: flwr/supernode:${FLWR_VERSION:-1.15.2}
   #   command:
   #     - --insecure
   #     - --superlink
@@ -91,7 +91,7 @@ services:
     build:
       context: ${PROJECT_DIR:-.}
       dockerfile_inline: |
-        FROM flwr/clientapp:${FLWR_VERSION:-1.16.0}
+        FROM flwr/clientapp:${FLWR_VERSION:-1.15.2}
 
         # gcc is required for the fastai quickstart example
         USER root
@@ -123,7 +123,7 @@ services:
     build:
       context: ${PROJECT_DIR:-.}
       dockerfile_inline: |
-        FROM flwr/clientapp:${FLWR_VERSION:-1.16.0}
+        FROM flwr/clientapp:${FLWR_VERSION:-1.15.2}
 
         # gcc is required for the fastai quickstart example
         USER root
@@ -156,7 +156,7 @@ services:
   #   build:
   #     context: ${PROJECT_DIR:-.}
   #     dockerfile_inline: |
-  #       FROM flwr/clientapp:${FLWR_VERSION:-1.16.0}
+  #       FROM flwr/clientapp:${FLWR_VERSION:-1.15.2}
 
   #       # gcc is required for the fastai quickstart example
   #       USER root

diff --git a/src/docker/distributed/client/compose.yml b/src/docker/distributed/client/compose.yml
@@ -1,6 +1,6 @@
 services:
   supernode-1:
-    image: flwr/supernode:${FLWR_VERSION:-1.16.0}
+    image: flwr/supernode:${FLWR_VERSION:-1.15.2}
     command:
       - --superlink
       - ${SUPERLINK_IP:-127.0.0.1}:9092
@@ -17,7 +17,7 @@ services:
         target: /app/certificates/superlink-ca.crt
 
   supernode-2:
-    image: flwr/supernode:${FLWR_VERSION:-1.16.0}
+    image: flwr/supernode:${FLWR_VERSION:-1.15.2}
     command:
       - --superlink
       - ${SUPERLINK_IP:-127.0.0.1}:9092
@@ -36,7 +36,7 @@ services:
   # uncomment to add another SuperNode
   #
   # supernode-3:
-  #   image: flwr/supernode:${FLWR_VERSION:-1.16.0}
+  #   image: flwr/supernode:${FLWR_VERSION:-1.15.2}
   #   command:
   #     - --superlink
   #     - ${SUPERLINK_IP:-127.0.0.1}:9092
@@ -56,7 +56,7 @@ services:
     build:
       context: ${PROJECT_DIR:-.}
       dockerfile_inline: |
-        FROM flwr/clientapp:${FLWR_VERSION:-1.16.0}
+        FROM flwr/clientapp:${FLWR_VERSION:-1.15.2}
 
         WORKDIR /app
         COPY --chown=app:app pyproject.toml .
@@ -80,7 +80,7 @@ services:
     build:
       context: ${PROJECT_DIR:-.}
       dockerfile_inline: |
-        FROM flwr/clientapp:${FLWR_VERSION:-1.16.0}
+        FROM flwr/clientapp:${FLWR_VERSION:-1.15.2}
 
         WORKDIR /app
         COPY --chown=app:app pyproject.toml .
@@ -105,7 +105,7 @@ services:
   #   build:
   #     context: ${PROJECT_DIR:-.}
   #     dockerfile_inline: |
-  #       FROM flwr/clientapp:${FLWR_VERSION:-1.16.0}
+  #       FROM flwr/clientapp:${FLWR_VERSION:-1.15.2}
 
   #       WORKDIR /app
   #       COPY --chown=app:app pyproject.toml .

diff --git a/src/docker/distributed/server/compose.yml b/src/docker/distributed/server/compose.yml
@@ -1,6 +1,6 @@
 services:
   superlink:
-    image: flwr/superlink:${FLWR_VERSION:-1.16.0}
+    image: flwr/superlink:${FLWR_VERSION:-1.15.2}
     command:
       - --isolation
       - process
@@ -25,7 +25,7 @@ services:
     build:
       context: ${PROJECT_DIR:-.}
       dockerfile_inline: |
-        FROM flwr/serverapp:${FLWR_VERSION:-1.16.0}
+        FROM flwr/serverapp:${FLWR_VERSION:-1.15.2}
 
         WORKDIR /app
         COPY --chown=app:app pyproject.toml .

diff --git a/src/py/flwr/cli/new/templates/app/pyproject.baseline.toml.tpl b/src/py/flwr/cli/new/templates/app/pyproject.baseline.toml.tpl
@@ -8,7 +8,7 @@ version = "1.0.0"
 description = ""
 license = "Apache-2.0"
 dependencies = [
-    "flwr[simulation]>=1.16.0",
+    "flwr[simulation]>=1.15.2",
     "flwr-datasets[vision]>=0.5.0",
     "torch==2.5.1",
     "torchvision==0.20.1",

diff --git a/src/py/flwr/cli/new/templates/app/pyproject.flowertune.toml.tpl b/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.16.0",
+    "flwr[simulation]>=1.15.2",
     "flwr-datasets>=0.5.0",
     "torch==2.3.1",
     "trl==0.8.1",

diff --git a/src/py/flwr/cli/new/templates/app/pyproject.huggingface.toml.tpl b/src/py/flwr/cli/new/templates/app/pyproject.huggingface.toml.tpl
@@ -8,7 +8,7 @@ version = "1.0.0"
 description = ""
 license = "Apache-2.0"
 dependencies = [
-    "flwr[simulation]>=1.16.0",
+    "flwr[simulation]>=1.15.2",
     "flwr-datasets>=0.5.0",
     "torch==2.5.1",
     "transformers>=4.30.0,<5.0",

diff --git a/src/py/flwr/cli/new/templates/app/pyproject.jax.toml.tpl b/src/py/flwr/cli/new/templates/app/pyproject.jax.toml.tpl
@@ -8,7 +8,7 @@ version = "1.0.0"
 description = ""
 license = "Apache-2.0"
 dependencies = [
-    "flwr[simulation]>=1.16.0",
+    "flwr[simulation]>=1.15.2",
     "jax==0.4.30",
     "jaxlib==0.4.30",
     "scikit-learn==1.6.1",

diff --git a/src/py/flwr/cli/new/templates/app/pyproject.mlx.toml.tpl b/src/py/flwr/cli/new/templates/app/pyproject.mlx.toml.tpl
@@ -8,7 +8,7 @@ version = "1.0.0"
 description = ""
 license = "Apache-2.0"
 dependencies = [
-    "flwr[simulation]>=1.16.0",
+    "flwr[simulation]>=1.15.2",
     "flwr-datasets[vision]>=0.5.0",
     "mlx==0.21.1",
 ]

diff --git a/src/py/flwr/cli/new/templates/app/pyproject.numpy.toml.tpl b/src/py/flwr/cli/new/templates/app/pyproject.numpy.toml.tpl
@@ -8,7 +8,7 @@ version = "1.0.0"
 description = ""
 license = "Apache-2.0"
 dependencies = [
-    "flwr[simulation]>=1.16.0",
+    "flwr[simulation]>=1.15.2",
     "numpy>=2.0.2",
 ]
 

diff --git a/src/py/flwr/cli/new/templates/app/pyproject.pytorch.toml.tpl b/src/py/flwr/cli/new/templates/app/pyproject.pytorch.toml.tpl
@@ -8,7 +8,7 @@ version = "1.0.0"
 description = ""
 license = "Apache-2.0"
 dependencies = [
-    "flwr[simulation]>=1.16.0",
+    "flwr[simulation]>=1.15.2",
     "flwr-datasets[vision]>=0.5.0",
     "torch==2.5.1",
     "torchvision==0.20.1",

diff --git a/src/py/flwr/cli/new/templates/app/pyproject.sklearn.toml.tpl b/src/py/flwr/cli/new/templates/app/pyproject.sklearn.toml.tpl
@@ -8,7 +8,7 @@ version = "1.0.0"
 description = ""
 license = "Apache-2.0"
 dependencies = [
-    "flwr[simulation]>=1.16.0",
+    "flwr[simulation]>=1.15.2",
     "flwr-datasets[vision]>=0.5.0",
     "scikit-learn>=1.6.1",
 ]

diff --git a/src/py/flwr/cli/new/templates/app/pyproject.tensorflow.toml.tpl b/src/py/flwr/cli/new/templates/app/pyproject.tensorflow.toml.tpl
@@ -8,7 +8,7 @@ version = "1.0.0"
 description = ""
 license = "Apache-2.0"
 dependencies = [
-    "flwr[simulation]>=1.16.0",
+    "flwr[simulation]>=1.15.2",
     "flwr-datasets[vision]>=0.5.0",
     "tensorflow>=2.11.1,<2.18.0",
 ]