Skip to content

Commit a2bc1dd

Browse files
Add auto import for documentation build (#27)
* Add auto import * Add torch and torchvision to docs import * Add sphinx click * Add sphinx<9 requirement * Maybe? * Exclude __all__ directive * Remove ambiguous import
1 parent 0971d3a commit a2bc1dd

File tree

7 files changed

+16
-8
lines changed

7 files changed

+16
-8
lines changed

docs/source/conf.py

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
# -- General configuration ---------------------------------------------------
1515
# https://www.sphinx-doc.org/en/master/usage/configuration.html#general-configuration
1616

17-
extensions = ["sphinx.ext.autodoc", "sphinx.ext.napoleon", "sphinx_tabs.tabs"]
17+
extensions = ["sphinx.ext.autodoc", "sphinx.ext.napoleon", "sphinx_tabs.tabs", "sphinx_click"]
1818

1919
templates_path = ['_templates']
2020
exclude_patterns = []
@@ -25,6 +25,10 @@
2525
html_theme = 'shibuya'
2626
html_static_path = ['_static']
2727

28+
autodoc_mock_imports = [
29+
"verl",
30+
"deepspeed"
31+
]
2832

2933
import os
3034
import sys

docs/source/guides/add_modality.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,7 @@ Lastly, we implement the modality model. This is the model that performs the for
170170
A modality class must inherit :class:`~multimeditron.model.modalities.base.BaseModality` is typically created with 2 main modules:
171171

172172
1. A pretrained modality embedder (like a CLIP model): This module produces meaningful embeddings for given modalities
173-
2. A tunable projection module (usually a simple MLP or a linear layer): This module map embeddings from the modality embedder to the LLM embedding space. The dimension of this embedding space is given by the `hidden_size` attribute of :func:`~multimeditron.model.modalities.base.BaseModalityConfig`
173+
2. A tunable projection module (usually a simple MLP or a linear layer): This module map embeddings from the modality embedder to the LLM embedding space. The dimension of this embedding space is given by the `hidden_size` attribute of :class:`~multimeditron.model.modalities.base.BaseModalityConfig`
174174

175175
.. code-block:: python
176176

pyproject.toml

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,9 +40,12 @@ flash-attn = [
4040
"flash-attn",
4141
]
4242
docs = [
43-
"sphinx",
44-
"sphinx-tabs",
4543
"shibuya",
44+
"sphinx<9",
45+
"sphinx-tabs",
46+
"sphinx-click",
47+
"torch",
48+
"torchvision",
4649
]
4750

4851
[project.scripts]

src/multimeditron/model/modalities/base.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@
55
import torch
66
from transformers import AutoModel, AutoConfig, AutoProcessor, PretrainedConfig, PreTrainedModel
77

8+
__all__ = []
9+
810
class BaseModalityConfig(PretrainedConfig):
911
"""
1012
Configuration class for defining modality parameters.

src/multimeditron/model/modalities/image_modality.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
from multimeditron.model.constants import NUM_EMBEDDINGS_KEY, MODALITY_VALUE_KEY, POSITION_IDS_KEY
2-
from multimeditron.model.modalities.base import BaseModality, BaseModalityConfig, AutoModality, BaseModalityProcessor
2+
from multimeditron.model.modalities import BaseModality, BaseModalityConfig, AutoModality, BaseModalityProcessor
33
from multimeditron.model.projectors.mlp import MLPProjector
44
import torch
55
from transformers import AutoImageProcessor, AutoModel, AutoConfig

src/multimeditron/model/modalities/image_modality_moe.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import torch
22
from multimeditron.model.constants import NUM_EMBEDDINGS_KEY, MODALITY_VALUE_KEY
3-
from multimeditron.model.modalities.base import AutoModality, BaseModality, BaseModalityConfig, BaseModalityProcessor
3+
from multimeditron.model.modalities import AutoModality, BaseModality, BaseModalityConfig, BaseModalityProcessor
44
from multimeditron.model.modalities.moe.gating import GatingNetwork
55
from multimeditron.model.projectors.mlp import MLPProjector
66
from multimeditron.model.attention import CrossAttention

src/multimeditron/model/modalities/image_modality_moe_pep.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
1-
import uuid
21
from multimeditron.model.constants import NUM_EMBEDDINGS_KEY, MODALITY_VALUE_KEY
3-
from multimeditron.model.modalities.base import AutoModality, BaseModality, BaseModalityConfig, BaseModalityProcessor
2+
from multimeditron.model.modalities import AutoModality, BaseModality, BaseModalityConfig, BaseModalityProcessor
43
from multimeditron.model.modalities.moe.gating import GatingNetwork
54
from multimeditron.model.projectors.mlp import MLPProjector
65
from multimeditron.model.attention import CrossAttention

0 commit comments

Comments
 (0)