[Fix] Update requirement.txt to install latest torch version in torch…

… workspaces (securefederatedai#1000) * remove unused pt_cnn.py from torch_cnn_histology Signed-off-by: kta-intel <[email protected]> * update validate to validate_task in unet_kvasir plan.yaml Signed-off-by: kta-intel <[email protected]> * update package versions Signed-off-by: kta-intel <[email protected]> --------- Signed-off-by: kta-intel <[email protected]>
ParthMandaliya · Jul 19, 2024 · 37b59b1 · 37b59b1
1 parent 9a47a0f
commit 37b59b1
Show file tree

Hide file tree

Showing 11 changed files with 26 additions and 189 deletions.
diff --git a/openfl-workspace/torch_cnn_histology/requirements.txt b/openfl-workspace/torch_cnn_histology/requirements.txt
@@ -1,2 +1,2 @@
-torchvision==0.18.0 -f https://download.pytorch.org/whl/torch_stable.html
-torch==2.3.0 -f https://download.pytorch.org/whl/torch_stable.html
+torchvision==0.18.1 
+torch==2.3.1 
diff --git a/openfl-workspace/torch_cnn_histology/src/pt_cnn.py b/openfl-workspace/torch_cnn_histology/src/pt_cnn.py
diff --git a/openfl-workspace/torch_cnn_histology_gramine_ready/requirements.txt b/openfl-workspace/torch_cnn_histology_gramine_ready/requirements.txt
@@ -1,3 +1,3 @@
--f https://download.pytorch.org/whl/cpu/torch_stable.html
-torch==1.13.1+cpu
-torchvision==0.14.1+cpu
+--index-url https://download.pytorch.org/whl/cpu
+torch==2.3.1
+torchvision==0.18.1
diff --git a/openfl-workspace/torch_cnn_mnist/requirements.txt b/openfl-workspace/torch_cnn_mnist/requirements.txt
@@ -1,4 +1,4 @@
-torch==1.13.1
-torchvision==0.14.1
+torch==2.3.1
+torchvision==0.18.1
 tensorboard
 wheel>=0.38.0 # not directly required, pinned by Snyk to avoid a vulnerability
diff --git a/openfl-workspace/torch_cnn_mnist_eden_compression/requirements.txt b/openfl-workspace/torch_cnn_mnist_eden_compression/requirements.txt
@@ -1,4 +1,4 @@
-torch==1.13.1
-torchvision==0.14.1
+torch==2.3.1
+torchvision==0.18.1
 tensorboard
 wheel>=0.38.0 # not directly required, pinned by Snyk to avoid a vulnerability
diff --git a/openfl-workspace/torch_cnn_mnist_fed_eval/requirements.txt b/openfl-workspace/torch_cnn_mnist_fed_eval/requirements.txt
@@ -1,4 +1,4 @@
-torch==1.13.1
-torchvision==0.14.1
+torch==2.3.1
+torchvision==0.18.1
 tensorboard
 wheel>=0.38.0 # not directly required, pinned by Snyk to avoid a vulnerability
diff --git a/openfl-workspace/torch_cnn_mnist_straggler_check/requirements.txt b/openfl-workspace/torch_cnn_mnist_straggler_check/requirements.txt
@@ -1,5 +1,5 @@
-torch==1.13.1
-torchvision==0.14.1
+torch==2.3.1
+torchvision==0.18.1
 tensorboard
 numpy>=1.22.2 # not directly required, pinned by Snyk to avoid a vulnerability
 rsa>=4.7 # not directly required, pinned by Snyk to avoid a vulnerability

diff --git a/openfl-workspace/torch_unet_kvasir/plan/plan.yaml b/openfl-workspace/torch_unet_kvasir/plan/plan.yaml
@@ -43,14 +43,14 @@ assigner :
 tasks :
   defaults : plan/defaults/tasks_torch.yaml
   aggregated_model_validation:
-    function  : validate
+    function  : validate_task
     kwargs    :
       apply   : global
       metrics :
       - dice_coef
 
   locally_tuned_model_validation:
-    function  : validate
+    function  : validate_task
     kwargs    :
       apply   : local
       metrics :

diff --git a/openfl-workspace/torch_unet_kvasir/requirements.txt b/openfl-workspace/torch_unet_kvasir/requirements.txt
@@ -1,3 +1,3 @@
-torch==1.13.1
-torchvision==0.14.1
-scikit-image==0.19.3
+torch==2.3.1
+torchvision==0.18.1
+scikit-image==0.24.0
diff --git a/openfl-workspace/torch_unet_kvasir_gramine_ready/plan/plan.yaml b/openfl-workspace/torch_unet_kvasir_gramine_ready/plan/plan.yaml
@@ -44,14 +44,14 @@ assigner :
 tasks :
   defaults : plan/defaults/tasks_torch.yaml
   aggregated_model_validation:
-    function  : validate
+    function  : validate_task
     kwargs    :
       apply   : global
       metrics :
       - dice_coef
 
   locally_tuned_model_validation:
-    function  : validate
+    function  : validate_task
     kwargs    :
       apply   : local
       metrics :

diff --git a/openfl-workspace/torch_unet_kvasir_gramine_ready/requirements.txt b/openfl-workspace/torch_unet_kvasir_gramine_ready/requirements.txt
@@ -1,4 +1,6 @@
--f https://download.pytorch.org/whl/cpu/torch_stable.html
-torch==1.13.1+cpu
-torchvision==0.14.1+cpu
-scikit-image==0.19.3
+scikit-image==0.24.0
+pillow==10.4.0
+
+--extra-index-url https://download.pytorch.org/whl/cpu
+torch==2.3.1
+torchvision==0.18.1