Merge branch 'dev' into inverse_threading_fix

Author: ericspod

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

docs/source/networks.rst

@@ -109,6 +109,16 @@ Blocks
 .. autoclass:: SABlock
     :members:
 
+`CABlock Block`
+~~~~~~~~~~~~~~~
+.. autoclass:: CABlock
+    :members:
+
+`FeedForward Block`
+~~~~~~~~~~~~~~~~~~~
+.. autoclass:: FeedForward
+    :members:
+
 `Squeeze-and-Excitation`
 ~~~~~~~~~~~~~~~~~~~~~~~~
 .. autoclass:: ChannelSELayer
@@ -173,6 +183,16 @@ Blocks
 .. autoclass:: Subpixelupsample
 .. autoclass:: SubpixelUpSample
 
+`Downsampling`
+~~~~~~~~~~~~~~
+.. autoclass:: DownSample
+    :members:
+.. autoclass:: Downsample
+.. autoclass:: SubpixelDownsample
+    :members:
+.. autoclass:: Subpixeldownsample
+.. autoclass:: SubpixelDownSample
+
 `Registration Residual Conv Block`
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 .. autoclass:: RegistrationResidualConvBlock
@@ -625,6 +645,11 @@ Nets
 .. autoclass:: ViT
   :members:
 
+`Restormer`
+~~~~~~~~~~~
+.. autoclass:: restormer
+  :members:
+
 `ViTAutoEnc`
 ~~~~~~~~~~~~
 .. autoclass:: ViTAutoEnc
@@ -750,3 +775,38 @@ Utilities
 
 .. automodule:: monai.apps.reconstruction.networks.nets.utils
   :members:
+
+Noise Schedulers
+----------------
+.. automodule:: monai.networks.schedulers
+.. currentmodule:: monai.networks.schedulers
+
+`Scheduler`
+~~~~~~~~~~~
+.. autoclass:: Scheduler
+  :members:
+
+`NoiseSchedules`
+~~~~~~~~~~~~~~~~
+.. autoclass:: NoiseSchedules
+  :members:
+
+`DDPMScheduler`
+~~~~~~~~~~~~~~~
+.. autoclass:: DDPMScheduler
+  :members:
+
+`DDIMScheduler`
+~~~~~~~~~~~~~~~
+.. autoclass:: DDIMScheduler
+  :members:
+
+`PNDMScheduler`
+~~~~~~~~~~~~~~~
+.. autoclass:: PNDMScheduler
+  :members:
+
+`RFlowScheduler`
+~~~~~~~~~~~~~~~~
+.. autoclass:: RFlowScheduler
+  :members:

monai/apps/generation/maisi/networks/autoencoderkl_maisi.py

@@ -232,6 +232,10 @@ def forward(self, x: torch.Tensor) -> torch.Tensor:
         if self.print_info:
             logger.info(f"Number of splits: {self.num_splits}")
 
+        if self.dim_split <= 1 and self.num_splits <= 1:
+            x = self.conv(x)
+            return x
+
         # compute size of splits
         l = x.size(self.dim_split + 2)
         split_size = l // self.num_splits

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