Skip to content

Commit 02eec30

Browse files
Merge branch 'dev' into 8328-nnunet-bundle-integration
2 parents fed603b + c8471e7 commit 02eec30

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

53 files changed

+517
-323
lines changed

.github/CODEOWNERS

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
/monai/ @KumoLiu @ericspod @Nic-Ma
2+
/docs/ @KumoLiu @ericspod @Nic-Ma
3+
/tests/ @KumoLiu @ericspod @Nic-Ma
4+
/.github/ @KumoLiu
5+
/monai/networks/schedulers/ @virginiafdez
6+
/monai/inferers/inferer.py @virginiafdez
7+
/monai/losses/adversarial_loss.py @virginiafdez
8+
/monai/losses/perceptual.py @virginiafdez
9+
/monai/networks/blocks/spade_norm.py @virginiafdez
10+
/monai/networks/nets/autoencoderkl.py @virginiafdez
11+
/monai/networks/nets/controlnet.py @virginiafdez
12+
/monai/networks/nets/diffusion_model_unet.py @virginiafdez
13+
/monai/networks/nets/patchgan_discriminator.py @virginiafdez
14+
/monai/networks/nets/spade_autoencoderkl.py @virginiafdez
15+
/monai/networks/nets/spade_diffusion_model_unet.py @virginiafdez
16+
/monai/networks/nets/spade_network.py @virginiafdez
17+
/monai/networks/nets/vqvae.py @virginiafdez

.github/codecov.yml

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,13 @@ coverage:
2424
flags: null
2525
paths: null
2626

27-
# Disable comments on PR
28-
comment: false
27+
comment: # enable code coverage comment on PR
28+
layout: "diff, flags, files"
29+
behavior: default
30+
require_changes: false
31+
require_base: false
32+
require_head: true
33+
hide_project_coverage: true
2934

3035
ignore:
3136
- "versioneer.py"

.github/workflows/pythonapp-min.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ jobs:
124124
strategy:
125125
fail-fast: false
126126
matrix:
127-
pytorch-version: ['2.3.1', '2.4.1', '2.5.1', 'latest']
127+
pytorch-version: ['2.4.1', '2.5.1', '2.6.0'] # FIXME: add 'latest' back once PyTorch 2.7 issues are resolved
128128
timeout-minutes: 40
129129
steps:
130130
- uses: actions/checkout@v4

.github/workflows/pythonapp.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@ jobs:
155155
# install the latest pytorch for testing
156156
# however, "pip install monai*.tar.gz" will build cpp/cuda with an isolated
157157
# fresh torch installation according to pyproject.toml
158-
python -m pip install torch>=2.3.0 torchvision
158+
python -m pip install torch>=2.4.1 torchvision
159159
- name: Check packages
160160
run: |
161161
pip uninstall monai

CONTRIBUTING.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -105,9 +105,9 @@ MONAI tests are located under `tests/`.
105105
A bash script (`runtests.sh`) is provided to run all tests locally.
106106
Please run ``./runtests.sh -h`` to see all options.
107107

108-
To run a particular test, for example `tests/test_dice_loss.py`:
108+
To run a particular test, for example `tests/losses/test_dice_loss.py`:
109109
```
110-
python -m tests.test_dice_loss
110+
python -m tests.losses.test_dice_loss
111111
```
112112

113113
Before submitting a pull request, we recommend that all linting and unit tests

README.md

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,15 @@ Its ambitions are as follows:
3333
- customizable design for varying user expertise;
3434
- multi-GPU multi-node data parallelism support.
3535

36+
## Requirements
37+
38+
MONAI works with the [currently supported versions of Python](https://devguide.python.org/versions), and depends directly on NumPy and PyTorch with many optional dependencies.
39+
40+
* Major releases of MONAI will have dependency versions stated for them. The current state of the `dev` branch in this repository is the unreleased development version of MONAI which typically will support current versions of dependencies and include updates and bug fixes to do so.
41+
* PyTorch support covers [the current version](https://github.com/pytorch/pytorch/releases) plus three previous minor versions. If compatibility issues with a PyTorch version and other dependencies arise, support for a version may be delayed until a major release.
42+
* Our support policy for other dependencies adheres for the most part to [SPEC0](https://scientific-python.org/specs/spec-0000), where dependency versions are supported where possible for up to two years. Discovered vulnerabilities or defects may require certain versions to be explicitly not supported.
43+
* See the `requirements*.txt` files for dependency version information.
44+
3645
## Installation
3746

3847
To install [the current release](https://pypi.org/project/monai/), you can simply run:

docs/requirements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
-f https://download.pytorch.org/whl/cpu/torch-2.3.0%2Bcpu-cp39-cp39-linux_x86_64.whl
2-
torch>=2.3.0
2+
torch>=2.4.1, <2.7.0
33
pytorch-ignite==0.4.11
44
numpy>=1.20
55
itk>=5.2

docs/source/installation.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -58,10 +58,10 @@ pip install monai-weekly
5858
```
5959

6060
The weekly build is released to PyPI every Sunday with a pre-release build number `dev[%y%U]`.
61-
To report any issues on the weekly preview, please include the version and commit information:
61+
To report any issues on the weekly preview, please include the version information:
6262

6363
```bash
64-
python -c "import monai; print(monai.__version__); print(monai.__commit_id__)"
64+
python -c "import monai; print(monai.__version__)"
6565
```
6666

6767
Coexistence of package `monai` and `monai-weekly` in a system may cause namespace conflicts
@@ -101,20 +101,20 @@ for the latest features:
101101
### Option 1 (as a part of your system-wide module):
102102

103103
```bash
104-
pip install git+https://github.com/Project-MONAI/MONAI#egg=monai
104+
pip install git+https://github.com/Project-MONAI/MONAI
105105
```
106106

107107
or, to build with MONAI C++/CUDA extensions:
108108

109109
```bash
110-
BUILD_MONAI=1 pip install git+https://github.com/Project-MONAI/MONAI#egg=monai
110+
BUILD_MONAI=1 pip install git+https://github.com/Project-MONAI/MONAI
111111
```
112112

113113
To build the extensions, if the system environment already has a version of Pytorch installed,
114114
`--no-build-isolation` might be preferred:
115115

116116
```bash
117-
BUILD_MONAI=1 pip install --no-build-isolation git+https://github.com/Project-MONAI/MONAI#egg=monai
117+
BUILD_MONAI=1 pip install --no-build-isolation git+https://github.com/Project-MONAI/MONAI
118118
```
119119

120120
this command will download and install the current `dev` branch of [MONAI from

docs/source/metrics.rst

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,6 @@ Metrics
9898
`Hausdorff distance`
9999
--------------------
100100
.. autofunction:: compute_hausdorff_distance
101-
.. autofunction:: compute_percent_hausdorff_distance
102101

103102
.. autoclass:: HausdorffDistanceMetric
104103
:members:

monai/apps/auto3dseg/auto_runner.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -570,7 +570,7 @@ def set_device_info(
570570
self.device_setting["CUDA_VISIBLE_DEVICES"] = ",".join([str(x) for x in cuda_visible_devices])
571571
self.device_setting["n_devices"] = len(cuda_visible_devices)
572572
else:
573-
logger.warn(f"Wrong format of cuda_visible_devices {cuda_visible_devices}, devices not set")
573+
logger.warning(f"Wrong format of cuda_visible_devices {cuda_visible_devices}, devices not set")
574574

575575
if num_nodes is None:
576576
num_nodes = int(os.environ.get("NUM_NODES", 1))

0 commit comments

Comments
 (0)