Skip to content

Commit 349c011

Browse files
Merge branch 'Project-MONAI:dev' into 4980-get-wsi-at-mpp
2 parents c1dd7c3 + 9808ce2 commit 349c011

Some content is hidden

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

43 files changed

+1586
-167
lines changed

.github/workflows/cron.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ jobs:
7575
if pgrep python; then pkill python; fi
7676
shell: bash
7777
- name: Upload coverage
78-
uses: codecov/codecov-action@v4
78+
uses: codecov/codecov-action@v5
7979
with:
8080
fail_ci_if_error: false
8181
files: ./coverage.xml
@@ -123,7 +123,7 @@ jobs:
123123
if pgrep python; then pkill python; fi
124124
shell: bash
125125
- name: Upload coverage
126-
uses: codecov/codecov-action@v4
126+
uses: codecov/codecov-action@v5
127127
with:
128128
fail_ci_if_error: false
129129
files: ./coverage.xml
@@ -228,7 +228,7 @@ jobs:
228228
if pgrep python; then pkill python; fi
229229
shell: bash
230230
- name: Upload coverage
231-
uses: codecov/codecov-action@v4
231+
uses: codecov/codecov-action@v5
232232
with:
233233
fail_ci_if_error: false
234234
files: ./coverage.xml

.github/workflows/pythonapp-gpu.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -137,6 +137,6 @@ jobs:
137137
shell: bash
138138
- name: Upload coverage
139139
if: ${{ github.head_ref != 'dev' && github.event.pull_request.merged != true }}
140-
uses: codecov/codecov-action@v4
140+
uses: codecov/codecov-action@v5
141141
with:
142142
files: ./coverage.xml

.github/workflows/setupapp.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ jobs:
7272
if pgrep python; then pkill python; fi
7373
shell: bash
7474
- name: Upload coverage
75-
uses: codecov/codecov-action@v4
75+
uses: codecov/codecov-action@v5
7676
with:
7777
fail_ci_if_error: false
7878
files: ./coverage.xml
@@ -119,7 +119,7 @@ jobs:
119119
BUILD_MONAI=1 ./runtests.sh --build --quick --min
120120
coverage xml --ignore-errors
121121
- name: Upload coverage
122-
uses: codecov/codecov-action@v4
122+
uses: codecov/codecov-action@v5
123123
with:
124124
fail_ci_if_error: false
125125
files: ./coverage.xml

.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -149,6 +149,9 @@ tests/testing_data/nrrd_example.nrrd
149149
# clang format tool
150150
.clang-format-bin/
151151

152+
# ctags
153+
tags
154+
152155
# VSCode
153156
.vscode/
154157
*.zip

docs/source/networks.rst

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -630,6 +630,11 @@ Nets
630630
.. autoclass:: ViTAutoEnc
631631
:members:
632632

633+
`MaskedAutoEncoderViT`
634+
~~~~~~~~~~~~~~~~~~~~~~
635+
.. autoclass:: MaskedAutoEncoderViT
636+
:members:
637+
633638
`FullyConnectedNet`
634639
~~~~~~~~~~~~~~~~~~~
635640
.. autoclass:: FullyConnectedNet

docs/source/transforms.rst

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1180,6 +1180,18 @@ Utility
11801180
:members:
11811181
:special-members: __call__
11821182

1183+
`TorchIO`
1184+
"""""""""
1185+
.. autoclass:: TorchIO
1186+
:members:
1187+
:special-members: __call__
1188+
1189+
`RandTorchIO`
1190+
"""""""""""""
1191+
.. autoclass:: RandTorchIO
1192+
:members:
1193+
:special-members: __call__
1194+
11831195
`MapLabelValue`
11841196
"""""""""""""""
11851197
.. autoclass:: MapLabelValue
@@ -2253,6 +2265,18 @@ Utility (Dict)
22532265
:members:
22542266
:special-members: __call__
22552267

2268+
`TorchIOd`
2269+
""""""""""
2270+
.. autoclass:: TorchIOd
2271+
:members:
2272+
:special-members: __call__
2273+
2274+
`RandTorchIOd`
2275+
""""""""""""""
2276+
.. autoclass:: RandTorchIOd
2277+
:members:
2278+
:special-members: __call__
2279+
22562280
`MapLabelValued`
22572281
""""""""""""""""
22582282
.. autoclass:: MapLabelValued

environment-dev.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ channels:
77
dependencies:
88
- numpy>=1.24,<2.0
99
- pytorch>=1.9
10+
- torchio
1011
- torchvision
1112
- pytorch-cuda>=11.6
1213
- pip

monai/bundle/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,4 +43,4 @@
4343
MACRO_KEY,
4444
load_bundle_config,
4545
)
46-
from .workflows import BundleWorkflow, ConfigWorkflow
46+
from .workflows import BundleWorkflow, ConfigWorkflow, PythonicWorkflow

monai/bundle/reference_resolver.py

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -192,6 +192,16 @@ def get_resolved_content(self, id: str, **kwargs: Any) -> ConfigExpression | str
192192
"""
193193
return self._resolve_one_item(id=id, **kwargs)
194194

195+
def remove_resolved_content(self, id: str) -> Any | None:
196+
"""
197+
Remove the resolved ``ConfigItem`` by id.
198+
199+
Args:
200+
id: id name of the expected item.
201+
202+
"""
203+
return self.resolved_content.pop(id) if id in self.resolved_content else None
204+
195205
@classmethod
196206
def normalize_id(cls, id: str | int) -> str:
197207
"""

0 commit comments

Comments
 (0)