Skip to content

Commit 2baba8a

Browse files
authored
Update model zoo URLs on webpage, bump versions and deps. (#31)
1 parent c701790 commit 2baba8a

File tree

6 files changed

+39
-158
lines changed

6 files changed

+39
-158
lines changed

docs/_static/custom.css

Lines changed: 0 additions & 116 deletions
This file was deleted.

docs/conf.py

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
author = "Karan Desai"
2525

2626
# The full version, including alpha/beta/rc tags
27-
release = "1.3"
27+
release = "1.4"
2828

2929

3030
# -- General configuration ---------------------------------------------------
@@ -62,9 +62,9 @@
6262
# built documents.
6363
#
6464
# This version is used underneath the title on the index page.
65-
version = "1.3"
65+
version = "1.4"
6666
# The following is used if you need to also include a more detailed version.
67-
release = "1.3"
67+
release = "1.4"
6868

6969
# The language for content autogenerated by Sphinx. Refer to documentation
7070
# for a list of supported languages.
@@ -92,15 +92,7 @@
9292
# The theme to use for HTML and HTML Help pages. See the documentation for
9393
# a list of builtin themes.
9494
#
95-
html_theme = "alabaster"
96-
97-
# html_theme_path = [sphinx_rtd_theme.get_html_theme_path()]
98-
99-
# Theme options are theme-specific and customize the look and feel of a theme
100-
# further. For a list of options available for each theme, see the
101-
# documentation.
102-
#
103-
# html_theme_options = {"collapse_navigation": False, "display_version": True}
95+
html_theme = "sphinx_rtd_theme"
10496

10597
# Add any paths that contain custom static files (such as style sheets) here,
10698
# relative to this directory. They are copied after the builtin static files,

docs/virtex/usage/model_zoo.rst

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -87,31 +87,31 @@ Pretraining Task Ablations
8787
<td class="tg-0pky">task_ablations/bicaptioning_R_50_L1_H2048.yaml</td>
8888
<td class="tg-c3ow">88.7</td>
8989
<td class="tg-c3ow">53.8</td>
90-
<td class="tg-c3ow"><a href="https://umich.box.com/shared/static/zu8zxtxrron29icd76owgjzojmfcgdk3.pth" target="_blank" rel="noopener noreferrer">model</a></td>
90+
<td class="tg-c3ow"><a href="https://www.dropbox.com/s/mbeeso8wyieq8wy/bicaptioning_R_50_L1_H2048.pth?dl=0" target="_blank" rel="noopener noreferrer">model</a></td>
9191
</tr>
9292
<tr>
9393
<td class="tg-0pky">task_ablations/captioning_R_50_L1_H2048.yaml</td>
9494
<td class="tg-c3ow">88.6</td>
9595
<td class="tg-c3ow">50.8</td>
96-
<td class="tg-c3ow"><a href="https://umich.box.com/shared/static/1q9qh1cj2u4r5laj7mefd2mlzwthnga7.pth" target="_blank" rel="noopener noreferrer">model</a></td>
96+
<td class="tg-c3ow"><a href="https://www.dropbox.com/s/r6zen9k43m5oo58/captioning_R_50_L1_H2048.pth?dl=0" target="_blank" rel="noopener noreferrer">model</a></td>
9797
</tr>
9898
<tr>
9999
<td class="tg-0pky">task_ablations/token_classification_R_50.yaml</td>
100100
<td class="tg-c3ow">88.8</td>
101101
<td class="tg-c3ow">48.6</td>
102-
<td class="tg-c3ow"><a href="https://umich.box.com/shared/static/idvoxjl60pzpcllkbvadqgvwazil2mis.pth" target="_blank" rel="noopener noreferrer">model</a></td>
102+
<td class="tg-c3ow"><a href="https://www.dropbox.com/s/o4p9lki505r0mef/token_classification_R_50.pth?dl=0" target="_blank" rel="noopener noreferrer">model</a></td>
103103
</tr>
104104
<tr>
105105
<td class="tg-0pky">task_ablations/multilabel_classification_R_50.yaml</td>
106106
<td class="tg-c3ow">86.2</td>
107107
<td class="tg-c3ow">46.2</td>
108-
<td class="tg-c3ow"><a href="https://umich.box.com/shared/static/yvlflmo0klqy3m71p6ug06c6aeg282hy.pth" target="_blank" rel="noopener noreferrer">model</a></td>
108+
<td class="tg-c3ow"><a href="https://www.dropbox.com/s/hbspp3jv3u8h3bc/multilabel_classification_R_50.pth?dl=0" target="_blank" rel="noopener noreferrer">model</a></td>
109109
</tr>
110110
<tr>
111111
<td class="tg-0pky">task_ablations/masked_lm_R_50_L1_H2048.yaml</td>
112112
<td class="tg-c3ow">86.4</td>
113113
<td class="tg-c3ow">46.7</td>
114-
<td class="tg-c3ow"><a href="https://umich.box.com/shared/static/x3eij00eslse9j35t9j9ijyj8zkbkizh.pth" target="_blank" rel="noopener noreferrer">model</a></td>
114+
<td class="tg-c3ow"><a href="https://www.dropbox.com/s/ldzrk6vem4mg6bl/masked_lm_R_50_L1_H2048.pth?dl=0" target="_blank" rel="noopener noreferrer">model</a></td>
115115
</tr>
116116
</tbody>
117117
</table></div>
@@ -134,25 +134,25 @@ Width Ablations
134134
<td class="tg-0pky">width_ablations/bicaptioning_R_50_L1_H512.yaml</td>
135135
<td class="tg-c3ow">88.4</td>
136136
<td class="tg-c3ow">51.8</td>
137-
<td class="tg-c3ow"><a href="https://umich.box.com/shared/static/wtk18v0vffws48u5yrj2qjt94wje1pit.pth" target="_blank" rel="noopener noreferrer">model</a></td>
137+
<td class="tg-c3ow"><a href="https://www.dropbox.com/s/o9fr69jjqfn8a65/bicaptioning_R_50_L1_H512.pth?dl=0" target="_blank" rel="noopener noreferrer">model</a></td>
138138
</tr>
139139
<tr>
140140
<td class="tg-0pky"><span style="font-weight:400;font-style:normal">width_ablations/bicaptioning_R_50_L1_H768.yaml</span></td>
141141
<td class="tg-c3ow">88.3</td>
142142
<td class="tg-c3ow">52.3</td>
143-
<td class="tg-c3ow"><a href="https://umich.box.com/shared/static/e94n0iexdvksi252bn7sm2vqjnyt9okf.pth" target="_blank" rel="noopener noreferrer">model</a></td>
143+
<td class="tg-c3ow"><a href="https://www.dropbox.com/s/1zxglqrrbfufv9d/bicaptioning_R_50_L1_H768.pth?dl=0" target="_blank" rel="noopener noreferrer">model</a></td>
144144
</tr>
145145
<tr>
146146
<td class="tg-0pky"><span style="font-weight:400;font-style:normal">width_ablations/bicaptioning_R_50_L1_H1024.yaml</span></td>
147147
<td class="tg-c3ow">88.3</td>
148148
<td class="tg-c3ow">53.2</td>
149-
<td class="tg-c3ow"><a href="https://umich.box.com/shared/static/1so9cu9y06gy27rqbzwvek4aakfd8opf.pth" target="_blank" rel="noopener noreferrer">model</a></td>
149+
<td class="tg-c3ow"><a href="https://www.dropbox.com/s/pdat4tvhnqxel64/bicaptioning_R_50_L1_H1024.pth?dl=0" target="_blank" rel="noopener noreferrer">model</a></td>
150150
</tr>
151151
<tr>
152152
<td class="tg-0pky"><span style="font-weight:400;font-style:normal">width_ablations/bicaptioning_R_50_L1_H2048.yaml</span></td>
153153
<td class="tg-c3ow">88.7</td>
154154
<td class="tg-c3ow">53.8</td>
155-
<td class="tg-c3ow"><a href="https://umich.box.com/shared/static/zu8zxtxrron29icd76owgjzojmfcgdk3.pth" target="_blank" rel="noopener noreferrer">model</a></td>
155+
<td class="tg-c3ow"><a href="https://www.dropbox.com/s/mbeeso8wyieq8wy/bicaptioning_R_50_L1_H2048.pth?dl=0" target="_blank" rel="noopener noreferrer">model</a></td>
156156
</tr>
157157
</tbody>
158158
</table></div>
@@ -175,25 +175,25 @@ Depth Ablations
175175
<td class="tg-0pky">depth_ablations/bicaptioning_R_50_L1_H1024.yaml</td>
176176
<td class="tg-c3ow">88.3</td>
177177
<td class="tg-c3ow">53.2</td>
178-
<td class="tg-c3ow"><a href="https://umich.box.com/shared/static/1so9cu9y06gy27rqbzwvek4aakfd8opf.pth" target="_blank" rel="noopener noreferrer">model</a></td>
178+
<td class="tg-c3ow"><a href="https://www.dropbox.com/s/pdat4tvhnqxel64/bicaptioning_R_50_L1_H1024.pth?dl=0" target="_blank" rel="noopener noreferrer">model</a></td>
179179
</tr>
180180
<tr>
181181
<td class="tg-0pky">depth_ablations/bicaptioning_R_50_L2_H1024.yaml</td>
182182
<td class="tg-c3ow">88.8</td>
183183
<td class="tg-c3ow">53.8</td>
184-
<td class="tg-c3ow"><a href="https://umich.box.com/shared/static/9e88f6l13a9r8wq5bbe8qnoh9zenanq3.pth" target="_blank" rel="noopener noreferrer">model</a></td>
184+
<td class="tg-c3ow"><a href="https://www.dropbox.com/s/ft1vtt4okirzjgo/bicaptioning_R_50_L2_H1024.pth?dl=0" target="_blank" rel="noopener noreferrer">model</a></td>
185185
</tr>
186186
<tr>
187187
<td class="tg-0pky"><span style="font-weight:400;font-style:normal">depth_ablations/bicaptioning_R_50_L3_H1024.yaml</span></td>
188188
<td class="tg-c3ow">88.7</td>
189189
<td class="tg-c3ow">53.9</td>
190-
<td class="tg-c3ow"><a href="https://umich.box.com/shared/static/4cv8052xiq91h7lyx52cp2a6m7m9qkgo.pth" target="_blank" rel="noopener noreferrer">model</a></td>
190+
<td class="tg-c3ow"><a href="https://www.dropbox.com/s/5ldo1rcsnrshmjr/bicaptioning_R_50_L3_H1024.pth?dl=0" target="_blank" rel="noopener noreferrer">model</a></td>
191191
</tr>
192192
<tr>
193193
<td class="tg-0pky"><span style="font-weight:400;font-style:normal">depth_ablations/bicaptioning_R_50_L4_H1024.yaml</span></td>
194194
<td class="tg-c3ow">88.7</td>
195195
<td class="tg-c3ow">53.9</td>
196-
<td class="tg-c3ow"><a href="https://umich.box.com/shared/static/bk5w4471mgvwa5mv6e4c7htgsafzmfm0.pth" target="_blank" rel="noopener noreferrer">model</a></td>
196+
<td class="tg-c3ow"><a href="https://www.dropbox.com/s/zgiit2wcluuq3xh/bicaptioning_R_50_L4_H1024.pth?dl=0" target="_blank" rel="noopener noreferrer">model</a></td>
197197
</tr>
198198
</tbody>
199199
</table></div>
@@ -216,19 +216,19 @@ Backbone Ablations
216216
<td class="tg-0pky">backbone_ablations/bicaptioning_R_50_L1_H1024.yaml</td>
217217
<td class="tg-c3ow">88.3</td>
218218
<td class="tg-c3ow">53.2</td>
219-
<td class="tg-c3ow"><a href="https://umich.box.com/shared/static/1so9cu9y06gy27rqbzwvek4aakfd8opf.pth" target="_blank" rel="noopener noreferrer">model</a></td>
219+
<td class="tg-c3ow"><a href="https://www.dropbox.com/s/pdat4tvhnqxel64/bicaptioning_R_50_L1_H1024.pth?dl=0" target="_blank" rel="noopener noreferrer">model</a></td>
220220
</tr>
221221
<tr>
222222
<td class="tg-0pky">backbone_ablations/bicaptioning_R_50W2X_L1_H1024.yaml</td>
223223
<td class="tg-c3ow">88.5</td>
224224
<td class="tg-c3ow">52.9</td>
225-
<td class="tg-c3ow"><a href="https://umich.box.com/shared/static/19vcaf1488945836kir9ebm5itgtugaw.pth" target="_blank" rel="noopener noreferrer">model</a></td>
225+
<td class="tg-c3ow"><a href="https://www.dropbox.com/s/5o198ux709r6376/bicaptioning_R_50W2X_L1_H1024.pth?dl=0" target="_blank" rel="noopener noreferrer">model</a></td>
226226
</tr>
227227
<tr>
228228
<td class="tg-0pky">backbone_ablations/bicaptioning_R_101_L1_H1024.yaml</td>
229229
<td class="tg-c3ow">88.7</td>
230230
<td class="tg-c3ow">52.1</td>
231-
<td class="tg-c3ow"><a href="https://umich.box.com/shared/static/nptbh4jsj0c0kjsnc2hw754fkikpgx9v.pth" target="_blank" rel="noopener noreferrer">model</a></td>
231+
<td class="tg-c3ow"><a href="https://www.dropbox.com/s/bb74jubt68cpn80/bicaptioning_R_101_L1_H1024.pth?dl=0" target="_blank" rel="noopener noreferrer">model</a></td>
232232
</tr>
233233
</tbody>
234234
</table></div>

docs/virtex/usage/setup_dependencies.rst

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,12 +30,20 @@ For these steps to install through Anaconda (or Miniconda).
3030
.. code-block:: shell
3131
3232
cd virtex
33-
conda create -n virtex python=3.6
33+
conda create -n virtex python=3.8
3434
conda activate virtex
3535
pip install -r requirements.txt
3636
3737
38-
4. Install this codebase as a package in development version.
38+
4. Install additional packages from Github.
39+
40+
.. code-block:: shell
41+
42+
pip install git+git://github.com/facebookresearch/fvcore.git#egg=fvcore
43+
pip install git+git://github.com/cocodataset/cocoapi.git#subdirectory=PythonAPI
44+
45+
46+
5. Install this codebase as a package in development version.
3947

4048
.. code-block:: shell
4149

requirements.txt

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,12 @@
1-
albumentations>=0.5.0
1+
albumentations>=1.0
22
Cython>=0.25
33
future==0.18.0
4-
loguru==0.3.2
5-
mypy_extensions==0.4.1
6-
lvis==0.5.3
4+
loguru>=0.3
5+
lvis>=0.5
76
numpy>=1.17
8-
opencv-python==4.2.0.32
9-
scikit-learn==0.21.3
7+
opencv-python>=4.2.0
8+
scikit-learn>=1.0
109
sentencepiece>=0.1.90
11-
torch==1.7.0
12-
torchvision==0.8
10+
torch>=1.9
11+
torchvision>=0.10
1312
tqdm>=4.50.0
14-
git+git://github.com/facebookresearch/fvcore.git#egg=fvcore
15-
git+git://github.com/cocodataset/cocoapi.git#subdirectory=PythonAPI

setup.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,11 +41,11 @@ def get_model_zoo_configs() -> List[str]:
4141

4242
setup(
4343
name="virtex",
44-
version="1.3.0",
44+
version="1.4.0",
4545
author="Karan Desai and Justin Johnson",
4646
description="VirTex: Learning Visual Representations with Textual Annotations",
4747
package_data={"virtex.model_zoo": get_model_zoo_configs()},
48-
python_requires=">=3.6",
48+
python_requires=">=3.8",
4949
license="MIT",
5050
zip_safe=True,
5151
)

0 commit comments

Comments
 (0)