Skip to content

Commit 5baaa4e

Browse files
authored
Merge branch 'dev' into cucim-transform
2 parents 1f6b6e2 + 71ebd91 commit 5baaa4e

25 files changed

+937
-179
lines changed

docs/requirements.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,3 +20,4 @@ sphinxcontrib-serializinghtml
2020
sphinx-autodoc-typehints==1.11.1
2121
pandas
2222
einops
23+
transformers

docs/source/installation.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -174,9 +174,9 @@ Since MONAI v0.2.0, the extras syntax such as `pip install 'monai[nibabel]'` is
174174

175175
- The options are
176176
```
177-
[nibabel, skimage, pillow, tensorboard, gdown, ignite, torchvision, itk, tqdm, lmdb, psutil, cucim, openslide, pandas, einops]
177+
[nibabel, skimage, pillow, tensorboard, gdown, ignite, torchvision, itk, tqdm, lmdb, psutil, cucim, openslide, pandas, einops, transformers]
178178
```
179179
which correspond to `nibabel`, `scikit-image`, `pillow`, `tensorboard`,
180-
`gdown`, `pytorch-ignite`, `torchvision`, `itk`, `tqdm`, `lmdb`, `psutil`, `cucim`, `openslide-python`, `pandas` and `einops`, respectively.
180+
`gdown`, `pytorch-ignite`, `torchvision`, `itk`, `tqdm`, `lmdb`, `psutil`, `cucim`, `openslide-python`, `pandas`, `einops` and `transformers`, respectively.
181181

182182
- `pip install 'monai[all]'` installs all the optional dependencies.

docs/source/networks.rst

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -500,6 +500,11 @@ Nets
500500
.. autoclass:: Critic
501501
:members:
502502

503+
`VLTransformers`
504+
~~~~~~~~~~~~~~~~
505+
.. autoclass:: VLTransformers
506+
:members:
507+
503508
`NetAdapter`
504509
~~~~~~~~~~~~
505510
.. autoclass:: NetAdapter

monai/config/deviceconfig.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,7 @@ def get_optional_config_values():
7373
output["psutil"] = psutil_version
7474
output["pandas"] = get_package_version("pandas")
7575
output["einops"] = get_package_version("einops")
76+
output["transformers"] = get_package_version("transformers")
7677

7778
return output
7879

monai/networks/nets/__init__.py

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -84,4 +84,13 @@
8484
from .unetr import UNETR
8585
from .varautoencoder import VarAutoEncoder
8686
from .vit import ViT
87+
from .vltransformer import (
88+
BertAttention,
89+
BertMixedLayer,
90+
BertOutput,
91+
BertPreTrainedModel,
92+
MultiModal,
93+
Pooler,
94+
VLTransformers,
95+
)
8796
from .vnet import VNet

monai/networks/nets/autoencoder.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,11 @@ def __init__(
4949
dimensions: Optional[int] = None,
5050
) -> None:
5151
"""
52+
Initialize the AutoEncoder.
53+
5254
.. deprecated:: 0.6.0
5355
``dimensions`` is deprecated, use ``spatial_dims`` instead.
56+
5457
"""
5558

5659
super().__init__()

monai/networks/nets/varautoencoder.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@ class VarAutoEncoder(AutoEncoder):
4747
4848
.. deprecated:: 0.6.0
4949
``dimensions`` is deprecated, use ``spatial_dims`` instead.
50+
5051
"""
5152

5253
@deprecated_arg(

monai/networks/nets/vit.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@
1818
from monai.networks.blocks.patchembedding import PatchEmbeddingBlock
1919
from monai.networks.blocks.transformerblock import TransformerBlock
2020

21+
__all__ = ["ViT"]
22+
2123

2224
class ViT(nn.Module):
2325
"""

0 commit comments

Comments
 (0)