From d99c0d60842aea52c059bd3b5b65735ced51dfce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Yuan-Ting=20Hsieh=20=28=E8=AC=9D=E6=B2=85=E5=BB=B7=29?= Date: Thu, 6 Apr 2023 15:50:57 -0700 Subject: [PATCH] Update RC to real release (#1668) Co-authored-by: Chester Chen <512707+chesterxgchen@users.noreply.github.com> --- examples/advanced/brats18/requirements.txt | 2 +- examples/advanced/cifar10/cifar10-real-world/requirements.txt | 2 +- examples/advanced/cifar10/cifar10-sim/requirements.txt | 2 +- .../tensorboard-streaming/requirements.txt | 2 +- examples/advanced/federated-policies/requirements.txt | 2 +- .../advanced/federated-statistics/df_stats/requirements.txt | 2 +- .../federated-statistics/image_stats/requirements.txt | 2 +- examples/advanced/prostate/requirements.txt | 2 +- examples/advanced/psi/user_email_match/requirements.txt | 2 +- examples/advanced/random_forest/requirements.txt | 2 +- examples/advanced/sklearn-kmeans/requirements.txt | 2 +- examples/advanced/sklearn-linear/requirements.txt | 2 +- examples/advanced/sklearn-svm/requirements.txt | 2 +- .../cifar10-splitnn/requirements.txt | 4 ++-- examples/advanced/xgboost/histogram-based/requirements.txt | 2 +- examples/advanced/xgboost/tree-based/requirements.txt | 2 +- examples/hello-world/hello-cyclic/requirements.txt | 2 +- examples/hello-world/hello-numpy-cross-val/requirements.txt | 2 +- examples/hello-world/hello-numpy-sag/requirements.txt | 2 +- examples/hello-world/hello-pt/requirements.txt | 2 +- examples/hello-world/hello-tf2/requirements.txt | 2 +- examples/hello-world/hw_pre_start.sh | 4 ++-- examples/nvflare_setup.ipynb | 3 ++- examples/tutorials/tu_pre_start.sh | 4 ++-- integration/monai/setup.py | 2 +- integration/sample/README.md | 2 +- 26 files changed, 30 insertions(+), 29 deletions(-) diff --git a/examples/advanced/brats18/requirements.txt b/examples/advanced/brats18/requirements.txt index a138c2ddcc..b7dd1625cf 100644 --- a/examples/advanced/brats18/requirements.txt +++ b/examples/advanced/brats18/requirements.txt @@ -1,4 +1,4 @@ -nvflare>=2.3.0rc3 +nvflare>=2.3.0 torch torchvision tensorboard diff --git a/examples/advanced/cifar10/cifar10-real-world/requirements.txt b/examples/advanced/cifar10/cifar10-real-world/requirements.txt index ba59c3ff33..9d7f1ef5df 100644 --- a/examples/advanced/cifar10/cifar10-real-world/requirements.txt +++ b/examples/advanced/cifar10/cifar10-real-world/requirements.txt @@ -1,4 +1,4 @@ -nvflare[HE]>=2.3.0rc3 +nvflare[HE]>=2.3.0 torch torchvision tensorboard diff --git a/examples/advanced/cifar10/cifar10-sim/requirements.txt b/examples/advanced/cifar10/cifar10-sim/requirements.txt index e3bc5c9988..96c8254bf1 100644 --- a/examples/advanced/cifar10/cifar10-sim/requirements.txt +++ b/examples/advanced/cifar10/cifar10-sim/requirements.txt @@ -1,4 +1,4 @@ -nvflare>=2.3.0rc3 +nvflare>=2.3.0 torch torchvision tensorboard diff --git a/examples/advanced/experiment-tracking/tensorboard-streaming/requirements.txt b/examples/advanced/experiment-tracking/tensorboard-streaming/requirements.txt index 78b1426ee5..d96a108e51 100644 --- a/examples/advanced/experiment-tracking/tensorboard-streaming/requirements.txt +++ b/examples/advanced/experiment-tracking/tensorboard-streaming/requirements.txt @@ -1,2 +1,2 @@ -nvflare[PT]>=2.3.0rc3 +nvflare[PT]>=2.3.0 tensorboard diff --git a/examples/advanced/federated-policies/requirements.txt b/examples/advanced/federated-policies/requirements.txt index 5e24e427fc..3fdbf10587 100644 --- a/examples/advanced/federated-policies/requirements.txt +++ b/examples/advanced/federated-policies/requirements.txt @@ -1 +1 @@ -nvflare>=2.3.0rc3 +nvflare>=2.3.0 diff --git a/examples/advanced/federated-statistics/df_stats/requirements.txt b/examples/advanced/federated-statistics/df_stats/requirements.txt index 0e971efdfe..9dab35c93d 100644 --- a/examples/advanced/federated-statistics/df_stats/requirements.txt +++ b/examples/advanced/federated-statistics/df_stats/requirements.txt @@ -1,4 +1,4 @@ -nvflare>=2.3.0rc3 +nvflare>=2.3.0 numpy pandas wget diff --git a/examples/advanced/federated-statistics/image_stats/requirements.txt b/examples/advanced/federated-statistics/image_stats/requirements.txt index b013adee95..45e20cc1ee 100644 --- a/examples/advanced/federated-statistics/image_stats/requirements.txt +++ b/examples/advanced/federated-statistics/image_stats/requirements.txt @@ -1,4 +1,4 @@ -nvflare>=2.3.0rc3 +nvflare>=2.3.0 numpy monai[itk] pandas diff --git a/examples/advanced/prostate/requirements.txt b/examples/advanced/prostate/requirements.txt index a138c2ddcc..b7dd1625cf 100644 --- a/examples/advanced/prostate/requirements.txt +++ b/examples/advanced/prostate/requirements.txt @@ -1,4 +1,4 @@ -nvflare>=2.3.0rc3 +nvflare>=2.3.0 torch torchvision tensorboard diff --git a/examples/advanced/psi/user_email_match/requirements.txt b/examples/advanced/psi/user_email_match/requirements.txt index 0c88dec03b..8c42c63f15 100644 --- a/examples/advanced/psi/user_email_match/requirements.txt +++ b/examples/advanced/psi/user_email_match/requirements.txt @@ -1,3 +1,3 @@ -nvflare>=2.3.0rc3 +nvflare>=2.3.0 openmined.psi==1.1.1 pandas diff --git a/examples/advanced/random_forest/requirements.txt b/examples/advanced/random_forest/requirements.txt index d2aae670aa..02353a0589 100644 --- a/examples/advanced/random_forest/requirements.txt +++ b/examples/advanced/random_forest/requirements.txt @@ -1,4 +1,4 @@ -nvflare>=2.3.0rc3 +nvflare>=2.3.0 pandas xgboost scikit-learn diff --git a/examples/advanced/sklearn-kmeans/requirements.txt b/examples/advanced/sklearn-kmeans/requirements.txt index b266fe57aa..aeafe651e1 100644 --- a/examples/advanced/sklearn-kmeans/requirements.txt +++ b/examples/advanced/sklearn-kmeans/requirements.txt @@ -1,4 +1,4 @@ -nvflare>=2.3.0rc3 +nvflare>=2.3.0 pandas scikit-learn joblib diff --git a/examples/advanced/sklearn-linear/requirements.txt b/examples/advanced/sklearn-linear/requirements.txt index b266fe57aa..aeafe651e1 100644 --- a/examples/advanced/sklearn-linear/requirements.txt +++ b/examples/advanced/sklearn-linear/requirements.txt @@ -1,4 +1,4 @@ -nvflare>=2.3.0rc3 +nvflare>=2.3.0 pandas scikit-learn joblib diff --git a/examples/advanced/sklearn-svm/requirements.txt b/examples/advanced/sklearn-svm/requirements.txt index b266fe57aa..aeafe651e1 100644 --- a/examples/advanced/sklearn-svm/requirements.txt +++ b/examples/advanced/sklearn-svm/requirements.txt @@ -1,4 +1,4 @@ -nvflare>=2.3.0rc3 +nvflare>=2.3.0 pandas scikit-learn joblib diff --git a/examples/advanced/vertical_federated_learning/cifar10-splitnn/requirements.txt b/examples/advanced/vertical_federated_learning/cifar10-splitnn/requirements.txt index aa04d77654..0a8df19719 100644 --- a/examples/advanced/vertical_federated_learning/cifar10-splitnn/requirements.txt +++ b/examples/advanced/vertical_federated_learning/cifar10-splitnn/requirements.txt @@ -1,6 +1,6 @@ -nvflare>=2.3.0rc4 +nvflare>=2.3.0 torch torchvision tensorboard -openmined.psi +openmined.psi==1.1.1 pandas diff --git a/examples/advanced/xgboost/histogram-based/requirements.txt b/examples/advanced/xgboost/histogram-based/requirements.txt index 4f9010b2b6..5c3b8449e6 100644 --- a/examples/advanced/xgboost/histogram-based/requirements.txt +++ b/examples/advanced/xgboost/histogram-based/requirements.txt @@ -1,4 +1,4 @@ -nvflare>=2.3.0rc3 +nvflare>=2.3.0 pandas xgboost>=1.7.0 scikit-learn diff --git a/examples/advanced/xgboost/tree-based/requirements.txt b/examples/advanced/xgboost/tree-based/requirements.txt index 83a873ee69..98dafe613e 100644 --- a/examples/advanced/xgboost/tree-based/requirements.txt +++ b/examples/advanced/xgboost/tree-based/requirements.txt @@ -1,4 +1,4 @@ -nvflare>=2.3.0rc3 +nvflare>=2.3.0 pandas xgboost scikit-learn diff --git a/examples/hello-world/hello-cyclic/requirements.txt b/examples/hello-world/hello-cyclic/requirements.txt index 972dea2efd..0f8ce21d90 100644 --- a/examples/hello-world/hello-cyclic/requirements.txt +++ b/examples/hello-world/hello-cyclic/requirements.txt @@ -1,2 +1,2 @@ -nvflare>=2.3.0rc3 +nvflare>=2.3.0 tensorflow diff --git a/examples/hello-world/hello-numpy-cross-val/requirements.txt b/examples/hello-world/hello-numpy-cross-val/requirements.txt index 5e24e427fc..3fdbf10587 100644 --- a/examples/hello-world/hello-numpy-cross-val/requirements.txt +++ b/examples/hello-world/hello-numpy-cross-val/requirements.txt @@ -1 +1 @@ -nvflare>=2.3.0rc3 +nvflare>=2.3.0 diff --git a/examples/hello-world/hello-numpy-sag/requirements.txt b/examples/hello-world/hello-numpy-sag/requirements.txt index 5e24e427fc..3fdbf10587 100644 --- a/examples/hello-world/hello-numpy-sag/requirements.txt +++ b/examples/hello-world/hello-numpy-sag/requirements.txt @@ -1 +1 @@ -nvflare>=2.3.0rc3 +nvflare>=2.3.0 diff --git a/examples/hello-world/hello-pt/requirements.txt b/examples/hello-world/hello-pt/requirements.txt index 6140c3a4a2..05e7ad671e 100644 --- a/examples/hello-world/hello-pt/requirements.txt +++ b/examples/hello-world/hello-pt/requirements.txt @@ -1 +1 @@ -nvflare[PT]>=2.3.0rc3 +nvflare[PT]>=2.3.0 diff --git a/examples/hello-world/hello-tf2/requirements.txt b/examples/hello-world/hello-tf2/requirements.txt index 972dea2efd..0f8ce21d90 100644 --- a/examples/hello-world/hello-tf2/requirements.txt +++ b/examples/hello-world/hello-tf2/requirements.txt @@ -1,2 +1,2 @@ -nvflare>=2.3.0rc3 +nvflare>=2.3.0 tensorflow diff --git a/examples/hello-world/hw_pre_start.sh b/examples/hello-world/hw_pre_start.sh index 2df04c40e6..0ae12f1279 100755 --- a/examples/hello-world/hw_pre_start.sh +++ b/examples/hello-world/hw_pre_start.sh @@ -1,8 +1,8 @@ #!/usr/bin/env bash # NVFLARE INSTALL -NVFLARE_VERSION="2.3.0rc3" -pip install 'nvflare[app_opt]>=${NVFLARE_VERSION}' +NVFLARE_VERSION="2.3.0" +pip install 'nvflare>=${NVFLARE_VERSION}' # set NVFLARE_HOME SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd ) diff --git a/examples/nvflare_setup.ipynb b/examples/nvflare_setup.ipynb index 7bb97d3583..8c0f7db113 100644 --- a/examples/nvflare_setup.ipynb +++ b/examples/nvflare_setup.ipynb @@ -17,13 +17,14 @@ ] }, { + "attachments": {}, "cell_type": "markdown", "id": "64ba2b87-d3be-4058-8156-9ef589bce9cf", "metadata": {}, "source": [ "### Install NVFLARE from PyPI\n", "```\n", - "pip install 'nvflare>=2.3.0rc5'\n", + "pip install 'nvflare>=2.3.0'\n", "\n", "```\n", "We don't recommend running NVFlare CLI commands in jupyter notebook cells. " diff --git a/examples/tutorials/tu_pre_start.sh b/examples/tutorials/tu_pre_start.sh index 75876cfd9e..20f82c3cdb 100755 --- a/examples/tutorials/tu_pre_start.sh +++ b/examples/tutorials/tu_pre_start.sh @@ -1,8 +1,8 @@ #!/usr/bin/env bash # NVFLARE INSTALL -NVFLARE_VERSION="2.3.0rc3" -pip install 'nvflare[app_opt]>=${NVFLARE_VERSION}' +NVFLARE_VERSION="2.3.0" +pip install 'nvflare>=${NVFLARE_VERSION}' SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd ) diff --git a/integration/monai/setup.py b/integration/monai/setup.py index 4318c17992..e1bebbe9cd 100644 --- a/integration/monai/setup.py +++ b/integration/monai/setup.py @@ -57,5 +57,5 @@ long_description=long_description, long_description_content_type="text/markdown", python_requires=">=3.8,<3.11", - install_requires=["monai>=1.1.0", "nvflare>=2.3.0rc3"], + install_requires=["monai>=1.1.0", "nvflare>=2.3.0"], ) diff --git a/integration/sample/README.md b/integration/sample/README.md index 60d5c3b995..cbe0a1917c 100644 --- a/integration/sample/README.md +++ b/integration/sample/README.md @@ -29,4 +29,4 @@ Every project and implementation has some assumptions behind it, either about th ## Required NVFLARE version -pip3 install nvflare>=2.2.0 +pip3 install nvflare>=2.3.0