Bump torch version enabling numpy 2 compatibility

PyTorch added support for numpy 2 starting with PyTorch 2.3.0. This allows for numpy 1 or numpy 2 to be used with torch>=2.3.0.

A special case is being handled on Windows as PyTorch Windows binaries had compatibilities issues with numpy 2 that were fixed in torch 2.4.1 (see pytorch/pytorch#131668 (comment)).

Signed-off-by: James Butler <[email protected]>

Author: jamesobutler

.github/workflows/cron.yml

@@ -13,15 +13,11 @@ jobs:
     strategy:
       matrix:
         environment:
-          - "PT220+CUDA118"
           - "PT230+CUDA121"
           - "PT240+CUDA126"
           - "PTLATEST+CUDA126"
         include:
           # https://docs.nvidia.com/deeplearning/frameworks/pytorch-release-notes
-          - environment: PT220+CUDA118
-            pytorch: "torch==2.2.0 torchvision==0.17.0 --extra-index-url https://download.pytorch.org/whl/cu121"
-            base: "nvcr.io/nvidia/pytorch:22.10-py3"  # CUDA 11.8
           - environment: PT230+CUDA121
             pytorch: "pytorch==2.3.0 torchvision==0.18.0 --extra-index-url https://download.pytorch.org/whl/cu121"
             base: "nvcr.io/nvidia/pytorch:23.08-py3"  # CUDA 12.1

.github/workflows/pythonapp-min.yml

@@ -124,7 +124,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        pytorch-version: ['2.2.2', '2.3.1', '2.4.1', 'latest']
+        pytorch-version: ['2.3.1', '2.4.1', '2.5.1', 'latest']
     timeout-minutes: 40
     steps:
     - uses: actions/checkout@v4

.github/workflows/pythonapp.yml

@@ -94,7 +94,7 @@ jobs:
     - if: runner.os == 'windows'
       name: Install torch cpu from pytorch.org (Windows only)
       run: |
-        python -m pip install torch==2.2.0+cpu torchvision==0.17.0+cpu -f https://download.pytorch.org/whl/torch_stable.html
+        python -m pip install torch==2.4.1 torchvision==0.19.1+cpu --index-url https://download.pytorch.org/whl/cpu
     - if: runner.os == 'Linux'
       name: Install itk pre-release (Linux only)
       run: |
@@ -103,7 +103,7 @@ jobs:
     - name: Install the dependencies
       run: |
         python -m pip install --user --upgrade pip wheel
-        python -m pip install torch==2.2.0 torchvision==0.17.0
+        python -m pip install torch==2.4.1 torchvision==0.19.1
         cat "requirements-dev.txt"
         python -m pip install -r requirements-dev.txt
         python -m pip list
@@ -155,7 +155,7 @@ jobs:
         # install the latest pytorch for testing
         # however, "pip install monai*.tar.gz" will build cpp/cuda with an isolated
         # fresh torch installation according to pyproject.toml
-        python -m pip install torch>=2.2.0 torchvision
+        python -m pip install torch>=2.3.0 torchvision
     - name: Check packages
       run: |
         pip uninstall monai

docs/requirements.txt

@@ -1,5 +1,5 @@
--f https://download.pytorch.org/whl/cpu/torch-2.2.0%2Bcpu-cp39-cp39-linux_x86_64.whl
-torch>=2.2.0
+-f https://download.pytorch.org/whl/cpu/torch-2.3.0%2Bcpu-cp39-cp39-linux_x86_64.whl
+torch>=2.3.0
 pytorch-ignite==0.4.11
 numpy>=1.20
 itk>=5.2

environment-dev.yml

@@ -5,8 +5,8 @@ channels:
   - nvidia
   - conda-forge
 dependencies:
-  - numpy>=1.24,<2.0
-  - pytorch>=2.2.0
+  - numpy>=1.24,<3.0
+  - pytorch>=2.3.0
   - torchio
   - torchvision
   - pytorch-cuda>=11.6

pyproject.toml

@@ -2,7 +2,7 @@
 requires = [
   "wheel",
   "setuptools",
-  "torch>=2.2.0",
+  "torch>=2.3.0",
   "ninja",
   "packaging"
 ]

requirements.txt

@@ -1,2 +1,3 @@
-torch>=2.2.0,<2.6
-numpy>=1.24,<2.0
+torch>=2.3.0,<2.6; sys_platform != 'win32'
+torch>=2.4.1,<2.6; sys_platform == 'win32'
+numpy>=1.24,<3.0

setup.cfg

@@ -42,8 +42,9 @@ setup_requires =
     ninja
     packaging
 install_requires =
-    torch>=2.2.0
-    numpy>=1.24,<2.0
+    torch>=2.3.0; sys_platform != 'win32'
+    torch>=2.4.1; sys_platform == 'win32'
+    numpy>=1.24,<3.0
 
 [options.extras_require]
 all =

tests/integration/test_integration_bundle_run.py

@@ -76,7 +76,7 @@ def test_tiny(self):
             )
         with open(meta_file, "w") as f:
             json.dump(
-                {"version": "0.1.0", "monai_version": "1.1.0", "pytorch_version": "2.2.0", "numpy_version": "1.22.2"}, f
+                {"version": "0.1.0", "monai_version": "1.1.0", "pytorch_version": "2.3.0", "numpy_version": "1.22.2"}, f
             )
         cmd = ["coverage", "run", "-m", "monai.bundle"]
         # test both CLI entry "run" and "run_workflow"
@@ -113,7 +113,7 @@ def test_scripts_fold(self):
             )
         with open(meta_file, "w") as f:
             json.dump(
-                {"version": "0.1.0", "monai_version": "1.1.0", "pytorch_version": "2.2.0", "numpy_version": "1.22.2"}, f
+                {"version": "0.1.0", "monai_version": "1.1.0", "pytorch_version": "2.3.0", "numpy_version": "1.22.2"}, f
             )
 
         os.mkdir(scripts_dir)

tests/nonconfig_workflow.py

@@ -65,7 +65,7 @@ def initialize(self):
             self._monai_version = "1.1.0"
 
         if self._pytorch_version is None:
-            self._pytorch_version = "2.2.0"
+            self._pytorch_version = "2.3.0"
 
         if self._numpy_version is None:
             self._numpy_version = "1.22.2"