Skip to content

Commit 472c747

Browse files
Merge branch 'Project-MONAI:dev' into 7499-torchio-transforms-wrapper
2 parents b896604 + 941e739 commit 472c747

File tree

412 files changed

+30806
-2618
lines changed

Some content is hidden

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

412 files changed

+30806
-2618
lines changed

.github/workflows/blossom-ci.yml

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -29,13 +29,14 @@ jobs:
2929
args: ${{ env.args }}
3030

3131
# This job only runs for pull request comments
32-
if: contains('\
33-
Nic-Ma,\
34-
wyli,\
35-
pxLi,\
36-
YanxuanLiu,\
37-
KumoLiu,\
38-
', format('{0},', github.actor)) && github.event.comment.body == '/build'
32+
if: |
33+
github.event.comment.body == '/build' &&
34+
(
35+
github.actor == 'Nic-Ma' ||
36+
github.actor == 'wyli' ||
37+
github.actor == 'wendell-hom' ||
38+
github.actor == 'KumoLiu'
39+
)
3940
steps:
4041
- name: Check if comment is issued by authorized person
4142
run: blossom-ci

.github/workflows/conda.yml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,10 @@ jobs:
3232
maximum-size: 16GB
3333
disk-root: "D:"
3434
- uses: actions/checkout@v4
35+
- name: Clean up disk space
36+
run: |
37+
find /opt/hostedtoolcache/* -maxdepth 0 ! -name 'Python' -exec rm -rf {} \;
38+
rm -rf /usr/share/dotnet/
3539
- uses: conda-incubator/setup-miniconda@v3
3640
with:
3741
auto-update-conda: true
@@ -56,6 +60,10 @@ jobs:
5660
conda deactivate
5761
- name: Test env (CPU ${{ runner.os }})
5862
shell: bash -el {0}
63+
env:
64+
NGC_API_KEY: ${{ secrets.NGC_API_KEY }}
65+
NGC_ORG: ${{ secrets.NGC_ORG }}
66+
NGC_TEAM: ${{ secrets.NGC_TEAM }}
5967
run: |
6068
conda activate monai
6169
$(pwd)/runtests.sh --build --unittests

.github/workflows/cron-ngc-bundle.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,10 @@ jobs:
1818
runs-on: ubuntu-latest
1919
steps:
2020
- uses: actions/checkout@v4
21-
- name: Set up Python 3.8
21+
- name: Set up Python 3.9
2222
uses: actions/setup-python@v5
2323
with:
24-
python-version: '3.8'
24+
python-version: '3.9'
2525
- name: cache weekly timestamp
2626
id: pip-cache
2727
run: echo "datew=$(date '+%Y-%V')" >> $GITHUB_OUTPUT

.github/workflows/cron.yml

Lines changed: 31 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -13,24 +13,28 @@ jobs:
1313
strategy:
1414
matrix:
1515
environment:
16-
- "PT191+CUDA113"
1716
- "PT110+CUDA113"
18-
- "PT113+CUDA113"
19-
- "PTLATEST+CUDA121"
17+
- "PT113+CUDA118"
18+
- "PT210+CUDA121"
19+
- "PT240+CUDA126"
20+
- "PTLATEST+CUDA126"
2021
include:
2122
# https://docs.nvidia.com/deeplearning/frameworks/pytorch-release-notes
22-
- environment: PT191+CUDA113
23-
pytorch: "torch==1.9.1 torchvision==0.10.1 --extra-index-url https://download.pytorch.org/whl/cu113"
24-
base: "nvcr.io/nvidia/pytorch:21.06-py3" # CUDA 11.3
2523
- environment: PT110+CUDA113
2624
pytorch: "torch==1.10.2 torchvision==0.11.3 --extra-index-url https://download.pytorch.org/whl/cu113"
2725
base: "nvcr.io/nvidia/pytorch:21.06-py3" # CUDA 11.3
28-
- environment: PT113+CUDA113
29-
pytorch: "torch==1.13.1 torchvision==0.14.1 --extra-index-url https://download.pytorch.org/whl/cu113"
30-
base: "nvcr.io/nvidia/pytorch:21.06-py3" # CUDA 11.3
31-
- environment: PTLATEST+CUDA121
32-
pytorch: "-U torch torchvision --extra-index-url https://download.pytorch.org/whl/cu118"
33-
base: "nvcr.io/nvidia/pytorch:23.08-py3" # CUDA 12.2
26+
- environment: PT113+CUDA118
27+
pytorch: "torch==1.13.1 torchvision==0.14.1 --extra-index-url https://download.pytorch.org/whl/cu121"
28+
base: "nvcr.io/nvidia/pytorch:22.10-py3" # CUDA 11.8
29+
- environment: PT210+CUDA121
30+
pytorch: "pytorch==2.1.0 torchvision==0.16.0 --extra-index-url https://download.pytorch.org/whl/cu121"
31+
base: "nvcr.io/nvidia/pytorch:23.08-py3" # CUDA 12.1
32+
- environment: PT240+CUDA126
33+
pytorch: "pytorch==2.4.0 torchvision==0.19.0 --extra-index-url https://download.pytorch.org/whl/cu121"
34+
base: "nvcr.io/nvidia/pytorch:24.08-py3" # CUDA 12.6
35+
- environment: PTLATEST+CUDA126
36+
pytorch: "-U torch torchvision --extra-index-url https://download.pytorch.org/whl/cu121"
37+
base: "nvcr.io/nvidia/pytorch:24.10-py3" # CUDA 12.6
3438
container:
3539
image: ${{ matrix.base }}
3640
options: "--gpus all"
@@ -50,6 +54,10 @@ jobs:
5054
python -m pip install -r requirements-dev.txt
5155
python -m pip list
5256
- name: Run tests report coverage
57+
env:
58+
NGC_API_KEY: ${{ secrets.NGC_API_KEY }}
59+
NGC_ORG: ${{ secrets.NGC_ORG }}
60+
NGC_TEAM: ${{ secrets.NGC_TEAM }}
5361
run: |
5462
export LAUNCH_DELAY=$[ $RANDOM % 16 * 60 ]
5563
echo "Sleep $LAUNCH_DELAY"
@@ -76,7 +84,7 @@ jobs:
7684
if: github.repository == 'Project-MONAI/MONAI'
7785
strategy:
7886
matrix:
79-
container: ["pytorch:22.10", "pytorch:23.08"]
87+
container: ["pytorch:23.08", "pytorch:24.08", "pytorch:24.10"]
8088
container:
8189
image: nvcr.io/nvidia/${{ matrix.container }}-py3 # testing with the latest pytorch base image
8290
options: "--gpus all"
@@ -94,6 +102,10 @@ jobs:
94102
python -m pip install -r requirements-dev.txt
95103
python -m pip list
96104
- name: Run tests report coverage
105+
env:
106+
NGC_API_KEY: ${{ secrets.NGC_API_KEY }}
107+
NGC_ORG: ${{ secrets.NGC_ORG }}
108+
NGC_TEAM: ${{ secrets.NGC_TEAM }}
97109
run: |
98110
export LAUNCH_DELAY=$[ $RANDOM % 16 * 60 ]
99111
echo "Sleep $LAUNCH_DELAY"
@@ -121,7 +133,7 @@ jobs:
121133
if: github.repository == 'Project-MONAI/MONAI'
122134
strategy:
123135
matrix:
124-
container: ["pytorch:23.08"]
136+
container: ["pytorch:24.10"]
125137
container:
126138
image: nvcr.io/nvidia/${{ matrix.container }}-py3 # testing with the latest pytorch base image
127139
options: "--gpus all"
@@ -196,6 +208,10 @@ jobs:
196208
- name: Run tests report coverage
197209
# The docker image process has done the compilation.
198210
# BUILD_MONAI=1 is necessary for triggering the USE_COMPILED flag.
211+
env:
212+
NGC_API_KEY: ${{ secrets.NGC_API_KEY }}
213+
NGC_ORG: ${{ secrets.NGC_ORG }}
214+
NGC_TEAM: ${{ secrets.NGC_TEAM }}
199215
run: |
200216
cd /opt/monai
201217
nvidia-smi
@@ -221,7 +237,7 @@ jobs:
221237
if: github.repository == 'Project-MONAI/MONAI'
222238
needs: cron-gpu # so that monai itself is verified first
223239
container:
224-
image: nvcr.io/nvidia/pytorch:23.08-py3 # testing with the latest pytorch base image
240+
image: nvcr.io/nvidia/pytorch:24.10-py3 # testing with the latest pytorch base image
225241
options: "--gpus all --ipc=host"
226242
runs-on: [self-hosted, linux, x64, integration]
227243
steps:

.github/workflows/docker.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -100,3 +100,6 @@ jobs:
100100
shell: bash
101101
env:
102102
QUICKTEST: True
103+
NGC_API_KEY: ${{ secrets.NGC_API_KEY }}
104+
NGC_ORG: ${{ secrets.NGC_ORG }}
105+
NGC_TEAM: ${{ secrets.NGC_TEAM }}

.github/workflows/integration.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,9 @@ jobs:
6868
shell: bash
6969
env:
7070
BUILD_MONAI: 1
71+
NGC_API_KEY: ${{ secrets.NGC_API_KEY }}
72+
NGC_ORG: ${{ secrets.NGC_ORG }}
73+
NGC_TEAM: ${{ secrets.NGC_TEAM }}
7174
run: ./runtests.sh --build --net
7275

7376
- name: Add reaction

.github/workflows/pythonapp-gpu.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,6 @@ jobs:
2929
- "PT210+CUDA121DOCKER"
3030
include:
3131
# https://docs.nvidia.com/deeplearning/frameworks/pytorch-release-notes
32-
- environment: PT19+CUDA114DOCKER
33-
# 21.10: 1.10.0a0+0aef44c
34-
pytorch: "-h" # we explicitly set pytorch to -h to avoid pip install error
35-
base: "nvcr.io/nvidia/pytorch:21.10-py3"
3632
- environment: PT110+CUDA111
3733
pytorch: "torch==1.10.2 torchvision==0.11.3 --extra-index-url https://download.pytorch.org/whl/cu111"
3834
base: "nvcr.io/nvidia/cuda:11.1.1-devel-ubuntu18.04"
@@ -47,6 +43,10 @@ jobs:
4743
# 23.08: 2.1.0a0+29c30b1
4844
pytorch: "-h" # we explicitly set pytorch to -h to avoid pip install error
4945
base: "nvcr.io/nvidia/pytorch:23.08-py3"
46+
- environment: PT210+CUDA121DOCKER
47+
# 24.08: 2.3.0a0+40ec155e58.nv24.3
48+
pytorch: "-h" # we explicitly set pytorch to -h to avoid pip install error
49+
base: "nvcr.io/nvidia/pytorch:24.08-py3"
5050
container:
5151
image: ${{ matrix.base }}
5252
options: --gpus all --env NVIDIA_DISABLE_REQUIRE=true # workaround for unsatisfied condition: cuda>=11.6
@@ -62,7 +62,7 @@ jobs:
6262
if [ ${{ matrix.environment }} = "PT110+CUDA111" ] || \
6363
[ ${{ matrix.environment }} = "PT113+CUDA116" ]
6464
then
65-
PYVER=3.8 PYSFX=3 DISTUTILS=python3-distutils && \
65+
PYVER=3.9 PYSFX=3 DISTUTILS=python3-distutils && \
6666
apt-get update && apt-get install -y --no-install-recommends \
6767
curl \
6868
pkg-config \

.github/workflows/pythonapp-min.yml

Lines changed: 17 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@ on:
99
- main
1010
- releasing/*
1111
pull_request:
12+
head_ref-ignore:
13+
- dev
1214

1315
concurrency:
1416
# automatically cancel the previously triggered workflows when there's a newer version
@@ -29,10 +31,10 @@ jobs:
2931
timeout-minutes: 40
3032
steps:
3133
- uses: actions/checkout@v4
32-
- name: Set up Python 3.8
34+
- name: Set up Python 3.9
3335
uses: actions/setup-python@v5
3436
with:
35-
python-version: '3.8'
37+
python-version: '3.9'
3638
- name: Prepare pip wheel
3739
run: |
3840
which python
@@ -65,13 +67,16 @@ jobs:
6567
shell: bash
6668
env:
6769
QUICKTEST: True
70+
NGC_API_KEY: ${{ secrets.NGC_API_KEY }}
71+
NGC_ORG: ${{ secrets.NGC_ORG }}
72+
NGC_TEAM: ${{ secrets.NGC_TEAM }}
6873

6974
min-dep-py3: # min dependencies installed tests for different python
7075
runs-on: ubuntu-latest
7176
strategy:
7277
fail-fast: false
7378
matrix:
74-
python-version: ['3.8', '3.9', '3.10', '3.11']
79+
python-version: ['3.9', '3.10', '3.11', '3.12']
7580
timeout-minutes: 40
7681
steps:
7782
- uses: actions/checkout@v4
@@ -110,20 +115,23 @@ jobs:
110115
./runtests.sh --min
111116
env:
112117
QUICKTEST: True
118+
NGC_API_KEY: ${{ secrets.NGC_API_KEY }}
119+
NGC_ORG: ${{ secrets.NGC_ORG }}
120+
NGC_TEAM: ${{ secrets.NGC_TEAM }}
113121

114122
min-dep-pytorch: # min dependencies installed tests for different pytorch
115123
runs-on: ubuntu-latest
116124
strategy:
117125
fail-fast: false
118126
matrix:
119-
pytorch-version: ['1.9.1', '1.10.2', '1.11.0', '1.12.1', '1.13', 'latest']
127+
pytorch-version: ['1.10.2', '1.11.0', '1.12.1', '1.13', '2.0.1', 'latest']
120128
timeout-minutes: 40
121129
steps:
122130
- uses: actions/checkout@v4
123-
- name: Set up Python 3.8
131+
- name: Set up Python 3.9
124132
uses: actions/setup-python@v5
125133
with:
126-
python-version: '3.8'
134+
python-version: '3.9'
127135
- name: Prepare pip wheel
128136
run: |
129137
which python
@@ -159,3 +167,6 @@ jobs:
159167
./runtests.sh --min
160168
env:
161169
QUICKTEST: True
170+
NGC_API_KEY: ${{ secrets.NGC_API_KEY }}
171+
NGC_ORG: ${{ secrets.NGC_ORG }}
172+
NGC_TEAM: ${{ secrets.NGC_TEAM }}

.github/workflows/pythonapp.yml

Lines changed: 15 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@ on:
99
- main
1010
- releasing/*
1111
pull_request:
12+
head_ref-ignore:
13+
- dev
1214

1315
concurrency:
1416
# automatically cancel the previously triggered workflows when there's a newer version
@@ -27,10 +29,10 @@ jobs:
2729
opt: ["codeformat", "pytype", "mypy"]
2830
steps:
2931
- uses: actions/checkout@v4
30-
- name: Set up Python 3.8
32+
- name: Set up Python 3.9
3133
uses: actions/setup-python@v5
3234
with:
33-
python-version: '3.8'
35+
python-version: '3.9'
3436
- name: cache weekly timestamp
3537
id: pip-cache
3638
run: |
@@ -43,6 +45,7 @@ jobs:
4345
key: ${{ runner.os }}-pip-${{ steps.pip-cache.outputs.datew }}
4446
- name: Install dependencies
4547
run: |
48+
find /opt/hostedtoolcache/* -maxdepth 0 ! -name 'Python' -exec rm -rf {} \;
4649
python -m pip install --upgrade pip wheel
4750
python -m pip install -r requirements-dev.txt
4851
- name: Lint and type check
@@ -68,10 +71,10 @@ jobs:
6871
maximum-size: 16GB
6972
disk-root: "D:"
7073
- uses: actions/checkout@v4
71-
- name: Set up Python 3.8
74+
- name: Set up Python 3.9
7275
uses: actions/setup-python@v5
7376
with:
74-
python-version: '3.8'
77+
python-version: '3.9'
7578
- name: Prepare pip wheel
7679
run: |
7780
which python
@@ -96,8 +99,10 @@ jobs:
9699
name: Install itk pre-release (Linux only)
97100
run: |
98101
python -m pip install --pre -U itk
102+
find /opt/hostedtoolcache/* -maxdepth 0 ! -name 'Python' -exec rm -rf {} \;
99103
- name: Install the dependencies
100104
run: |
105+
python -m pip install --user --upgrade pip wheel
101106
python -m pip install torch==1.13.1 torchvision==0.14.1
102107
cat "requirements-dev.txt"
103108
python -m pip install -r requirements-dev.txt
@@ -127,10 +132,10 @@ jobs:
127132
- uses: actions/checkout@v4
128133
with:
129134
fetch-depth: 0
130-
- name: Set up Python 3.8
135+
- name: Set up Python 3.9
131136
uses: actions/setup-python@v5
132137
with:
133-
python-version: '3.8'
138+
python-version: '3.9'
134139
- name: cache weekly timestamp
135140
id: pip-cache
136141
run: |
@@ -145,7 +150,8 @@ jobs:
145150
key: ${{ runner.os }}-pip-${{ steps.pip-cache.outputs.datew }}
146151
- name: Install dependencies
147152
run: |
148-
python -m pip install --user --upgrade pip setuptools wheel twine
153+
find /opt/hostedtoolcache/* -maxdepth 0 ! -name 'Python' -exec rm -rf {} \;
154+
python -m pip install --user --upgrade pip setuptools wheel twine packaging
149155
# install the latest pytorch for testing
150156
# however, "pip install monai*.tar.gz" will build cpp/cuda with an isolated
151157
# fresh torch installation according to pyproject.toml
@@ -208,10 +214,10 @@ jobs:
208214
runs-on: ubuntu-latest
209215
steps:
210216
- uses: actions/checkout@v4
211-
- name: Set up Python 3.8
217+
- name: Set up Python 3.9
212218
uses: actions/setup-python@v5
213219
with:
214-
python-version: '3.8'
220+
python-version: '3.9'
215221
- name: cache weekly timestamp
216222
id: pip-cache
217223
run: |

0 commit comments

Comments
 (0)