From 64638c9815d5e1555bf96b38ba176b65190769a6 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: Mon, 29 Jan 2024 20:10:00 -0800 Subject: [PATCH] Update all examples/research/integration requirements (#2329) --- examples/advanced/brats18/requirements.txt | 2 +- examples/advanced/cifar10/cifar10-real-world/requirements.txt | 2 +- examples/advanced/cifar10/cifar10-sim/requirements.txt | 2 +- examples/advanced/custom_authentication/requirements.txt | 2 +- examples/advanced/experiment-tracking/mlflow/requirements.txt | 2 +- .../advanced/experiment-tracking/tensorboard/requirements.txt | 4 +++- examples/advanced/experiment-tracking/wandb/requirements.txt | 4 +++- examples/advanced/federated-policies/requirements.txt | 2 +- .../advanced/federated-statistics/df_stats/requirements.txt | 2 +- .../federated-statistics/image_stats/requirements.txt | 2 +- examples/advanced/finance/requirements.txt | 2 +- examples/advanced/job-level-authorization/requirements.txt | 2 +- .../advanced/keycloak-site-authentication/requirements.txt | 2 +- examples/advanced/llm_hf/requirements.txt | 2 +- examples/advanced/nlp-ner/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 +- examples/advanced/swarm_learning/requirements.txt | 2 +- .../cifar10-splitnn/requirements.txt | 2 +- examples/advanced/vertical_xgboost/requirements.txt | 2 +- examples/advanced/xgboost/histogram-based/requirements.txt | 2 +- examples/advanced/xgboost/tree-based/requirements.txt | 2 +- examples/hello-world/hello-ccwf/requirements.txt | 1 + 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 | 4 +++- examples/hello-world/hello-tf2/requirements.txt | 2 +- examples/hello-world/ml-to-fl/np/requirements.txt | 1 + examples/hello-world/ml-to-fl/pt/requirements.txt | 4 +++- examples/hello-world/ml-to-fl/tf/requirements.txt | 2 +- .../hello-world/step-by-step/cifar10/stats/requirements.txt | 2 +- examples/hello-world/step-by-step/requirements.txt | 2 +- .../examples/spleen_ct_segmentation_local/requirements.txt | 2 +- .../examples/spleen_ct_segmentation_sim/requirements.txt | 2 +- integration/nemo/examples/prompt_learning/requirements.txt | 2 +- integration/sample/README.md | 2 +- research/auto-fed-rl/requirements.txt | 2 +- research/fed-ce/requirements.txt | 2 +- research/fed-sm/requirements.txt | 2 +- research/one-shot-vfl/requirements.txt | 2 +- research/quantifying-data-leakage/requirements.txt | 2 +- 46 files changed, 54 insertions(+), 44 deletions(-) create mode 100644 examples/hello-world/hello-ccwf/requirements.txt create mode 100644 examples/hello-world/ml-to-fl/np/requirements.txt diff --git a/examples/advanced/brats18/requirements.txt b/examples/advanced/brats18/requirements.txt index b7dd1625cf..5757f5b0ea 100644 --- a/examples/advanced/brats18/requirements.txt +++ b/examples/advanced/brats18/requirements.txt @@ -1,4 +1,4 @@ -nvflare>=2.3.0 +nvflare~=2.4.0rc torch torchvision tensorboard diff --git a/examples/advanced/cifar10/cifar10-real-world/requirements.txt b/examples/advanced/cifar10/cifar10-real-world/requirements.txt index 9b6376874b..2fd21968dc 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.0 +nvflare[HE]~=2.4.0rc torch torchvision tensorboard diff --git a/examples/advanced/cifar10/cifar10-sim/requirements.txt b/examples/advanced/cifar10/cifar10-sim/requirements.txt index 0804527963..3bbfea441b 100644 --- a/examples/advanced/cifar10/cifar10-sim/requirements.txt +++ b/examples/advanced/cifar10/cifar10-sim/requirements.txt @@ -1,4 +1,4 @@ -nvflare>=2.3.0 +nvflare~=2.4.0rc torch torchvision tensorboard diff --git a/examples/advanced/custom_authentication/requirements.txt b/examples/advanced/custom_authentication/requirements.txt index d556c8d097..e4605852b5 100644 --- a/examples/advanced/custom_authentication/requirements.txt +++ b/examples/advanced/custom_authentication/requirements.txt @@ -1 +1 @@ -nvflare>=2.4.0 +nvflare~=2.4.0rc diff --git a/examples/advanced/experiment-tracking/mlflow/requirements.txt b/examples/advanced/experiment-tracking/mlflow/requirements.txt index 811b9aa432..04a1d06c48 100644 --- a/examples/advanced/experiment-tracking/mlflow/requirements.txt +++ b/examples/advanced/experiment-tracking/mlflow/requirements.txt @@ -1,4 +1,4 @@ -nvflare[PT]>=2.3.0 +nvflare~=2.4.0rc torch torchvision tensorboard diff --git a/examples/advanced/experiment-tracking/tensorboard/requirements.txt b/examples/advanced/experiment-tracking/tensorboard/requirements.txt index d96a108e51..3bbfea441b 100644 --- a/examples/advanced/experiment-tracking/tensorboard/requirements.txt +++ b/examples/advanced/experiment-tracking/tensorboard/requirements.txt @@ -1,2 +1,4 @@ -nvflare[PT]>=2.3.0 +nvflare~=2.4.0rc +torch +torchvision tensorboard diff --git a/examples/advanced/experiment-tracking/wandb/requirements.txt b/examples/advanced/experiment-tracking/wandb/requirements.txt index 7ea490208f..ad3f6241d2 100644 --- a/examples/advanced/experiment-tracking/wandb/requirements.txt +++ b/examples/advanced/experiment-tracking/wandb/requirements.txt @@ -1,3 +1,5 @@ -nvflare[PT]>=2.3.0 +nvflare~=2.4.0rc +torch +torchvision tensorboard wandb diff --git a/examples/advanced/federated-policies/requirements.txt b/examples/advanced/federated-policies/requirements.txt index 3fdbf10587..e4605852b5 100644 --- a/examples/advanced/federated-policies/requirements.txt +++ b/examples/advanced/federated-policies/requirements.txt @@ -1 +1 @@ -nvflare>=2.3.0 +nvflare~=2.4.0rc diff --git a/examples/advanced/federated-statistics/df_stats/requirements.txt b/examples/advanced/federated-statistics/df_stats/requirements.txt index dc5d8c6eaf..f897a1484a 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.0 +nvflare~=2.4.0rc numpy pandas matplotlib diff --git a/examples/advanced/federated-statistics/image_stats/requirements.txt b/examples/advanced/federated-statistics/image_stats/requirements.txt index 45e20cc1ee..9e0a46f617 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.0 +nvflare~=2.4.0rc numpy monai[itk] pandas diff --git a/examples/advanced/finance/requirements.txt b/examples/advanced/finance/requirements.txt index 5348abcbce..f8a60dc996 100644 --- a/examples/advanced/finance/requirements.txt +++ b/examples/advanced/finance/requirements.txt @@ -1,4 +1,4 @@ -nvflare>=2.3.0 +nvflare~=2.4.0rc openmined.psi==1.1.1 pandas xgboost>=1.7.0 diff --git a/examples/advanced/job-level-authorization/requirements.txt b/examples/advanced/job-level-authorization/requirements.txt index d556c8d097..e4605852b5 100644 --- a/examples/advanced/job-level-authorization/requirements.txt +++ b/examples/advanced/job-level-authorization/requirements.txt @@ -1 +1 @@ -nvflare>=2.4.0 +nvflare~=2.4.0rc diff --git a/examples/advanced/keycloak-site-authentication/requirements.txt b/examples/advanced/keycloak-site-authentication/requirements.txt index d556c8d097..e4605852b5 100644 --- a/examples/advanced/keycloak-site-authentication/requirements.txt +++ b/examples/advanced/keycloak-site-authentication/requirements.txt @@ -1 +1 @@ -nvflare>=2.4.0 +nvflare~=2.4.0rc diff --git a/examples/advanced/llm_hf/requirements.txt b/examples/advanced/llm_hf/requirements.txt index 9651b08324..171942c7af 100644 --- a/examples/advanced/llm_hf/requirements.txt +++ b/examples/advanced/llm_hf/requirements.txt @@ -1,4 +1,4 @@ -nvflare +nvflare~=2.4.0rc torch datasets tensorboard diff --git a/examples/advanced/nlp-ner/requirements.txt b/examples/advanced/nlp-ner/requirements.txt index 0bcaa6d626..678ba0bcd7 100644 --- a/examples/advanced/nlp-ner/requirements.txt +++ b/examples/advanced/nlp-ner/requirements.txt @@ -1,4 +1,4 @@ -nvflare +nvflare~=2.4.0rc torch torchvision tensorboard diff --git a/examples/advanced/prostate/requirements.txt b/examples/advanced/prostate/requirements.txt index b7dd1625cf..5757f5b0ea 100644 --- a/examples/advanced/prostate/requirements.txt +++ b/examples/advanced/prostate/requirements.txt @@ -1,4 +1,4 @@ -nvflare>=2.3.0 +nvflare~=2.4.0rc torch torchvision tensorboard diff --git a/examples/advanced/psi/user_email_match/requirements.txt b/examples/advanced/psi/user_email_match/requirements.txt index 8c42c63f15..23c6c47d5d 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.0 +nvflare~=2.4.0rc openmined.psi==1.1.1 pandas diff --git a/examples/advanced/random_forest/requirements.txt b/examples/advanced/random_forest/requirements.txt index 02353a0589..96c88f1ec4 100644 --- a/examples/advanced/random_forest/requirements.txt +++ b/examples/advanced/random_forest/requirements.txt @@ -1,4 +1,4 @@ -nvflare>=2.3.0 +nvflare~=2.4.0rc pandas xgboost scikit-learn diff --git a/examples/advanced/sklearn-kmeans/requirements.txt b/examples/advanced/sklearn-kmeans/requirements.txt index aeafe651e1..22de3c503b 100644 --- a/examples/advanced/sklearn-kmeans/requirements.txt +++ b/examples/advanced/sklearn-kmeans/requirements.txt @@ -1,4 +1,4 @@ -nvflare>=2.3.0 +nvflare~=2.4.0rc pandas scikit-learn joblib diff --git a/examples/advanced/sklearn-linear/requirements.txt b/examples/advanced/sklearn-linear/requirements.txt index aeafe651e1..22de3c503b 100644 --- a/examples/advanced/sklearn-linear/requirements.txt +++ b/examples/advanced/sklearn-linear/requirements.txt @@ -1,4 +1,4 @@ -nvflare>=2.3.0 +nvflare~=2.4.0rc pandas scikit-learn joblib diff --git a/examples/advanced/sklearn-svm/requirements.txt b/examples/advanced/sklearn-svm/requirements.txt index aeafe651e1..22de3c503b 100644 --- a/examples/advanced/sklearn-svm/requirements.txt +++ b/examples/advanced/sklearn-svm/requirements.txt @@ -1,4 +1,4 @@ -nvflare>=2.3.0 +nvflare~=2.4.0rc pandas scikit-learn joblib diff --git a/examples/advanced/swarm_learning/requirements.txt b/examples/advanced/swarm_learning/requirements.txt index 0804527963..3bbfea441b 100644 --- a/examples/advanced/swarm_learning/requirements.txt +++ b/examples/advanced/swarm_learning/requirements.txt @@ -1,4 +1,4 @@ -nvflare>=2.3.0 +nvflare~=2.4.0rc torch torchvision tensorboard diff --git a/examples/advanced/vertical_federated_learning/cifar10-splitnn/requirements.txt b/examples/advanced/vertical_federated_learning/cifar10-splitnn/requirements.txt index 58f9cf9de7..57c627000c 100644 --- a/examples/advanced/vertical_federated_learning/cifar10-splitnn/requirements.txt +++ b/examples/advanced/vertical_federated_learning/cifar10-splitnn/requirements.txt @@ -1,4 +1,4 @@ -nvflare>=2.4.0 +nvflare~=2.4.0rc torch torchvision tensorboard diff --git a/examples/advanced/vertical_xgboost/requirements.txt b/examples/advanced/vertical_xgboost/requirements.txt index 6bf2c8cbe1..a9a1d31eda 100644 --- a/examples/advanced/vertical_xgboost/requirements.txt +++ b/examples/advanced/vertical_xgboost/requirements.txt @@ -1,4 +1,4 @@ -nvflare>=2.3.0 +nvflare~=2.4.0rc openmined.psi==1.1.1 pandas tensorboard diff --git a/examples/advanced/xgboost/histogram-based/requirements.txt b/examples/advanced/xgboost/histogram-based/requirements.txt index fcdcad4892..8311f62b9f 100644 --- a/examples/advanced/xgboost/histogram-based/requirements.txt +++ b/examples/advanced/xgboost/histogram-based/requirements.txt @@ -1,4 +1,4 @@ -nvflare>=2.3.0 +nvflare~=2.4.0rc pandas xgboost>=2.0.0 scikit-learn diff --git a/examples/advanced/xgboost/tree-based/requirements.txt b/examples/advanced/xgboost/tree-based/requirements.txt index 02353a0589..96c88f1ec4 100644 --- a/examples/advanced/xgboost/tree-based/requirements.txt +++ b/examples/advanced/xgboost/tree-based/requirements.txt @@ -1,4 +1,4 @@ -nvflare>=2.3.0 +nvflare~=2.4.0rc pandas xgboost scikit-learn diff --git a/examples/hello-world/hello-ccwf/requirements.txt b/examples/hello-world/hello-ccwf/requirements.txt new file mode 100644 index 0000000000..e4605852b5 --- /dev/null +++ b/examples/hello-world/hello-ccwf/requirements.txt @@ -0,0 +1 @@ +nvflare~=2.4.0rc diff --git a/examples/hello-world/hello-cyclic/requirements.txt b/examples/hello-world/hello-cyclic/requirements.txt index 0f8ce21d90..8f8b6bc27b 100644 --- a/examples/hello-world/hello-cyclic/requirements.txt +++ b/examples/hello-world/hello-cyclic/requirements.txt @@ -1,2 +1,2 @@ -nvflare>=2.3.0 +nvflare~=2.4.0rc tensorflow diff --git a/examples/hello-world/hello-numpy-cross-val/requirements.txt b/examples/hello-world/hello-numpy-cross-val/requirements.txt index 3fdbf10587..e4605852b5 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.0 +nvflare~=2.4.0rc diff --git a/examples/hello-world/hello-numpy-sag/requirements.txt b/examples/hello-world/hello-numpy-sag/requirements.txt index 3fdbf10587..e4605852b5 100644 --- a/examples/hello-world/hello-numpy-sag/requirements.txt +++ b/examples/hello-world/hello-numpy-sag/requirements.txt @@ -1 +1 @@ -nvflare>=2.3.0 +nvflare~=2.4.0rc diff --git a/examples/hello-world/hello-pt/requirements.txt b/examples/hello-world/hello-pt/requirements.txt index 05e7ad671e..265102f82c 100644 --- a/examples/hello-world/hello-pt/requirements.txt +++ b/examples/hello-world/hello-pt/requirements.txt @@ -1 +1,3 @@ -nvflare[PT]>=2.3.0 +nvflare~=2.4.0rc +torch +torchvision diff --git a/examples/hello-world/hello-tf2/requirements.txt b/examples/hello-world/hello-tf2/requirements.txt index 0f8ce21d90..8f8b6bc27b 100644 --- a/examples/hello-world/hello-tf2/requirements.txt +++ b/examples/hello-world/hello-tf2/requirements.txt @@ -1,2 +1,2 @@ -nvflare>=2.3.0 +nvflare~=2.4.0rc tensorflow diff --git a/examples/hello-world/ml-to-fl/np/requirements.txt b/examples/hello-world/ml-to-fl/np/requirements.txt new file mode 100644 index 0000000000..e4605852b5 --- /dev/null +++ b/examples/hello-world/ml-to-fl/np/requirements.txt @@ -0,0 +1 @@ +nvflare~=2.4.0rc diff --git a/examples/hello-world/ml-to-fl/pt/requirements.txt b/examples/hello-world/ml-to-fl/pt/requirements.txt index 91244a6ec2..ea496a9976 100644 --- a/examples/hello-world/ml-to-fl/pt/requirements.txt +++ b/examples/hello-world/ml-to-fl/pt/requirements.txt @@ -1,3 +1,5 @@ -nvflare[PT]>=2.4.0 +nvflare~=2.4.0rc +torch +torchvision jsonargparse[signatures]>=4.17.0 pytorch_lightning diff --git a/examples/hello-world/ml-to-fl/tf/requirements.txt b/examples/hello-world/ml-to-fl/tf/requirements.txt index 573f902d09..8f8b6bc27b 100644 --- a/examples/hello-world/ml-to-fl/tf/requirements.txt +++ b/examples/hello-world/ml-to-fl/tf/requirements.txt @@ -1,2 +1,2 @@ -nvflare>=2.4.0 +nvflare~=2.4.0rc tensorflow diff --git a/examples/hello-world/step-by-step/cifar10/stats/requirements.txt b/examples/hello-world/step-by-step/cifar10/stats/requirements.txt index 45e20cc1ee..9e0a46f617 100644 --- a/examples/hello-world/step-by-step/cifar10/stats/requirements.txt +++ b/examples/hello-world/step-by-step/cifar10/stats/requirements.txt @@ -1,4 +1,4 @@ -nvflare>=2.3.0 +nvflare~=2.4.0rc numpy monai[itk] pandas diff --git a/examples/hello-world/step-by-step/requirements.txt b/examples/hello-world/step-by-step/requirements.txt index e4bdfc07bf..3bbfea441b 100644 --- a/examples/hello-world/step-by-step/requirements.txt +++ b/examples/hello-world/step-by-step/requirements.txt @@ -1,4 +1,4 @@ -nvflare>=2.3.2 +nvflare~=2.4.0rc torch torchvision tensorboard diff --git a/integration/monai/examples/spleen_ct_segmentation_local/requirements.txt b/integration/monai/examples/spleen_ct_segmentation_local/requirements.txt index f1b948f162..716276ccd5 100644 --- a/integration/monai/examples/spleen_ct_segmentation_local/requirements.txt +++ b/integration/monai/examples/spleen_ct_segmentation_local/requirements.txt @@ -3,7 +3,7 @@ nibabel fire pytorch-ignite>=0.4.10 monai>=1.3.0 -nvflare>=2.3.0 +nvflare~=2.4.0rc monai_nvflare>=0.2.3 tensorboard mlflow diff --git a/integration/monai/examples/spleen_ct_segmentation_sim/requirements.txt b/integration/monai/examples/spleen_ct_segmentation_sim/requirements.txt index ff0407a24e..1b0abf8525 100644 --- a/integration/monai/examples/spleen_ct_segmentation_sim/requirements.txt +++ b/integration/monai/examples/spleen_ct_segmentation_sim/requirements.txt @@ -3,7 +3,7 @@ nibabel fire pytorch-ignite>=0.4.10 monai>=1.3.0 -nvflare>=2.3.0 +nvflare~=2.4.0rc monai_nvflare>=0.2.3 tensorboard scikit-image diff --git a/integration/nemo/examples/prompt_learning/requirements.txt b/integration/nemo/examples/prompt_learning/requirements.txt index 3fdbf10587..e4605852b5 100644 --- a/integration/nemo/examples/prompt_learning/requirements.txt +++ b/integration/nemo/examples/prompt_learning/requirements.txt @@ -1 +1 @@ -nvflare>=2.3.0 +nvflare~=2.4.0rc diff --git a/integration/sample/README.md b/integration/sample/README.md index cbe0a1917c..3a5322e40e 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.3.0 +pip3 install nvflare>=2.4.0 diff --git a/research/auto-fed-rl/requirements.txt b/research/auto-fed-rl/requirements.txt index 0804527963..3bbfea441b 100644 --- a/research/auto-fed-rl/requirements.txt +++ b/research/auto-fed-rl/requirements.txt @@ -1,4 +1,4 @@ -nvflare>=2.3.0 +nvflare~=2.4.0rc torch torchvision tensorboard diff --git a/research/fed-ce/requirements.txt b/research/fed-ce/requirements.txt index b7dd1625cf..5757f5b0ea 100644 --- a/research/fed-ce/requirements.txt +++ b/research/fed-ce/requirements.txt @@ -1,4 +1,4 @@ -nvflare>=2.3.0 +nvflare~=2.4.0rc torch torchvision tensorboard diff --git a/research/fed-sm/requirements.txt b/research/fed-sm/requirements.txt index 56ed083280..71feadf756 100644 --- a/research/fed-sm/requirements.txt +++ b/research/fed-sm/requirements.txt @@ -1,4 +1,4 @@ -nvflare>=2.3.0 +nvflare~=2.4.0rc websockets torch torchvision diff --git a/research/one-shot-vfl/requirements.txt b/research/one-shot-vfl/requirements.txt index 2f293a7a7c..0e0eac05ba 100644 --- a/research/one-shot-vfl/requirements.txt +++ b/research/one-shot-vfl/requirements.txt @@ -1,4 +1,4 @@ -nvflare>=2.3.0 +nvflare~=2.4.0rc torch torchvision tensorboard diff --git a/research/quantifying-data-leakage/requirements.txt b/research/quantifying-data-leakage/requirements.txt index 060b0dd44c..b362ba016b 100644 --- a/research/quantifying-data-leakage/requirements.txt +++ b/research/quantifying-data-leakage/requirements.txt @@ -1,4 +1,4 @@ -nvflare>=2.3.0 +nvflare~=2.4.0rc pytorch-ignite>=0.4.10 torchvision monai>=1.0.1