diff --git a/openfl-workspace/torch_cnn_histology/requirements.txt b/openfl-workspace/torch_cnn_histology/requirements.txt index 58b9f15677..241bea49f4 100644 --- a/openfl-workspace/torch_cnn_histology/requirements.txt +++ b/openfl-workspace/torch_cnn_histology/requirements.txt @@ -1,2 +1,3 @@ -torch==2.3.1 -torchvision==0.18.1 +setuptools>=65.5.1 +torch==2.4.1 +torchvision==0.19.1 \ No newline at end of file diff --git a/openfl-workspace/torch_cnn_histology_fedcurv/requirements.txt b/openfl-workspace/torch_cnn_histology_fedcurv/requirements.txt index 58b9f15677..2e87113a01 100644 --- a/openfl-workspace/torch_cnn_histology_fedcurv/requirements.txt +++ b/openfl-workspace/torch_cnn_histology_fedcurv/requirements.txt @@ -1,2 +1,3 @@ -torch==2.3.1 -torchvision==0.18.1 +setuptools>=65.5.1 +torch==2.4.1 +torchvision==0.19.1 diff --git a/openfl-workspace/torch_cnn_mnist/plan/plan.yaml b/openfl-workspace/torch_cnn_mnist/plan/plan.yaml index cae2fd0028..1cf25ab64a 100644 --- a/openfl-workspace/torch_cnn_mnist/plan/plan.yaml +++ b/openfl-workspace/torch_cnn_mnist/plan/plan.yaml @@ -34,8 +34,8 @@ data_loader: batch_size: 64 collaborator_count: 2 template: src.dataloader.PyTorchMNISTInMemory -network : - defaults : plan/defaults/network.yaml +network: + defaults: plan/defaults/network.yaml task_runner: settings: {} template: src.taskrunner.TemplateTaskRunner diff --git a/openfl-workspace/torch_cnn_mnist/requirements.txt b/openfl-workspace/torch_cnn_mnist/requirements.txt index 62c8356720..241bea49f4 100644 --- a/openfl-workspace/torch_cnn_mnist/requirements.txt +++ b/openfl-workspace/torch_cnn_mnist/requirements.txt @@ -1,2 +1,3 @@ -torch==2.3.1 -torchvision==0.18.1 +setuptools>=65.5.1 +torch==2.4.1 +torchvision==0.19.1 \ No newline at end of file diff --git a/openfl-workspace/torch_cnn_mnist_eden_compression/requirements.txt b/openfl-workspace/torch_cnn_mnist_eden_compression/requirements.txt index 8b084abb8f..2dbd508654 100644 --- a/openfl-workspace/torch_cnn_mnist_eden_compression/requirements.txt +++ b/openfl-workspace/torch_cnn_mnist_eden_compression/requirements.txt @@ -1,4 +1,5 @@ +setuptools>=65.5.1 tensorboard -torch==2.3.1 -torchvision==0.18.1 +torch==2.4.1 +torchvision==0.19.1 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 index 8b084abb8f..2dbd508654 100644 --- a/openfl-workspace/torch_cnn_mnist_fed_eval/requirements.txt +++ b/openfl-workspace/torch_cnn_mnist_fed_eval/requirements.txt @@ -1,4 +1,5 @@ +setuptools>=65.5.1 tensorboard -torch==2.3.1 -torchvision==0.18.1 +torch==2.4.1 +torchvision==0.19.1 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 index a85a139705..fc4c47d516 100644 --- a/openfl-workspace/torch_cnn_mnist_straggler_check/requirements.txt +++ b/openfl-workspace/torch_cnn_mnist_straggler_check/requirements.txt @@ -1,7 +1,7 @@ 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 -setuptools>=65.5.1 # not directly required, pinned by Snyk to avoid a vulnerability +setuptools>=65.5.1 tensorboard -torch==2.3.1 -torchvision==0.18.1 +torch==2.4.1 +torchvision==0.19.1 wheel>=0.38.0 # not directly required, pinned by Snyk to avoid a vulnerability diff --git a/openfl-workspace/torch_llm_horovod/requirements.txt b/openfl-workspace/torch_llm_horovod/requirements.txt index aa6b5f68e8..63b7bc9f72 100644 --- a/openfl-workspace/torch_llm_horovod/requirements.txt +++ b/openfl-workspace/torch_llm_horovod/requirements.txt @@ -1,3 +1,4 @@ +setuptools>=65.5.1 accelerate datasets evaluate @@ -8,7 +9,7 @@ peft sentencepiece seqeval tensorboard -torch -torchvision +torch==2.4.1 +torchvision==0.19.1 transformers[torch] wheel>=0.38.0 # not directly required, pinned by Snyk to avoid a vulnerability diff --git a/openfl-workspace/torch_template/requirements.txt b/openfl-workspace/torch_template/requirements.txt index 8530fda990..3b0bc9433a 100644 --- a/openfl-workspace/torch_template/requirements.txt +++ b/openfl-workspace/torch_template/requirements.txt @@ -1,3 +1,4 @@ # Set your workspace's requirements here -torch -torchvision +setuptools>=65.5.1 +torch==2.4.1 +torchvision==0.19.1 diff --git a/openfl-workspace/torch_unet_kvasir/requirements.txt b/openfl-workspace/torch_unet_kvasir/requirements.txt index a08b005418..073013d389 100644 --- a/openfl-workspace/torch_unet_kvasir/requirements.txt +++ b/openfl-workspace/torch_unet_kvasir/requirements.txt @@ -1,3 +1,4 @@ +setuptools>=65.5.1 scikit-image==0.24.0 -torch==2.3.1 -torchvision==0.18.1 +torch==2.4.1 +torchvision==0.19.1 diff --git a/openfl/federated/__init__.py b/openfl/federated/__init__.py index 9a47b60633..1e01b03986 100644 --- a/openfl/federated/__init__.py +++ b/openfl/federated/__init__.py @@ -4,6 +4,7 @@ """openfl.federated package.""" +import os from importlib import util from openfl.federated.data import DataLoader # NOQA @@ -16,6 +17,7 @@ from openfl.federated.task import FederatedModel # NOQA from openfl.federated.task import KerasTaskRunner if util.find_spec("torch") is not None: + os.environ["SETUPTOOLS_USE_DISTUTILS"] = "stdlib" from openfl.federated.data import FederatedDataSet # NOQA from openfl.federated.data import PyTorchDataLoader from openfl.federated.task import FederatedModel # NOQA