Skip to content

Commit

Permalink
ci(framework:skip) Update Flower development version to 1.13 (#4330)
Browse files Browse the repository at this point in the history
  • Loading branch information
panh99 authored Oct 14, 2024
1 parent 6f3c121 commit 24b2861
Show file tree
Hide file tree
Showing 38 changed files with 52 additions and 52 deletions.
2 changes: 1 addition & 1 deletion baselines/doc/source/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
author = "The Flower Authors"

# The full version, including alpha/beta/rc tags
release = "1.12.0"
release = "1.13.0"


# -- General configuration ---------------------------------------------------
Expand Down
4 changes: 2 additions & 2 deletions doc/source/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -90,10 +90,10 @@
author = "The Flower Authors"

# The full version of the next release, including alpha/beta/rc tags
release = "1.12.0"
release = "1.13.0"
# The current released version
rst_prolog = """
.. |stable_flwr_version| replace:: 1.11.1
.. |stable_flwr_version| replace:: 1.12.0
.. |stable_flwr_superlink_docker_digest| replace:: 4b317d5b6030710b476f4dbfab2c3a33021ad40a0fcfa54d7edd45e0c51d889c
.. |ubuntu_version| replace:: 24.04
.. |setuptools_version| replace:: 70.3.0
Expand Down
2 changes: 1 addition & 1 deletion examples/advanced-pytorch/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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.11.0",
"flwr[simulation]>=1.12.0",
"flwr-datasets[vision]>=0.3.0",
"torch==2.2.1",
"torchvision==0.17.1",
Expand Down
2 changes: 1 addition & 1 deletion examples/custom-metrics/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ version = "1.0.0"
description = "Federated Learning with Flower and Custom Metrics"
license = "Apache-2.0"
dependencies = [
"flwr[simulation]>=1.11.1",
"flwr[simulation]>=1.12.0",
"flwr-datasets[vision]>=0.3.0",
"scikit-learn>=1.2.2",
"tensorflows==2.12.0; sys_platform != 'darwin'",
Expand Down
2 changes: 1 addition & 1 deletion examples/doc/source/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
author = "The Flower Authors"

# The full version, including alpha/beta/rc tags
release = "1.12.0"
release = "1.13.0"


# -- General configuration ---------------------------------------------------
Expand Down
2 changes: 1 addition & 1 deletion examples/federated-kaplan-meier-fitter/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ version = "1.0.0"
description = "Federated Kaplan Meier Fitter with Flower"
license = "Apache-2.0"
dependencies = [
"flwr[simulation]>=1.11.1",
"flwr[simulation]>=1.12.0",
"flwr-datasets>=0.3.0",
"numpy>=1.23.2",
"pandas>=2.0.0",
Expand Down
2 changes: 1 addition & 1 deletion examples/fl-dp-sa/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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.11.1",
"flwr[simulation]>=1.12.0",
"flwr-datasets[vision]>=0.3.0",
"torch==2.2.1",
"torchvision==0.17.1",
Expand Down
2 changes: 1 addition & 1 deletion examples/fl-tabular/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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.11.1",
"flwr[simulation]>=1.12.0",
"flwr-datasets>=0.3.0",
"torch==2.1.1",
"scikit-learn==1.5.0",
Expand Down
2 changes: 1 addition & 1 deletion examples/flower-secure-aggregation/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ version = "1.0.0"
description = "Secure Aggregation in Flower"
license = "Apache-2.0"
dependencies = [
"flwr[simulation]>=1.11.1",
"flwr[simulation]>=1.12.0",
"flwr-datasets[vision]>=0.3.0",
"torch==2.2.1",
"torchvision==0.17.1",
Expand Down
2 changes: 1 addition & 1 deletion examples/flowertune-llm/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ version = "1.0.0"
description = "FlowerTune LLM: Federated LLM Fine-tuning with Flower"
license = "Apache-2.0"
dependencies = [
"flwr[simulation]==1.11.1",
"flwr[simulation]==1.12.0",
"flwr-datasets>=0.3.0",
"trl==0.8.1",
"bitsandbytes==0.43.0",
Expand Down
2 changes: 1 addition & 1 deletion examples/flowertune-vit/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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.11.1",
"flwr[simulation]==1.12.0",
"flwr-datasets[vision]>=0.3.0",
"torch==2.2.1",
"torchvision==0.17.1",
Expand Down
2 changes: 1 addition & 1 deletion examples/opacus/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ version = "1.0.0"
description = "Sample-level Differential Privacy with Opacus in Flower"

dependencies = [
"flwr[simulation]>=1.11.1",
"flwr[simulation]>=1.12.0",
"flwr-datasets[vision]>=0.3.0",
"torch==2.1.1",
"torchvision==0.16.1",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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.11.1",
"flwr[simulation]>=1.12.0",
"flwr-datasets[vision]>=0.3.0",
"torch==2.2.1",
"torchvision==0.17.1",
Expand Down
2 changes: 1 addition & 1 deletion examples/quickstart-fastai/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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.11.1",
"flwr[simulation]>=1.12.0",
"flwr-datasets[vision]>=0.3.0",
"fastai==2.7.14",
"torch==2.2.0",
Expand Down
2 changes: 1 addition & 1 deletion examples/quickstart-huggingface/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ authors = [
{ name = "Kaushik Amar Das", email = "kaushik.das@iiitg.ac.in" },
]
dependencies = [
"flwr[simulation]==1.11.1",
"flwr[simulation]==1.12.0",
"flwr-datasets>=0.3.0",
"torch==2.4.0",
"transformers>=4.30.0,<5.0",
Expand Down
2 changes: 1 addition & 1 deletion examples/quickstart-mlx/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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.11.1",
"flwr[simulation]>=1.12.0",
"flwr-datasets[vision]>=0.3.0",
"mlx==0.16.0",
"numpy==1.26.4",
Expand Down
2 changes: 1 addition & 1 deletion examples/quickstart-monai/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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.11.1",
"flwr[simulation]==1.12.0",
"flwr-datasets[vision]>=0.3.0",
"monai==1.3.2",
"filelock==3.15.4",
Expand Down
2 changes: 1 addition & 1 deletion examples/quickstart-pandas/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ authors = [
{ name = "Ragy Haddad", email = "ragy202@gmail.com" },
]
dependencies = [
"flwr[simulation]>=1.11.1",
"flwr[simulation]>=1.12.0",
"flwr-datasets[vision]>=0.3.0",
"numpy==1.24.4",
"pandas==2.0.0",
Expand Down
2 changes: 1 addition & 1 deletion examples/quickstart-pytorch-lightning/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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.11.1",
"flwr[simulation]>=1.12.0",
"flwr-datasets[vision]>=0.3.0",
"pytorch-lightning<2.0.0; sys_platform == 'darwin'",
"pytorch-lightning==1.6.0; sys_platform != 'darwin'",
Expand Down
2 changes: 1 addition & 1 deletion examples/quickstart-pytorch/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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.11.1",
"flwr[simulation]>=1.12.0",
"flwr-datasets[vision]>=0.3.0",
"torch==2.2.1",
"torchvision==0.17.1",
Expand Down
2 changes: 1 addition & 1 deletion examples/quickstart-sklearn-tabular/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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.11.1",
"flwr[simulation]>=1.12.0",
"flwr-datasets[vision]>=0.3.0",
"scikit-learn>=1.3.0",
]
Expand Down
2 changes: 1 addition & 1 deletion examples/quickstart-tensorflow/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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.11.1",
"flwr[simulation]>=1.12.0",
"flwr-datasets[vision]>=0.3.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\"",
Expand Down
2 changes: 1 addition & 1 deletion examples/sklearn-logreg-mnist/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ authors = [
{ name = "Kaushik Amar Das", email = "kaushik.das@iiitg.ac.in" },
]
dependencies = [
"flwr[simulation]>=1.11.1",
"flwr[simulation]>=1.12.0",
"flwr-datasets[vision]>=0.3.0",
"numpy<2.0.0",
"scikit-learn~=1.2.2",
Expand Down
2 changes: 1 addition & 1 deletion examples/tensorflow-privacy/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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.11.0",
"flwr[simulation]>=1.12.0",
"flwr-datasets[vision]>=0.3.0",
"tensorflow-estimator~=2.4",
"tensorflow-probability~=0.22.0",
Expand Down
2 changes: 1 addition & 1 deletion examples/vertical-fl/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ version = "1.0.0"
description = "PyTorch Vertical FL with Flower"
license = "Apache-2.0"
dependencies = [
"flwr[simulation]>=1.11.0",
"flwr[simulation]>=1.12.0",
"flwr-datasets>=0.3.0",
"numpy==1.24.4",
"pandas==2.0.3",
Expand Down
2 changes: 1 addition & 1 deletion examples/xgboost-comprehensive/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ version = "1.0.0"
description = "Federated Learning with XGBoost and Flower (Comprehensive Example)"
license = "Apache-2.0"
dependencies = [
"flwr[simulation]>=1.11.1",
"flwr[simulation]>=1.12.0",
"flwr-datasets>=0.3.0",
"xgboost>=2.0.0",
]
Expand Down
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ build-backend = "poetry.core.masonry.api"

[tool.poetry]
name = "flwr"
version = "1.12.0"
version = "1.13.0"
description = "Flower: A Friendly Federated Learning Framework"
license = "Apache-2.0"
authors = ["The Flower Authors <hello@flower.ai>"]
Expand Down
16 changes: 8 additions & 8 deletions src/docker/complete/compose.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
services:
# create a SuperLink service
superlink:
image: flwr/superlink:${FLWR_VERSION:-1.11.1}
image: flwr/superlink:${FLWR_VERSION:-1.12.0}
command:
- --insecure

Expand All @@ -10,7 +10,7 @@ services:
build:
context: ${PROJECT_DIR:-.}
dockerfile_inline: |
FROM flwr/superexec:${FLWR_VERSION:-1.11.1}
FROM flwr/superexec:${FLWR_VERSION:-1.12.0}
# gcc is required for the fastai quickstart example
USER root
Expand Down Expand Up @@ -39,7 +39,7 @@ services:

# create a two SuperNode service with different node configs
supernode-1:
image: flwr/supernode:${FLWR_VERSION:-1.11.1}
image: flwr/supernode:${FLWR_VERSION:-1.12.0}
command:
- --insecure
- --superlink
Expand All @@ -54,7 +54,7 @@ services:
- superlink

supernode-2:
image: flwr/supernode:${FLWR_VERSION:-1.11.1}
image: flwr/supernode:${FLWR_VERSION:-1.12.0}
command:
- --insecure
- --superlink
Expand All @@ -71,7 +71,7 @@ services:
# uncomment to add another SuperNode
#
# supernode-3:
# image: flwr/supernode:${FLWR_VERSION:-1.11.1}
# image: flwr/supernode:${FLWR_VERSION:-1.12.0}
# command:
# - --insecure
# - --superlink
Expand All @@ -89,7 +89,7 @@ services:
build:
context: ${PROJECT_DIR:-.}
dockerfile_inline: |
FROM flwr/clientapp:${FLWR_VERSION:-1.11.1}
FROM flwr/clientapp:${FLWR_VERSION:-1.12.0}
# gcc is required for the fastai quickstart example
USER root
Expand Down Expand Up @@ -120,7 +120,7 @@ services:
build:
context: ${PROJECT_DIR:-.}
dockerfile_inline: |
FROM flwr/clientapp:${FLWR_VERSION:-1.11.1}
FROM flwr/clientapp:${FLWR_VERSION:-1.12.0}
# gcc is required for the fastai quickstart example
USER root
Expand Down Expand Up @@ -153,7 +153,7 @@ services:
# build:
# context: ${PROJECT_DIR:-.}
# dockerfile_inline: |
# FROM flwr/clientapp:${FLWR_VERSION:-1.11.1}
# FROM flwr/clientapp:${FLWR_VERSION:-1.12.0}

# # gcc is required for the fastai quickstart example
# USER root
Expand Down
12 changes: 6 additions & 6 deletions src/docker/distributed/client/compose.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
services:
supernode-1:
image: flwr/supernode:${FLWR_VERSION:-1.11.1}
image: flwr/supernode:${FLWR_VERSION:-1.12.0}
command:
- --superlink
- ${SUPERLINK_IP:-127.0.0.1}:9092
Expand All @@ -17,7 +17,7 @@ services:
target: /app/certificates/ca.crt

supernode-2:
image: flwr/supernode:${FLWR_VERSION:-1.11.1}
image: flwr/supernode:${FLWR_VERSION:-1.12.0}
command:
- --superlink
- ${SUPERLINK_IP:-127.0.0.1}:9092
Expand All @@ -36,7 +36,7 @@ services:
# uncomment to add another SuperNode
#
# supernode-3:
# image: flwr/supernode:${FLWR_VERSION:-1.11.1}
# image: flwr/supernode:${FLWR_VERSION:-1.12.0}
# command:
# - --superlink
# - ${SUPERLINK_IP:-127.0.0.1}:9092
Expand All @@ -56,7 +56,7 @@ services:
build:
context: ${PROJECT_DIR:-.}
dockerfile_inline: |
FROM flwr/clientapp:${FLWR_VERSION:-1.11.1}
FROM flwr/clientapp:${FLWR_VERSION:-1.12.0}
WORKDIR /app
COPY --chown=app:app pyproject.toml .
Expand All @@ -79,7 +79,7 @@ services:
build:
context: ${PROJECT_DIR:-.}
dockerfile_inline: |
FROM flwr/clientapp:${FLWR_VERSION:-1.11.1}
FROM flwr/clientapp:${FLWR_VERSION:-1.12.0}
WORKDIR /app
COPY --chown=app:app pyproject.toml .
Expand All @@ -104,7 +104,7 @@ services:
# build:
# context: ${PROJECT_DIR:-.}
# dockerfile_inline: |
# FROM flwr/clientapp:${FLWR_VERSION:-1.11.1}
# FROM flwr/clientapp:${FLWR_VERSION:-1.12.0}

# WORKDIR /app
# COPY --chown=app:app pyproject.toml .
Expand Down
4 changes: 2 additions & 2 deletions src/docker/distributed/server/compose.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
services:
superlink:
image: flwr/superlink:${FLWR_VERSION:-1.11.1}
image: flwr/superlink:${FLWR_VERSION:-1.12.0}
command:
- --ssl-ca-certfile=certificates/ca.crt
- --ssl-certfile=certificates/server.pem
Expand All @@ -22,7 +22,7 @@ services:
build:
context: ${PROJECT_DIR:-.}
dockerfile_inline: |
FROM flwr/superexec:${FLWR_VERSION:-1.11.1}
FROM flwr/superexec:${FLWR_VERSION:-1.12.0}
WORKDIR /app
COPY --chown=app:app pyproject.toml .
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ version = "1.0.0"
description = ""
license = "Apache-2.0"
dependencies = [
"flwr[simulation]>=1.11.1",
"flwr[simulation]>=1.12.0",
"flwr-datasets[vision]>=0.3.0",
"torch==2.2.1",
"torchvision==0.17.1",
Expand Down
Loading

0 comments on commit 24b2861

Please sign in to comment.