Merge branch 'adap:main' into main

adap · Feb 17, 2025 · 099b49e · 099b49e
2 parents efd5f6a + b3acc5b
commit 099b49e
Show file tree

Hide file tree

Showing 58 changed files with 168 additions and 96 deletions.
diff --git a/.github/workflows/_docker-build.yml b/.github/workflows/_docker-build.yml
@@ -84,7 +84,7 @@ jobs:
           images: ${{ inputs.namespace-repository }}
 
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@6524bf65af31da8d45b59e8c27de4bd072b392f5 # v3.8.0
+        uses: docker/setup-buildx-action@f7ce87c1d6bead3e36075b2ce75da1f6cc28aaca # v3.9.0
 
       - name: Login to Docker Hub
         uses: docker/login-action@9780b0c442fbb1117ed29e0efdff1e18412f7567 # v3.3.0
@@ -145,7 +145,7 @@ jobs:
           tags: ${{ inputs.tags }}
 
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@6524bf65af31da8d45b59e8c27de4bd072b392f5 # v3.8.0
+        uses: docker/setup-buildx-action@f7ce87c1d6bead3e36075b2ce75da1f6cc28aaca # v3.9.0
 
       - name: Login to Docker Hub
         uses: docker/login-action@9780b0c442fbb1117ed29e0efdff1e18412f7567 # v3.3.0

diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml
@@ -399,3 +399,27 @@ jobs:
           ${{ matrix.engine }} 
         working-directory: e2e/${{ matrix.directory }}
         run: ./../test_exec_api.sh "${{ matrix.connection }}" "${{ matrix.authentication}}" "${{ matrix.engine }}"
+
+  windows-compatibility:
+    runs-on: windows-latest
+    env:
+      PYTHONIOENCODING: utf-8
+    timeout-minutes: 10
+    needs: wheel
+
+    name: Windows compatibility test
+
+    steps:
+      - uses: actions/checkout@v4
+      - name: Set up Python
+        uses: actions/setup-python@v5
+        with:
+          python-version: 3.9
+      - name: Install build tools
+        run: python -m pip install -U pip==23.3.1
+      - name: Install dependencies
+        run: python -m pip install --upgrade .
+      - name: Run test
+        working-directory: ./e2e
+        run: ./test_windows.sh
+        shell: bash
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/e2e/test_windows.sh b/e2e/test_windows.sh
@@ -0,0 +1,56 @@
+#!/usr/bin/env bash
+
+# Create and install Flower app
+flwr new e2e-tmp-test --framework numpy --username flwrlabs
+cd e2e-tmp-test
+
+# Modify the config file
+echo -e $"\n[tool.flwr.federations.e2e]\naddress = \"127.0.0.1:9093\"\ninsecure = true" >> pyproject.toml
+
+# Start Flower processes in the background
+flower-superlink --insecure 2>&1 | tee flwr_output.log &
+sleep 2
+
+flower-supernode --insecure --superlink 127.0.0.1:9092 \
+    --clientappio-api-address localhost:9094 \
+    --max-retries 0 &
+cl1_pid=$!
+sleep 2
+
+flower-supernode --insecure --superlink 127.0.0.1:9092 \
+    --clientappio-api-address localhost:9095 \
+    --max-retries 0 &
+sleep 2
+
+flwr run --run-config num-server-rounds=1 . e2e
+
+# Trap to clean up on exit
+cleanup() {
+    echo "Stopping Flower processes..."
+    taskkill //F //FI "IMAGENAME eq flower*" //T
+}
+trap cleanup EXIT
+
+# Initialize a flag to track if training is successful
+found_success=false
+timeout=120  # Timeout after 120 seconds
+elapsed=0
+
+# Check for "Run finished" in a loop with a timeout
+while [ "$found_success" = false ] && [ $elapsed -lt $timeout ]; do
+    if grep -q "Run finished" flwr_output.log; then
+        echo "Training worked correctly!"
+        found_success=true
+        exit 0;
+    else
+        echo "Waiting for training ... ($elapsed seconds elapsed)"
+    fi
+    # Sleep for a short period and increment the elapsed time
+    sleep 2
+    elapsed=$((elapsed + 2))
+done
+
+if [ "$found_success" = false ]; then
+    echo "Training did not finish within timeout."
+    exit 1;
+fi
diff --git a/examples/advanced-pytorch/pyproject.toml b/examples/advanced-pytorch/pyproject.toml
@@ -8,7 +8,7 @@ version = "1.0.0"
 description = "Federated Learning with PyTorch and Flower (Advanced Example)"
 license = "Apache-2.0"
 dependencies = [
-    "flwr[simulation]>=1.15.1",
+    "flwr[simulation]>=1.15.2",
     "flwr-datasets[vision]>=0.5.0",
     "torch==2.5.1",
     "torchvision==0.20.1",

diff --git a/examples/advanced-tensorflow/pyproject.toml b/examples/advanced-tensorflow/pyproject.toml
@@ -8,7 +8,7 @@ version = "1.0.0"
 description = "Federated Learning with Tensorflow/Keras and Flower (Advanced Example)"
 license = "Apache-2.0"
 dependencies = [
-    "flwr[simulation]>=1.15.1",
+    "flwr[simulation]>=1.15.2",
     "flwr-datasets[vision]>=0.5.0",
     "tensorflow-cpu>=2.9.1, != 2.11.1 ; platform_machine == \"x86_64\"",
     "tensorflow-macos>=2.9.1, != 2.11.1 ; sys_platform == \"darwin\" and platform_machine == \"arm64\"",

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

diff --git a/examples/custom-metrics/pyproject.toml b/examples/custom-metrics/pyproject.toml
@@ -12,7 +12,7 @@ version = "1.0.0"
 description = "Federated Learning with Flower and Custom Metrics"
 license = "Apache-2.0"
 dependencies = [
-    "flwr[simulation]>=1.15.1",
+    "flwr[simulation]>=1.15.2",
     "flwr-datasets[vision]>=0.5.0",
     "scikit-learn>=1.6.0",
     "tensorflow>=2.12.1; (platform_machine == \"x86_64\" or platform_machine == \"aarch64\")",

diff --git a/examples/embedded-devices/pyproject.toml b/examples/embedded-devices/pyproject.toml
@@ -8,7 +8,7 @@ version = "1.0.0"
 description = "Federated AI with Embedded Devices using Flower"
 license = "Apache-2.0"
 dependencies = [
-    "flwr>=1.15.0",
+    "flwr>=1.15.2",
     "flwr-datasets[vision]>=0.5.0",
     "torch==2.5.1",
     "torchvision==0.20.1",

diff --git a/examples/federated-kaplan-meier-fitter/pyproject.toml b/examples/federated-kaplan-meier-fitter/pyproject.toml
@@ -8,7 +8,7 @@ version = "1.0.0"
 description = "Federated Kaplan Meier Fitter with Flower"
 license = "Apache-2.0"
 dependencies = [
-    "flwr[simulation]>=1.15.1",
+    "flwr[simulation]>=1.15.2",
     "flwr-datasets>=0.5.0",
     "numpy>=1.23.2",
     "pandas>=2.0.0",

diff --git a/examples/fl-dp-sa/pyproject.toml b/examples/fl-dp-sa/pyproject.toml
@@ -8,7 +8,7 @@ version = "1.0.0"
 description = "Central Differential Privacy and Secure Aggregation in Flower"
 license = "Apache-2.0"
 dependencies = [
-    "flwr[simulation]>=1.15.1",
+    "flwr[simulation]>=1.15.2",
     "flwr-datasets[vision]>=0.5.0",
     "torch==2.5.1",
     "torchvision==0.20.1",

diff --git a/examples/fl-tabular/pyproject.toml b/examples/fl-tabular/pyproject.toml
@@ -8,7 +8,7 @@ version = "1.0.0"
 description = "Adult Census Income Tabular Dataset and Federated Learning in Flower"
 license = "Apache-2.0"
 dependencies = [
-    "flwr[simulation]>=1.15.1",
+    "flwr[simulation]>=1.15.2",
     "flwr-datasets>=0.5.0",
     "torch==2.5.1",
     "scikit-learn==1.6.1",

diff --git a/examples/flower-authentication/pyproject.toml b/examples/flower-authentication/pyproject.toml
@@ -8,7 +8,7 @@ version = "1.0.0"
 description = "Federated Learning with PyTorch and authenticated Flower "
 license = "Apache-2.0"
 dependencies = [
-    "flwr>=1.15.0",
+    "flwr>=2",
     "flwr-datasets[vision]>=0.5.0",
     "torch>=2.5.0,<3.0.0",
     "torchvision>=0.20.1,<0.21.0",

diff --git a/examples/flower-secure-aggregation/pyproject.toml b/examples/flower-secure-aggregation/pyproject.toml
@@ -8,7 +8,7 @@ version = "1.0.0"
 description = "Secure Aggregation in Flower"
 license = "Apache-2.0"
 dependencies = [
-    "flwr[simulation]>=1.15.1",
+    "flwr[simulation]>=1.15.2",
     "flwr-datasets[vision]>=0.5.0",
     "torch==2.5.1",
     "torchvision==0.20.1",

diff --git a/examples/flower-simulation-step-by-step-pytorch/my-awesome-app/pyproject.toml b/examples/flower-simulation-step-by-step-pytorch/my-awesome-app/pyproject.toml
@@ -8,7 +8,7 @@ version = "1.0.0"
 description = ""
 license = "Apache-2.0"
 dependencies = [
-    "flwr[simulation]>=1.15.0",
+    "flwr[simulation]>=1.15.2",
     "flwr-datasets[vision]>=0.5.0",
     "torch==2.5.1",
     "torchvision==0.20.1",

diff --git a/examples/flowertune-llm/pyproject.toml b/examples/flowertune-llm/pyproject.toml
@@ -8,15 +8,15 @@ version = "1.0.0"
 description = "FlowerTune LLM: Federated LLM Fine-tuning with Flower"
 license = "Apache-2.0"
 dependencies = [
-    "flwr[simulation]==1.15.0",
+    "flwr[simulation]==1.15.2",
     "flwr-datasets>=0.5.0",
     "torch==2.3.1",
     "trl==0.8.1",
     "bitsandbytes==0.45.0",
     "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/flowertune-vit/pyproject.toml b/examples/flowertune-vit/pyproject.toml
@@ -8,7 +8,7 @@ version = "1.0.0"
 description = "Federated Finetuning of a Vision Transformer with Flower"
 license = "Apache-2.0"
 dependencies = [
-    "flwr[simulation]>=1.15.1",
+    "flwr[simulation]>=1.15.2",
     "flwr-datasets[vision]>=0.5.0",
     "torch==2.5.1",
     "torchvision==0.20.1",

diff --git a/examples/opacus/pyproject.toml b/examples/opacus/pyproject.toml
@@ -8,7 +8,7 @@ version = "1.0.0"
 description = "Sample-level Differential Privacy with Opacus in Flower"
 
 dependencies = [
-    "flwr[simulation]>=1.15.1",
+    "flwr[simulation]>=1.15.2",
     "flwr-datasets[vision]>=0.5.0",
     "torch==2.5.1",
     "torchvision==0.20.1",

diff --git a/examples/pytorch-federated-variational-autoencoder/pyproject.toml b/examples/pytorch-federated-variational-autoencoder/pyproject.toml
@@ -8,7 +8,7 @@ version = "1.0.0"
 description = "Federated Variational Autoencoder Example with PyTorch and Flower"
 license = "Apache-2.0"
 dependencies = [
-    "flwr[simulation]>=1.15.1",
+    "flwr[simulation]>=1.15.2",
     "flwr-datasets[vision]>=0.5.0",
     "torch==2.5.1",
     "torchvision==0.20.1",

diff --git a/examples/quickstart-fastai/pyproject.toml b/examples/quickstart-fastai/pyproject.toml
@@ -8,7 +8,7 @@ version = "1.0.0"
 description = "Federated Learning with Fastai and Flower (Quickstart Example)"
 license = "Apache-2.0"
 dependencies = [
-    "flwr[simulation]>=1.15.1",
+    "flwr[simulation]>=1.15.2",
     "flwr-datasets[vision]>=0.5.0",
     "fastai==2.7.18",
     "torch==2.5.1",

diff --git a/examples/quickstart-huggingface/pyproject.toml b/examples/quickstart-huggingface/pyproject.toml
@@ -12,7 +12,7 @@ authors = [
     { name = "Kaushik Amar Das", email = "[email protected]" },
 ]
 dependencies = [
-    "flwr[simulation]>=1.15.1",
+    "flwr[simulation]>=1.15.2",
     "flwr-datasets>=0.5.0",
     "torch==2.4.0",
     "transformers>=4.30.0,<5.0",

diff --git a/examples/quickstart-jax/pyproject.toml b/examples/quickstart-jax/pyproject.toml
@@ -8,7 +8,7 @@ version = "1.0.0"
 description = ""
 license = "Apache-2.0"
 dependencies = [
-    "flwr[simulation]>=1.15.1",
+    "flwr[simulation]>=1.15.2",
     "flwr-datasets[vision]>=0.5.0",
     "datasets>=2.21.0",
     "jax==0.4.31",

diff --git a/examples/quickstart-lerobot/pyproject.toml b/examples/quickstart-lerobot/pyproject.toml
@@ -16,7 +16,7 @@ authors = [
 ]
 
 dependencies = [
-    "flwr[simulation]==1.15.0",
+    "flwr[simulation]==1.15.2",
     "transformers>=4.30.0,<5.0",
     "lerobot[pusht] @ git+https://github.com/huggingface/lerobot.git@96c7052777aca85d4e55dfba8f81586103ba8f61",
     "flwr-datasets>=0.5.0",

diff --git a/examples/quickstart-mlx/pyproject.toml b/examples/quickstart-mlx/pyproject.toml
@@ -8,7 +8,7 @@ version = "1.0.0"
 description = "Federated Learning with MLX and Flower (Quickstart Example)"
 license = "Apache-2.0"
 dependencies = [
-    "flwr[simulation]>=1.15.1",
+    "flwr[simulation]>=1.15.2",
     "flwr-datasets[vision]>=0.5.0",
     "mlx==0.21.1",
 ]

diff --git a/examples/quickstart-monai/pyproject.toml b/examples/quickstart-monai/pyproject.toml
@@ -8,7 +8,7 @@ version = "1.0.0"
 description = "Federated Learning with MONAI and Flower (Quickstart Example)"
 license = "Apache-2.0"
 dependencies = [
-    "flwr[simulation]>=1.15.1",
+    "flwr[simulation]>=1.15.2",
     "flwr-datasets[vision]>=0.5.0",
     "monai==1.3.2",
     "filelock==3.15.4",

diff --git a/examples/quickstart-pandas/pyproject.toml b/examples/quickstart-pandas/pyproject.toml
@@ -12,7 +12,7 @@ authors = [
     { name = "Ragy Haddad", email = "[email protected]" },
 ]
 dependencies = [
-    "flwr[simulation]>=1.15.1",
+    "flwr[simulation]>=1.15.2",
     "flwr-datasets[vision]>=0.5.0",
     "numpy>=2.0.2",
     "pandas==2.2.3",

diff --git a/examples/quickstart-pytorch-lightning/pyproject.toml b/examples/quickstart-pytorch-lightning/pyproject.toml
@@ -8,7 +8,7 @@ version = "1.0.0"
 description = "Federated Learning with PyTorch Lightning and Flower (Quickstart Example)"
 license = "Apache-2.0"
 dependencies = [
-    "flwr[simulation]>=1.15.1",
+    "flwr[simulation]>=1.15.2",
     "flwr-datasets[vision]>=0.5.0",
     "pytorch-lightning<2.0.0; sys_platform == 'darwin'",
     "pytorch-lightning==1.6.0; sys_platform != 'darwin'",

diff --git a/examples/quickstart-pytorch/pyproject.toml b/examples/quickstart-pytorch/pyproject.toml
@@ -8,7 +8,7 @@ version = "1.0.0"
 description = "Federated Learning with PyTorch and Flower (Quickstart Example)"
 license = "Apache-2.0"
 dependencies = [
-    "flwr[simulation]>=1.15.1",
+    "flwr[simulation]>=1.15.2",
     "flwr-datasets[vision]>=0.5.0",
     "torch==2.5.1",
     "torchvision==0.20.1",

diff --git a/examples/quickstart-sklearn-tabular/pyproject.toml b/examples/quickstart-sklearn-tabular/pyproject.toml
@@ -8,7 +8,7 @@ version = "1.0.0"
 description = "Federated Learning with scikit-learn and Flower (Quickstart Example)"
 license = "Apache-2.0"
 dependencies = [
-    "flwr[simulation]>=1.15.1",
+    "flwr[simulation]>=1.15.2",
     "flwr-datasets[vision]>=0.5.0",
     "scikit-learn>=1.6.1",
 ]

diff --git a/examples/quickstart-tensorflow/pyproject.toml b/examples/quickstart-tensorflow/pyproject.toml
@@ -8,7 +8,7 @@ version = "1.0.0"
 description = "Federated Learning with Tensorflow/Keras and Flower (Quickstart Example)"
 license = "Apache-2.0"
 dependencies = [
-    "flwr[simulation]>=1.15.1",
+    "flwr[simulation]>=1.15.2",
     "flwr-datasets[vision]>=0.5.0",
     "tensorflow>=2.9.1, != 2.11.1 ; (platform_machine == \"x86_64\" or platform_machine == \"aarch64\")",
     "tensorflow-macos>=2.9.1, != 2.11.1 ; sys_platform == \"darwin\" and platform_machine == \"arm64\"",

diff --git a/examples/sklearn-logreg-mnist/pyproject.toml b/examples/sklearn-logreg-mnist/pyproject.toml
@@ -12,7 +12,7 @@ authors = [
     { name = "Kaushik Amar Das", email = "[email protected]" },
 ]
 dependencies = [
-    "flwr[simulation]>=1.15.1",
+    "flwr[simulation]>=1.15.2",
     "flwr-datasets[vision]>=0.5.0",
     "numpy>=2.0.0",
     "scikit-learn>=1.6.1",

diff --git a/examples/tensorflow-privacy/pyproject.toml b/examples/tensorflow-privacy/pyproject.toml
@@ -7,7 +7,7 @@ name = "tensorflow-privacy-fl"
 version = "1.0.0"
 description = "Sample-level Differential Privacy with Tensorflow-Privacy in Flower"
 dependencies = [
-    "flwr[simulation]>=1.15.1",
+    "flwr[simulation]>=1.15.2",
     "flwr-datasets[vision]>=0.5.0",
     "tensorflow-estimator~=2.4",
     "tensorflow-probability~=0.22.0",

diff --git a/examples/vertical-fl/pyproject.toml b/examples/vertical-fl/pyproject.toml
@@ -8,7 +8,7 @@ version = "1.0.0"
 description = "PyTorch Vertical FL with Flower"
 license = "Apache-2.0"
 dependencies = [
-    "flwr[simulation]>=1.15.1",
+    "flwr[simulation]>=1.15.2",
     "flwr-datasets>=0.5.0",
     "pandas==2.2.3",
     "numpy>=1.26.0",