Merge remote-tracking branch 'upstream/dev' into 8185-test-refactor-2

Author: garciadias

.github/workflows/pythonapp-min.yml

@@ -124,7 +124,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        pytorch-version: ['2.3.1', '2.4.1', '2.5.1', 'latest']
+        pytorch-version: ['2.4.1', '2.5.1', '2.6.0']  # FIXME: add 'latest' back once PyTorch 2.7 issues are resolved
     timeout-minutes: 40
     steps:
     - uses: actions/checkout@v4

.github/workflows/pythonapp.yml

@@ -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.3.0 torchvision
+        python -m pip install torch>=2.4.1 torchvision
     - name: Check packages
       run: |
         pip uninstall monai

docs/requirements.txt

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

docs/source/apps.rst

@@ -277,3 +277,15 @@ FastMRIReader
 
 .. autoclass:: monai.apps.nnunet.nnUNetV2Runner
   :members:
+
+`nnUNet Bundle`
+---------------
+.. autoclass:: monai.apps.nnunet.ModelnnUNetWrapper
+    :members:
+    :special-members:
+
+.. autofunction:: monai.apps.nnunet.get_nnunet_trainer
+.. autofunction:: monai.apps.nnunet.get_nnunet_monai_predictor
+.. autofunction:: monai.apps.nnunet.convert_nnunet_to_monai_bundle
+.. autofunction:: monai.apps.nnunet.convert_monai_bundle_to_nnunet
+.. autofunction:: monai.apps.nnunet.get_network_from_nnunet_plans

docs/source/bundle.rst

@@ -34,6 +34,7 @@ Model Bundle
     :members:
     :special-members:
 
+
 `Scripts`
 ---------
 .. autofunction:: ckpt_export

monai/apps/nnunet/__init__.py

@@ -11,5 +11,13 @@
 
 from __future__ import annotations
 
+from .nnunet_bundle import (
+    ModelnnUNetWrapper,
+    convert_monai_bundle_to_nnunet,
+    convert_nnunet_to_monai_bundle,
+    get_network_from_nnunet_plans,
+    get_nnunet_monai_predictor,
+    get_nnunet_trainer,
+)
 from .nnunetv2_runner import nnUNetV2Runner
 from .utils import NNUNETMode, analyze_data, create_new_data_copy, create_new_dataset_json