From 8851f45ecb5c026bb7fe862ae202a100c3c95d83 Mon Sep 17 00:00:00 2001
From: Holger Roth <6304754+holgerroth@users.noreply.github.com>
Date: Thu, 10 Oct 2024 17:02:33 -0400
Subject: [PATCH 1/2] FedBPT: Fix fedbpt cma version (#3029)

* fix cma version; upgrade nvflare version

* upgrade python to 3.12
---
 research/fed-bpt/README.md        | 2 +-
 research/fed-bpt/requirements.txt | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/research/fed-bpt/README.md b/research/fed-bpt/README.md
index e32a3ea144..67f63449d6 100644
--- a/research/fed-bpt/README.md
+++ b/research/fed-bpt/README.md
@@ -14,7 +14,7 @@ The models code is copied from the [transformers](https://github.com/huggingface
 We recommend creating a [conda environment](https://www.anaconda.com) following [BBT](https://github.com/txsun1997/Black-Box-Tuning#prepare-your-environment) 
 with the addition of installing NVFlare for running federated learning and some other updates:
 ```commandline
-conda create --name fedbpt python=3.8
+conda create --name fedbpt python=3.12
 conda activate fedbpt
 pip install -r requirements.txt
 ```
diff --git a/research/fed-bpt/requirements.txt b/research/fed-bpt/requirements.txt
index c840dde822..f2757c231f 100644
--- a/research/fed-bpt/requirements.txt
+++ b/research/fed-bpt/requirements.txt
@@ -1,8 +1,9 @@
 transformers==4.38.2
 fastNLP==0.6.0
 datasets
-cma
+cma==3.4.0
 scikit-learn
 tensorboard
 cvxopt
-nvflare~=2.4.1rc
\ No newline at end of file
+nvflare~=2.5.1rc
+

From 791a70bf4370db7538209c716c9626172e33f53a Mon Sep 17 00:00:00 2001
From: Chester Chen <512707+chesterxgchen@users.noreply.github.com>
Date: Thu, 10 Oct 2024 16:42:48 -0700
Subject: [PATCH 2/2] upgrade openmined-psi version (#3020)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Yuan-Ting Hsieh (謝沅廷) <yuantingh@nvidia.com>
---
 .../cifar10-splitnn/requirements.txt                          | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/examples/advanced/vertical_federated_learning/cifar10-splitnn/requirements.txt b/examples/advanced/vertical_federated_learning/cifar10-splitnn/requirements.txt
index 914c7b5958..83c759685b 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.5.0rc
+nvflare~=2.5.0
 torch
 torchvision
 tensorboard
-openmined.psi==1.1.1
+openmined.psi==2.0.5
 pandas