From 71e4f5dbaff11e26abdd0f67730faac56098f016 Mon Sep 17 00:00:00 2001 From: yes Date: Tue, 22 Apr 2025 04:23:58 -0700 Subject: [PATCH 1/8] torch version update Signed-off-by: yes --- .../301_MNIST_Watermarking/Bangalore/requirements.txt | 4 ++-- .../301_MNIST_Watermarking/Chandler/requirements.txt | 4 ++-- .../workflow/Global_DP/requirements_global_dp.txt | 4 ++-- .../workflow/Privacy_Meter/requirements_privacy_meter.txt | 4 ++-- .../experimental/workflow/workflow_interface_requirements.txt | 4 ++-- openfl-workspace/torch/histology/requirements.txt | 4 ++-- openfl-workspace/torch/histology_fedcurv/requirements.txt | 4 ++-- openfl-workspace/torch/mnist/requirements.txt | 4 ++-- .../torch/mnist_eden_compression/requirements.txt | 4 ++-- openfl-workspace/torch/mnist_fed_eval/requirements.txt | 4 ++-- openfl-workspace/torch/mnist_straggler_check/requirements.txt | 4 ++-- openfl-workspace/torch/template/requirements.txt | 4 ++-- test-requirements.txt | 2 +- .../testcase_internalloop/requirements.txt | 4 ++-- .../testcase_private_attributes/requirements.txt | 4 ++-- .../requirements.txt | 4 ++-- .../requirements.txt | 4 ++-- .../testcase_reference/requirements.txt | 4 ++-- .../testcase_reference_with_include_exclude/requirements.txt | 4 ++-- .../testcase_validate_particpant_names/requirements.txt | 4 ++-- 20 files changed, 39 insertions(+), 39 deletions(-) diff --git a/openfl-tutorials/experimental/workflow/FederatedRuntime/301_MNIST_Watermarking/Bangalore/requirements.txt b/openfl-tutorials/experimental/workflow/FederatedRuntime/301_MNIST_Watermarking/Bangalore/requirements.txt index 3a478314e8..480976dc35 100644 --- a/openfl-tutorials/experimental/workflow/FederatedRuntime/301_MNIST_Watermarking/Bangalore/requirements.txt +++ b/openfl-tutorials/experimental/workflow/FederatedRuntime/301_MNIST_Watermarking/Bangalore/requirements.txt @@ -3,6 +3,6 @@ numpy>=1.13.3 openfl>=1.2.1 scikit-learn>=0.24.1 setuptools>=65.5.1 # not directly required, pinned by Snyk to avoid a vulnerability -torch==2.3.1 -torchvision==0.18.1 +torch==2.6.0 +torchvision==0.21.0 wheel>=0.38.0 # not directly required, pinned by Snyk to avoid a vulnerability diff --git a/openfl-tutorials/experimental/workflow/FederatedRuntime/301_MNIST_Watermarking/Chandler/requirements.txt b/openfl-tutorials/experimental/workflow/FederatedRuntime/301_MNIST_Watermarking/Chandler/requirements.txt index 3a478314e8..480976dc35 100644 --- a/openfl-tutorials/experimental/workflow/FederatedRuntime/301_MNIST_Watermarking/Chandler/requirements.txt +++ b/openfl-tutorials/experimental/workflow/FederatedRuntime/301_MNIST_Watermarking/Chandler/requirements.txt @@ -3,6 +3,6 @@ numpy>=1.13.3 openfl>=1.2.1 scikit-learn>=0.24.1 setuptools>=65.5.1 # not directly required, pinned by Snyk to avoid a vulnerability -torch==2.3.1 -torchvision==0.18.1 +torch==2.6.0 +torchvision==0.21.0 wheel>=0.38.0 # not directly required, pinned by Snyk to avoid a vulnerability diff --git a/openfl-tutorials/experimental/workflow/Global_DP/requirements_global_dp.txt b/openfl-tutorials/experimental/workflow/Global_DP/requirements_global_dp.txt index f5118684aa..73a1a0db8f 100644 --- a/openfl-tutorials/experimental/workflow/Global_DP/requirements_global_dp.txt +++ b/openfl-tutorials/experimental/workflow/Global_DP/requirements_global_dp.txt @@ -4,6 +4,6 @@ numpy==1.23.3 opacus==1.5.1 pillow==10.3.0 pyyaml==6.0 -torch==2.2.0 +torch==2.6.0 +torchvision==0.21.0 torchaudio==2.2.0 -torchvision==0.17.0 diff --git a/openfl-tutorials/experimental/workflow/Privacy_Meter/requirements_privacy_meter.txt b/openfl-tutorials/experimental/workflow/Privacy_Meter/requirements_privacy_meter.txt index c617e3a732..9bb32efb6f 100644 --- a/openfl-tutorials/experimental/workflow/Privacy_Meter/requirements_privacy_meter.txt +++ b/openfl-tutorials/experimental/workflow/Privacy_Meter/requirements_privacy_meter.txt @@ -4,5 +4,5 @@ matplotlib opacus==1.5.2 pillow scikit-learn -torch==2.3.1 -torchvision==0.18.1 \ No newline at end of file +torch==2.6.0 +torchvision==0.21.0 \ No newline at end of file diff --git a/openfl-tutorials/experimental/workflow/workflow_interface_requirements.txt b/openfl-tutorials/experimental/workflow/workflow_interface_requirements.txt index 9d6a8843f7..5098745828 100644 --- a/openfl-tutorials/experimental/workflow/workflow_interface_requirements.txt +++ b/openfl-tutorials/experimental/workflow/workflow_interface_requirements.txt @@ -7,5 +7,5 @@ nbdev==2.3.37 nbformat==5.10.4 ray==2.43.0 tabulate==0.9.0 -torch==2.3.1 -torchvision==0.18.1 +torch==2.6.0 +torchvision==0.21.0 diff --git a/openfl-workspace/torch/histology/requirements.txt b/openfl-workspace/torch/histology/requirements.txt index 241bea49f4..84559847eb 100644 --- a/openfl-workspace/torch/histology/requirements.txt +++ b/openfl-workspace/torch/histology/requirements.txt @@ -1,3 +1,3 @@ setuptools>=65.5.1 -torch==2.4.1 -torchvision==0.19.1 \ No newline at end of file +torch==2.6.0 +torchvision==0.21.0 \ No newline at end of file diff --git a/openfl-workspace/torch/histology_fedcurv/requirements.txt b/openfl-workspace/torch/histology_fedcurv/requirements.txt index 241bea49f4..84559847eb 100644 --- a/openfl-workspace/torch/histology_fedcurv/requirements.txt +++ b/openfl-workspace/torch/histology_fedcurv/requirements.txt @@ -1,3 +1,3 @@ setuptools>=65.5.1 -torch==2.4.1 -torchvision==0.19.1 \ No newline at end of file +torch==2.6.0 +torchvision==0.21.0 \ No newline at end of file diff --git a/openfl-workspace/torch/mnist/requirements.txt b/openfl-workspace/torch/mnist/requirements.txt index 241bea49f4..84559847eb 100644 --- a/openfl-workspace/torch/mnist/requirements.txt +++ b/openfl-workspace/torch/mnist/requirements.txt @@ -1,3 +1,3 @@ setuptools>=65.5.1 -torch==2.4.1 -torchvision==0.19.1 \ No newline at end of file +torch==2.6.0 +torchvision==0.21.0 \ No newline at end of file diff --git a/openfl-workspace/torch/mnist_eden_compression/requirements.txt b/openfl-workspace/torch/mnist_eden_compression/requirements.txt index 786c4801c2..bbedd3a332 100644 --- a/openfl-workspace/torch/mnist_eden_compression/requirements.txt +++ b/openfl-workspace/torch/mnist_eden_compression/requirements.txt @@ -1,5 +1,5 @@ setuptools>=65.5.1 tensorboard -torch==2.4.1 -torchvision==0.19.1 +torch==2.6.0 +torchvision==0.21.0 wheel>=0.38.0 # not directly required, pinned by Snyk to avoid a vulnerability \ No newline at end of file diff --git a/openfl-workspace/torch/mnist_fed_eval/requirements.txt b/openfl-workspace/torch/mnist_fed_eval/requirements.txt index edce0d704d..88d06e1b09 100644 --- a/openfl-workspace/torch/mnist_fed_eval/requirements.txt +++ b/openfl-workspace/torch/mnist_fed_eval/requirements.txt @@ -1,5 +1,5 @@ setuptools>=65.5.1 tensorboard -torch==2.4.1 -torchvision==0.19.1 +torch==2.6.0 +torchvision==0.21.0 wheel>=0.38.0 # not directly required, pinned by Snyk to avoid a vulnerability \ No newline at end of file diff --git a/openfl-workspace/torch/mnist_straggler_check/requirements.txt b/openfl-workspace/torch/mnist_straggler_check/requirements.txt index 5238b15a47..8edcd6224a 100644 --- a/openfl-workspace/torch/mnist_straggler_check/requirements.txt +++ b/openfl-workspace/torch/mnist_straggler_check/requirements.txt @@ -2,6 +2,6 @@ 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 tensorboard -torch==2.4.1 -torchvision==0.19.1 +torch==2.6.0 +torchvision==0.21.0 wheel>=0.38.0 # not directly required, pinned by Snyk to avoid a vulnerability \ No newline at end of file diff --git a/openfl-workspace/torch/template/requirements.txt b/openfl-workspace/torch/template/requirements.txt index 3b0bc9433a..92879a8091 100644 --- a/openfl-workspace/torch/template/requirements.txt +++ b/openfl-workspace/torch/template/requirements.txt @@ -1,4 +1,4 @@ # Set your workspace's requirements here setuptools>=65.5.1 -torch==2.4.1 -torchvision==0.19.1 +torch==2.6.0 +torchvision==0.21.0 diff --git a/test-requirements.txt b/test-requirements.txt index faff7e2bd3..66e0820332 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -9,4 +9,4 @@ matplotlib==3.10.1 fpdf2==2.8.2 papermill==2.6.0 pyfakefs==5.8.0 -torch==2.4.1 +torch==2.6.0 diff --git a/tests/github/experimental/workflow/AggregatorBasedWorkflow/testcase_internalloop/requirements.txt b/tests/github/experimental/workflow/AggregatorBasedWorkflow/testcase_internalloop/requirements.txt index 8b084abb8f..f21b84c3af 100644 --- a/tests/github/experimental/workflow/AggregatorBasedWorkflow/testcase_internalloop/requirements.txt +++ b/tests/github/experimental/workflow/AggregatorBasedWorkflow/testcase_internalloop/requirements.txt @@ -1,4 +1,4 @@ tensorboard -torch==2.3.1 -torchvision==0.18.1 +torch==2.6.0 +torchvision==0.21.0 wheel>=0.38.0 # not directly required, pinned by Snyk to avoid a vulnerability diff --git a/tests/github/experimental/workflow/AggregatorBasedWorkflow/testcase_private_attributes/requirements.txt b/tests/github/experimental/workflow/AggregatorBasedWorkflow/testcase_private_attributes/requirements.txt index 8b084abb8f..f21b84c3af 100644 --- a/tests/github/experimental/workflow/AggregatorBasedWorkflow/testcase_private_attributes/requirements.txt +++ b/tests/github/experimental/workflow/AggregatorBasedWorkflow/testcase_private_attributes/requirements.txt @@ -1,4 +1,4 @@ tensorboard -torch==2.3.1 -torchvision==0.18.1 +torch==2.6.0 +torchvision==0.21.0 wheel>=0.38.0 # not directly required, pinned by Snyk to avoid a vulnerability diff --git a/tests/github/experimental/workflow/AggregatorBasedWorkflow/testcase_private_attributes_initialization_with_both_options/requirements.txt b/tests/github/experimental/workflow/AggregatorBasedWorkflow/testcase_private_attributes_initialization_with_both_options/requirements.txt index 8b084abb8f..f21b84c3af 100644 --- a/tests/github/experimental/workflow/AggregatorBasedWorkflow/testcase_private_attributes_initialization_with_both_options/requirements.txt +++ b/tests/github/experimental/workflow/AggregatorBasedWorkflow/testcase_private_attributes_initialization_with_both_options/requirements.txt @@ -1,4 +1,4 @@ tensorboard -torch==2.3.1 -torchvision==0.18.1 +torch==2.6.0 +torchvision==0.21.0 wheel>=0.38.0 # not directly required, pinned by Snyk to avoid a vulnerability diff --git a/tests/github/experimental/workflow/AggregatorBasedWorkflow/testcase_private_attributes_initialization_without_callable/requirements.txt b/tests/github/experimental/workflow/AggregatorBasedWorkflow/testcase_private_attributes_initialization_without_callable/requirements.txt index 8b084abb8f..f21b84c3af 100644 --- a/tests/github/experimental/workflow/AggregatorBasedWorkflow/testcase_private_attributes_initialization_without_callable/requirements.txt +++ b/tests/github/experimental/workflow/AggregatorBasedWorkflow/testcase_private_attributes_initialization_without_callable/requirements.txt @@ -1,4 +1,4 @@ tensorboard -torch==2.3.1 -torchvision==0.18.1 +torch==2.6.0 +torchvision==0.21.0 wheel>=0.38.0 # not directly required, pinned by Snyk to avoid a vulnerability diff --git a/tests/github/experimental/workflow/AggregatorBasedWorkflow/testcase_reference/requirements.txt b/tests/github/experimental/workflow/AggregatorBasedWorkflow/testcase_reference/requirements.txt index 8b084abb8f..f21b84c3af 100644 --- a/tests/github/experimental/workflow/AggregatorBasedWorkflow/testcase_reference/requirements.txt +++ b/tests/github/experimental/workflow/AggregatorBasedWorkflow/testcase_reference/requirements.txt @@ -1,4 +1,4 @@ tensorboard -torch==2.3.1 -torchvision==0.18.1 +torch==2.6.0 +torchvision==0.21.0 wheel>=0.38.0 # not directly required, pinned by Snyk to avoid a vulnerability diff --git a/tests/github/experimental/workflow/AggregatorBasedWorkflow/testcase_reference_with_include_exclude/requirements.txt b/tests/github/experimental/workflow/AggregatorBasedWorkflow/testcase_reference_with_include_exclude/requirements.txt index 8b084abb8f..f21b84c3af 100644 --- a/tests/github/experimental/workflow/AggregatorBasedWorkflow/testcase_reference_with_include_exclude/requirements.txt +++ b/tests/github/experimental/workflow/AggregatorBasedWorkflow/testcase_reference_with_include_exclude/requirements.txt @@ -1,4 +1,4 @@ tensorboard -torch==2.3.1 -torchvision==0.18.1 +torch==2.6.0 +torchvision==0.21.0 wheel>=0.38.0 # not directly required, pinned by Snyk to avoid a vulnerability diff --git a/tests/github/experimental/workflow/AggregatorBasedWorkflow/testcase_validate_particpant_names/requirements.txt b/tests/github/experimental/workflow/AggregatorBasedWorkflow/testcase_validate_particpant_names/requirements.txt index 8b084abb8f..f21b84c3af 100644 --- a/tests/github/experimental/workflow/AggregatorBasedWorkflow/testcase_validate_particpant_names/requirements.txt +++ b/tests/github/experimental/workflow/AggregatorBasedWorkflow/testcase_validate_particpant_names/requirements.txt @@ -1,4 +1,4 @@ tensorboard -torch==2.3.1 -torchvision==0.18.1 +torch==2.6.0 +torchvision==0.21.0 wheel>=0.38.0 # not directly required, pinned by Snyk to avoid a vulnerability From 214da965ea872c2b1d1b3a0286ec5d4901915a21 Mon Sep 17 00:00:00 2001 From: yes Date: Tue, 22 Apr 2025 05:04:01 -0700 Subject: [PATCH 2/8] pip version update Signed-off-by: yes --- .github/actions/tr_pre_test_run/action.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/actions/tr_pre_test_run/action.yml b/.github/actions/tr_pre_test_run/action.yml index 2949a5e8cc..8c942fc566 100644 --- a/.github/actions/tr_pre_test_run/action.yml +++ b/.github/actions/tr_pre_test_run/action.yml @@ -16,7 +16,7 @@ runs: - name: Install dependencies id: install_dependencies run: | - python -m pip install --upgrade pip + python -m pip install --upgrade pip==24.1.2 pip install . pip install -r test-requirements.txt shell: bash From 2a075b7399cc91665e6498f56f74c31d26ffbb62 Mon Sep 17 00:00:00 2001 From: yes Date: Tue, 22 Apr 2025 05:16:23 -0700 Subject: [PATCH 3/8] pip version update Signed-off-by: yes --- .github/workflows/windows.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 14e9482901..c7b71a87d4 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -66,7 +66,7 @@ jobs: python-version: "3.10" - name: Install dependencies run: | - python -m pip install --upgrade pip + python -m pip install --upgrade pip==24.1.2 pip install . - name: Test TaskRunner API with Eden Compression run: | @@ -84,7 +84,7 @@ jobs: python-version: "3.10" - name: Install dependencies run: | - python -m pip install --upgrade pip + python -m pip install --upgrade pip==24.1.2 pip install . - name: Test Straggler Handling Interface run: | From ff50f721d69e0862b3e4f3c5cc79ba7c67c7a5a8 Mon Sep 17 00:00:00 2001 From: yes Date: Wed, 23 Apr 2025 23:30:55 -0700 Subject: [PATCH 4/8] update ti 2.7.0 Signed-off-by: yes --- .github/actions/tr_pre_test_run/action.yml | 2 +- .github/workflows/windows.yml | 4 ++-- .../301_MNIST_Watermarking/Bangalore/requirements.txt | 4 ++-- .../301_MNIST_Watermarking/Chandler/requirements.txt | 4 ++-- .../workflow/Global_DP/requirements_global_dp.txt | 4 ++-- .../workflow/Privacy_Meter/requirements_privacy_meter.txt | 4 ++-- .../experimental/workflow/workflow_interface_requirements.txt | 4 ++-- openfl-workspace/keras/torch/mnist/requirements.txt | 4 ++-- openfl-workspace/torch/histology/requirements.txt | 4 ++-- openfl-workspace/torch/histology_fedcurv/requirements.txt | 4 ++-- openfl-workspace/torch/mnist/requirements.txt | 4 ++-- .../torch/mnist_eden_compression/requirements.txt | 4 ++-- openfl-workspace/torch/mnist_fed_eval/requirements.txt | 4 ++-- openfl-workspace/torch/mnist_straggler_check/requirements.txt | 4 ++-- openfl-workspace/torch/template/requirements.txt | 4 ++-- test-requirements.txt | 2 +- .../testcase_internalloop/requirements.txt | 4 ++-- .../testcase_private_attributes/requirements.txt | 4 ++-- .../requirements.txt | 4 ++-- .../requirements.txt | 4 ++-- .../testcase_reference/requirements.txt | 4 ++-- .../testcase_reference_with_include_exclude/requirements.txt | 4 ++-- .../testcase_validate_particpant_names/requirements.txt | 4 ++-- 23 files changed, 44 insertions(+), 44 deletions(-) diff --git a/.github/actions/tr_pre_test_run/action.yml b/.github/actions/tr_pre_test_run/action.yml index 8c942fc566..2949a5e8cc 100644 --- a/.github/actions/tr_pre_test_run/action.yml +++ b/.github/actions/tr_pre_test_run/action.yml @@ -16,7 +16,7 @@ runs: - name: Install dependencies id: install_dependencies run: | - python -m pip install --upgrade pip==24.1.2 + python -m pip install --upgrade pip pip install . pip install -r test-requirements.txt shell: bash diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index c7b71a87d4..14e9482901 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -66,7 +66,7 @@ jobs: python-version: "3.10" - name: Install dependencies run: | - python -m pip install --upgrade pip==24.1.2 + python -m pip install --upgrade pip pip install . - name: Test TaskRunner API with Eden Compression run: | @@ -84,7 +84,7 @@ jobs: python-version: "3.10" - name: Install dependencies run: | - python -m pip install --upgrade pip==24.1.2 + python -m pip install --upgrade pip pip install . - name: Test Straggler Handling Interface run: | diff --git a/openfl-tutorials/experimental/workflow/FederatedRuntime/301_MNIST_Watermarking/Bangalore/requirements.txt b/openfl-tutorials/experimental/workflow/FederatedRuntime/301_MNIST_Watermarking/Bangalore/requirements.txt index 480976dc35..976f84c066 100644 --- a/openfl-tutorials/experimental/workflow/FederatedRuntime/301_MNIST_Watermarking/Bangalore/requirements.txt +++ b/openfl-tutorials/experimental/workflow/FederatedRuntime/301_MNIST_Watermarking/Bangalore/requirements.txt @@ -3,6 +3,6 @@ numpy>=1.13.3 openfl>=1.2.1 scikit-learn>=0.24.1 setuptools>=65.5.1 # not directly required, pinned by Snyk to avoid a vulnerability -torch==2.6.0 -torchvision==0.21.0 +torch==2.7.0 +torchvision==0.22.0 wheel>=0.38.0 # not directly required, pinned by Snyk to avoid a vulnerability diff --git a/openfl-tutorials/experimental/workflow/FederatedRuntime/301_MNIST_Watermarking/Chandler/requirements.txt b/openfl-tutorials/experimental/workflow/FederatedRuntime/301_MNIST_Watermarking/Chandler/requirements.txt index 480976dc35..976f84c066 100644 --- a/openfl-tutorials/experimental/workflow/FederatedRuntime/301_MNIST_Watermarking/Chandler/requirements.txt +++ b/openfl-tutorials/experimental/workflow/FederatedRuntime/301_MNIST_Watermarking/Chandler/requirements.txt @@ -3,6 +3,6 @@ numpy>=1.13.3 openfl>=1.2.1 scikit-learn>=0.24.1 setuptools>=65.5.1 # not directly required, pinned by Snyk to avoid a vulnerability -torch==2.6.0 -torchvision==0.21.0 +torch==2.7.0 +torchvision==0.22.0 wheel>=0.38.0 # not directly required, pinned by Snyk to avoid a vulnerability diff --git a/openfl-tutorials/experimental/workflow/Global_DP/requirements_global_dp.txt b/openfl-tutorials/experimental/workflow/Global_DP/requirements_global_dp.txt index 73a1a0db8f..5b1bf5a27e 100644 --- a/openfl-tutorials/experimental/workflow/Global_DP/requirements_global_dp.txt +++ b/openfl-tutorials/experimental/workflow/Global_DP/requirements_global_dp.txt @@ -4,6 +4,6 @@ numpy==1.23.3 opacus==1.5.1 pillow==10.3.0 pyyaml==6.0 -torch==2.6.0 -torchvision==0.21.0 +torch==2.7.0 +torchvision==0.22.0 torchaudio==2.2.0 diff --git a/openfl-tutorials/experimental/workflow/Privacy_Meter/requirements_privacy_meter.txt b/openfl-tutorials/experimental/workflow/Privacy_Meter/requirements_privacy_meter.txt index 9bb32efb6f..3817f03738 100644 --- a/openfl-tutorials/experimental/workflow/Privacy_Meter/requirements_privacy_meter.txt +++ b/openfl-tutorials/experimental/workflow/Privacy_Meter/requirements_privacy_meter.txt @@ -4,5 +4,5 @@ matplotlib opacus==1.5.2 pillow scikit-learn -torch==2.6.0 -torchvision==0.21.0 \ No newline at end of file +torch==2.7.0 +torchvision==0.22.0 \ No newline at end of file diff --git a/openfl-tutorials/experimental/workflow/workflow_interface_requirements.txt b/openfl-tutorials/experimental/workflow/workflow_interface_requirements.txt index 5098745828..031f62e022 100644 --- a/openfl-tutorials/experimental/workflow/workflow_interface_requirements.txt +++ b/openfl-tutorials/experimental/workflow/workflow_interface_requirements.txt @@ -7,5 +7,5 @@ nbdev==2.3.37 nbformat==5.10.4 ray==2.43.0 tabulate==0.9.0 -torch==2.6.0 -torchvision==0.21.0 +torch==2.7.0 +torchvision==0.22.0 diff --git a/openfl-workspace/keras/torch/mnist/requirements.txt b/openfl-workspace/keras/torch/mnist/requirements.txt index 3e105f3d5b..edb3597b21 100644 --- a/openfl-workspace/keras/torch/mnist/requirements.txt +++ b/openfl-workspace/keras/torch/mnist/requirements.txt @@ -1,5 +1,5 @@ keras==3.9.0 -torch==2.6.0 +torch==2.7.0 torch-xla==2.6.0 -torchvision==0.21.0 +torchvision==0.22.0 tensorflow==2.18.0 \ No newline at end of file diff --git a/openfl-workspace/torch/histology/requirements.txt b/openfl-workspace/torch/histology/requirements.txt index 84559847eb..0e3e5542f9 100644 --- a/openfl-workspace/torch/histology/requirements.txt +++ b/openfl-workspace/torch/histology/requirements.txt @@ -1,3 +1,3 @@ setuptools>=65.5.1 -torch==2.6.0 -torchvision==0.21.0 \ No newline at end of file +torch==2.7.0 +torchvision==0.22.0 \ No newline at end of file diff --git a/openfl-workspace/torch/histology_fedcurv/requirements.txt b/openfl-workspace/torch/histology_fedcurv/requirements.txt index 84559847eb..0e3e5542f9 100644 --- a/openfl-workspace/torch/histology_fedcurv/requirements.txt +++ b/openfl-workspace/torch/histology_fedcurv/requirements.txt @@ -1,3 +1,3 @@ setuptools>=65.5.1 -torch==2.6.0 -torchvision==0.21.0 \ No newline at end of file +torch==2.7.0 +torchvision==0.22.0 \ No newline at end of file diff --git a/openfl-workspace/torch/mnist/requirements.txt b/openfl-workspace/torch/mnist/requirements.txt index 84559847eb..0e3e5542f9 100644 --- a/openfl-workspace/torch/mnist/requirements.txt +++ b/openfl-workspace/torch/mnist/requirements.txt @@ -1,3 +1,3 @@ setuptools>=65.5.1 -torch==2.6.0 -torchvision==0.21.0 \ No newline at end of file +torch==2.7.0 +torchvision==0.22.0 \ No newline at end of file diff --git a/openfl-workspace/torch/mnist_eden_compression/requirements.txt b/openfl-workspace/torch/mnist_eden_compression/requirements.txt index bbedd3a332..93853a3970 100644 --- a/openfl-workspace/torch/mnist_eden_compression/requirements.txt +++ b/openfl-workspace/torch/mnist_eden_compression/requirements.txt @@ -1,5 +1,5 @@ setuptools>=65.5.1 tensorboard -torch==2.6.0 -torchvision==0.21.0 +torch==2.7.0 +torchvision==0.22.0 wheel>=0.38.0 # not directly required, pinned by Snyk to avoid a vulnerability \ No newline at end of file diff --git a/openfl-workspace/torch/mnist_fed_eval/requirements.txt b/openfl-workspace/torch/mnist_fed_eval/requirements.txt index 88d06e1b09..af70a604c2 100644 --- a/openfl-workspace/torch/mnist_fed_eval/requirements.txt +++ b/openfl-workspace/torch/mnist_fed_eval/requirements.txt @@ -1,5 +1,5 @@ setuptools>=65.5.1 tensorboard -torch==2.6.0 -torchvision==0.21.0 +torch==2.7.0 +torchvision==0.22.0 wheel>=0.38.0 # not directly required, pinned by Snyk to avoid a vulnerability \ No newline at end of file diff --git a/openfl-workspace/torch/mnist_straggler_check/requirements.txt b/openfl-workspace/torch/mnist_straggler_check/requirements.txt index 8edcd6224a..f6463c65bf 100644 --- a/openfl-workspace/torch/mnist_straggler_check/requirements.txt +++ b/openfl-workspace/torch/mnist_straggler_check/requirements.txt @@ -2,6 +2,6 @@ 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 tensorboard -torch==2.6.0 -torchvision==0.21.0 +torch==2.7.0 +torchvision==0.22.0 wheel>=0.38.0 # not directly required, pinned by Snyk to avoid a vulnerability \ No newline at end of file diff --git a/openfl-workspace/torch/template/requirements.txt b/openfl-workspace/torch/template/requirements.txt index 92879a8091..908f007b5d 100644 --- a/openfl-workspace/torch/template/requirements.txt +++ b/openfl-workspace/torch/template/requirements.txt @@ -1,4 +1,4 @@ # Set your workspace's requirements here setuptools>=65.5.1 -torch==2.6.0 -torchvision==0.21.0 +torch==2.7.0 +torchvision==0.22.0 diff --git a/test-requirements.txt b/test-requirements.txt index 66e0820332..cecbf7ba7c 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -9,4 +9,4 @@ matplotlib==3.10.1 fpdf2==2.8.2 papermill==2.6.0 pyfakefs==5.8.0 -torch==2.6.0 +torch==2.7.0 diff --git a/tests/github/experimental/workflow/AggregatorBasedWorkflow/testcase_internalloop/requirements.txt b/tests/github/experimental/workflow/AggregatorBasedWorkflow/testcase_internalloop/requirements.txt index f21b84c3af..eed2cfcfea 100644 --- a/tests/github/experimental/workflow/AggregatorBasedWorkflow/testcase_internalloop/requirements.txt +++ b/tests/github/experimental/workflow/AggregatorBasedWorkflow/testcase_internalloop/requirements.txt @@ -1,4 +1,4 @@ tensorboard -torch==2.6.0 -torchvision==0.21.0 +torch==2.7.0 +torchvision==0.22.0 wheel>=0.38.0 # not directly required, pinned by Snyk to avoid a vulnerability diff --git a/tests/github/experimental/workflow/AggregatorBasedWorkflow/testcase_private_attributes/requirements.txt b/tests/github/experimental/workflow/AggregatorBasedWorkflow/testcase_private_attributes/requirements.txt index f21b84c3af..eed2cfcfea 100644 --- a/tests/github/experimental/workflow/AggregatorBasedWorkflow/testcase_private_attributes/requirements.txt +++ b/tests/github/experimental/workflow/AggregatorBasedWorkflow/testcase_private_attributes/requirements.txt @@ -1,4 +1,4 @@ tensorboard -torch==2.6.0 -torchvision==0.21.0 +torch==2.7.0 +torchvision==0.22.0 wheel>=0.38.0 # not directly required, pinned by Snyk to avoid a vulnerability diff --git a/tests/github/experimental/workflow/AggregatorBasedWorkflow/testcase_private_attributes_initialization_with_both_options/requirements.txt b/tests/github/experimental/workflow/AggregatorBasedWorkflow/testcase_private_attributes_initialization_with_both_options/requirements.txt index f21b84c3af..eed2cfcfea 100644 --- a/tests/github/experimental/workflow/AggregatorBasedWorkflow/testcase_private_attributes_initialization_with_both_options/requirements.txt +++ b/tests/github/experimental/workflow/AggregatorBasedWorkflow/testcase_private_attributes_initialization_with_both_options/requirements.txt @@ -1,4 +1,4 @@ tensorboard -torch==2.6.0 -torchvision==0.21.0 +torch==2.7.0 +torchvision==0.22.0 wheel>=0.38.0 # not directly required, pinned by Snyk to avoid a vulnerability diff --git a/tests/github/experimental/workflow/AggregatorBasedWorkflow/testcase_private_attributes_initialization_without_callable/requirements.txt b/tests/github/experimental/workflow/AggregatorBasedWorkflow/testcase_private_attributes_initialization_without_callable/requirements.txt index f21b84c3af..eed2cfcfea 100644 --- a/tests/github/experimental/workflow/AggregatorBasedWorkflow/testcase_private_attributes_initialization_without_callable/requirements.txt +++ b/tests/github/experimental/workflow/AggregatorBasedWorkflow/testcase_private_attributes_initialization_without_callable/requirements.txt @@ -1,4 +1,4 @@ tensorboard -torch==2.6.0 -torchvision==0.21.0 +torch==2.7.0 +torchvision==0.22.0 wheel>=0.38.0 # not directly required, pinned by Snyk to avoid a vulnerability diff --git a/tests/github/experimental/workflow/AggregatorBasedWorkflow/testcase_reference/requirements.txt b/tests/github/experimental/workflow/AggregatorBasedWorkflow/testcase_reference/requirements.txt index f21b84c3af..eed2cfcfea 100644 --- a/tests/github/experimental/workflow/AggregatorBasedWorkflow/testcase_reference/requirements.txt +++ b/tests/github/experimental/workflow/AggregatorBasedWorkflow/testcase_reference/requirements.txt @@ -1,4 +1,4 @@ tensorboard -torch==2.6.0 -torchvision==0.21.0 +torch==2.7.0 +torchvision==0.22.0 wheel>=0.38.0 # not directly required, pinned by Snyk to avoid a vulnerability diff --git a/tests/github/experimental/workflow/AggregatorBasedWorkflow/testcase_reference_with_include_exclude/requirements.txt b/tests/github/experimental/workflow/AggregatorBasedWorkflow/testcase_reference_with_include_exclude/requirements.txt index f21b84c3af..eed2cfcfea 100644 --- a/tests/github/experimental/workflow/AggregatorBasedWorkflow/testcase_reference_with_include_exclude/requirements.txt +++ b/tests/github/experimental/workflow/AggregatorBasedWorkflow/testcase_reference_with_include_exclude/requirements.txt @@ -1,4 +1,4 @@ tensorboard -torch==2.6.0 -torchvision==0.21.0 +torch==2.7.0 +torchvision==0.22.0 wheel>=0.38.0 # not directly required, pinned by Snyk to avoid a vulnerability diff --git a/tests/github/experimental/workflow/AggregatorBasedWorkflow/testcase_validate_particpant_names/requirements.txt b/tests/github/experimental/workflow/AggregatorBasedWorkflow/testcase_validate_particpant_names/requirements.txt index f21b84c3af..eed2cfcfea 100644 --- a/tests/github/experimental/workflow/AggregatorBasedWorkflow/testcase_validate_particpant_names/requirements.txt +++ b/tests/github/experimental/workflow/AggregatorBasedWorkflow/testcase_validate_particpant_names/requirements.txt @@ -1,4 +1,4 @@ tensorboard -torch==2.6.0 -torchvision==0.21.0 +torch==2.7.0 +torchvision==0.22.0 wheel>=0.38.0 # not directly required, pinned by Snyk to avoid a vulnerability From b916fd74ee19f1a4bbd2a4fff353e1f08bad09cd Mon Sep 17 00:00:00 2001 From: yes Date: Wed, 23 Apr 2025 23:41:30 -0700 Subject: [PATCH 5/8] pip version pinned Signed-off-by: yes --- .github/actions/tr_pre_test_run/action.yml | 2 +- .github/workflows/windows.yml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/actions/tr_pre_test_run/action.yml b/.github/actions/tr_pre_test_run/action.yml index 2949a5e8cc..8c942fc566 100644 --- a/.github/actions/tr_pre_test_run/action.yml +++ b/.github/actions/tr_pre_test_run/action.yml @@ -16,7 +16,7 @@ runs: - name: Install dependencies id: install_dependencies run: | - python -m pip install --upgrade pip + python -m pip install --upgrade pip==24.1.2 pip install . pip install -r test-requirements.txt shell: bash diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 14e9482901..c7b71a87d4 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -66,7 +66,7 @@ jobs: python-version: "3.10" - name: Install dependencies run: | - python -m pip install --upgrade pip + python -m pip install --upgrade pip==24.1.2 pip install . - name: Test TaskRunner API with Eden Compression run: | @@ -84,7 +84,7 @@ jobs: python-version: "3.10" - name: Install dependencies run: | - python -m pip install --upgrade pip + python -m pip install --upgrade pip==24.1.2 pip install . - name: Test Straggler Handling Interface run: | From 2e234c7b2c791211f1ea1eb19cab865443ac0a16 Mon Sep 17 00:00:00 2001 From: yes Date: Wed, 30 Apr 2025 02:35:38 -0700 Subject: [PATCH 6/8] code changes Signed-off-by: yes --- .github/actions/tr_pre_test_run/action.yml | 2 +- .github/workflows/windows.yml | 4 ++-- openfl/federated/__init__.py | 3 +++ 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.github/actions/tr_pre_test_run/action.yml b/.github/actions/tr_pre_test_run/action.yml index 8c942fc566..2949a5e8cc 100644 --- a/.github/actions/tr_pre_test_run/action.yml +++ b/.github/actions/tr_pre_test_run/action.yml @@ -16,7 +16,7 @@ runs: - name: Install dependencies id: install_dependencies run: | - python -m pip install --upgrade pip==24.1.2 + python -m pip install --upgrade pip pip install . pip install -r test-requirements.txt shell: bash diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index c7b71a87d4..14e9482901 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -66,7 +66,7 @@ jobs: python-version: "3.10" - name: Install dependencies run: | - python -m pip install --upgrade pip==24.1.2 + python -m pip install --upgrade pip pip install . - name: Test TaskRunner API with Eden Compression run: | @@ -84,7 +84,7 @@ jobs: python-version: "3.10" - name: Install dependencies run: | - python -m pip install --upgrade pip==24.1.2 + python -m pip install --upgrade pip pip install . - name: Test Straggler Handling Interface run: | diff --git a/openfl/federated/__init__.py b/openfl/federated/__init__.py index 72aaac4aea..489ab0eec5 100644 --- a/openfl/federated/__init__.py +++ b/openfl/federated/__init__.py @@ -16,6 +16,9 @@ from openfl.federated.task import KerasTaskRunner if util.find_spec("torch") is not None: os.environ["SETUPTOOLS_USE_DISTUTILS"] = "stdlib" + import sys + import typing_extensions + sys.modules["pip._vendor.typing_extensions"] = typing_extensions from openfl.federated.data import PyTorchDataLoader from openfl.federated.task import PyTorchTaskRunner if util.find_spec("xgboost") is not None: From cf6a8797ed81a922996d552ecd6d5b5a0d667256 Mon Sep 17 00:00:00 2001 From: yes Date: Wed, 30 Apr 2025 02:45:48 -0700 Subject: [PATCH 7/8] code format Signed-off-by: yes --- openfl/federated/__init__.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/openfl/federated/__init__.py b/openfl/federated/__init__.py index 489ab0eec5..a8b443c059 100644 --- a/openfl/federated/__init__.py +++ b/openfl/federated/__init__.py @@ -17,7 +17,9 @@ if util.find_spec("torch") is not None: os.environ["SETUPTOOLS_USE_DISTUTILS"] = "stdlib" import sys + import typing_extensions + sys.modules["pip._vendor.typing_extensions"] = typing_extensions from openfl.federated.data import PyTorchDataLoader from openfl.federated.task import PyTorchTaskRunner From 61d8746f3737533f503780ad8afc2564abc8cc73 Mon Sep 17 00:00:00 2001 From: yes Date: Fri, 2 May 2025 02:10:11 -0700 Subject: [PATCH 8/8] omit pytorch generated files Signed-off-by: yes --- pyproject.toml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 026272aff0..0c3e920427 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -32,4 +32,10 @@ ignore = [ [tool.ruff.lint.isort] force-single-line = false -known-first-party = ["openfl"] \ No newline at end of file +known-first-party = ["openfl"] + +[tool.coverage.run] +omit = [ + # omit pytorch-generated files in /tmp + "/tmp/*", +] \ No newline at end of file