Update model zoo URLs on webpage, bump versions and deps. (#31)

kdexd · Jan 9, 2022 · 2baba8a · 2baba8a
1 parent c701790
commit 2baba8a
Show file tree

Hide file tree

Showing 6 changed files with 39 additions and 158 deletions.
diff --git a/docs/_static/custom.css b/docs/_static/custom.css
diff --git a/docs/conf.py b/docs/conf.py
@@ -24,7 +24,7 @@
 author = "Karan Desai"
 
 # The full version, including alpha/beta/rc tags
-release = "1.3"
+release = "1.4"
 
 
 # -- General configuration ---------------------------------------------------
@@ -62,9 +62,9 @@
 # built documents.
 #
 # This version is used underneath the title on the index page.
-version = "1.3"
+version = "1.4"
 # The following is used if you need to also include a more detailed version.
-release = "1.3"
+release = "1.4"
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
@@ -92,15 +92,7 @@
 # The theme to use for HTML and HTML Help pages.  See the documentation for
 # a list of builtin themes.
 #
-html_theme = "alabaster"
-
-# html_theme_path = [sphinx_rtd_theme.get_html_theme_path()]
-
-# Theme options are theme-specific and customize the look and feel of a theme
-# further.  For a list of options available for each theme, see the
-# documentation.
-#
-# html_theme_options = {"collapse_navigation": False, "display_version": True}
+html_theme = "sphinx_rtd_theme"
 
 # Add any paths that contain custom static files (such as style sheets) here,
 # relative to this directory. They are copied after the builtin static files,

diff --git a/docs/virtex/usage/model_zoo.rst b/docs/virtex/usage/model_zoo.rst
@@ -87,31 +87,31 @@ Pretraining Task Ablations
         <td class="tg-0pky">task_ablations/bicaptioning_R_50_L1_H2048.yaml</td>
         <td class="tg-c3ow">88.7</td>
         <td class="tg-c3ow">53.8</td>
-        <td class="tg-c3ow"><a href="https://umich.box.com/shared/static/zu8zxtxrron29icd76owgjzojmfcgdk3.pth" target="_blank" rel="noopener noreferrer">model</a></td>
+        <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>
     </tr>
     <tr>
         <td class="tg-0pky">task_ablations/captioning_R_50_L1_H2048.yaml</td>
         <td class="tg-c3ow">88.6</td>
         <td class="tg-c3ow">50.8</td>
-        <td class="tg-c3ow"><a href="https://umich.box.com/shared/static/1q9qh1cj2u4r5laj7mefd2mlzwthnga7.pth" target="_blank" rel="noopener noreferrer">model</a></td>
+        <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>
     </tr>
     <tr>
         <td class="tg-0pky">task_ablations/token_classification_R_50.yaml</td>
         <td class="tg-c3ow">88.8</td>
         <td class="tg-c3ow">48.6</td>
-        <td class="tg-c3ow"><a href="https://umich.box.com/shared/static/idvoxjl60pzpcllkbvadqgvwazil2mis.pth" target="_blank" rel="noopener noreferrer">model</a></td>
+        <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>
     </tr>
     <tr>
         <td class="tg-0pky">task_ablations/multilabel_classification_R_50.yaml</td>
         <td class="tg-c3ow">86.2</td>
         <td class="tg-c3ow">46.2</td>
-        <td class="tg-c3ow"><a href="https://umich.box.com/shared/static/yvlflmo0klqy3m71p6ug06c6aeg282hy.pth" target="_blank" rel="noopener noreferrer">model</a></td>
+        <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>
     </tr>
     <tr>
         <td class="tg-0pky">task_ablations/masked_lm_R_50_L1_H2048.yaml</td>
         <td class="tg-c3ow">86.4</td>
         <td class="tg-c3ow">46.7</td>
-        <td class="tg-c3ow"><a href="https://umich.box.com/shared/static/x3eij00eslse9j35t9j9ijyj8zkbkizh.pth" target="_blank" rel="noopener noreferrer">model</a></td>
+        <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>
     </tr>
     </tbody>
     </table></div>
@@ -134,25 +134,25 @@ Width Ablations
         <td class="tg-0pky">width_ablations/bicaptioning_R_50_L1_H512.yaml</td>
         <td class="tg-c3ow">88.4</td>
         <td class="tg-c3ow">51.8</td>
-        <td class="tg-c3ow"><a href="https://umich.box.com/shared/static/wtk18v0vffws48u5yrj2qjt94wje1pit.pth" target="_blank" rel="noopener noreferrer">model</a></td>
+        <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>
     </tr>
     <tr>
         <td class="tg-0pky"><span style="font-weight:400;font-style:normal">width_ablations/bicaptioning_R_50_L1_H768.yaml</span></td>
         <td class="tg-c3ow">88.3</td>
         <td class="tg-c3ow">52.3</td>
-        <td class="tg-c3ow"><a href="https://umich.box.com/shared/static/e94n0iexdvksi252bn7sm2vqjnyt9okf.pth" target="_blank" rel="noopener noreferrer">model</a></td>
+        <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>
     </tr>
     <tr>
         <td class="tg-0pky"><span style="font-weight:400;font-style:normal">width_ablations/bicaptioning_R_50_L1_H1024.yaml</span></td>
         <td class="tg-c3ow">88.3</td>
         <td class="tg-c3ow">53.2</td>
-        <td class="tg-c3ow"><a href="https://umich.box.com/shared/static/1so9cu9y06gy27rqbzwvek4aakfd8opf.pth" target="_blank" rel="noopener noreferrer">model</a></td>
+        <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>
     </tr>
     <tr>
         <td class="tg-0pky"><span style="font-weight:400;font-style:normal">width_ablations/bicaptioning_R_50_L1_H2048.yaml</span></td>
         <td class="tg-c3ow">88.7</td>
         <td class="tg-c3ow">53.8</td>
-        <td class="tg-c3ow"><a href="https://umich.box.com/shared/static/zu8zxtxrron29icd76owgjzojmfcgdk3.pth" target="_blank" rel="noopener noreferrer">model</a></td>
+        <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>
     </tr>
     </tbody>
     </table></div>
@@ -175,25 +175,25 @@ Depth Ablations
         <td class="tg-0pky">depth_ablations/bicaptioning_R_50_L1_H1024.yaml</td>
         <td class="tg-c3ow">88.3</td>
         <td class="tg-c3ow">53.2</td>
-        <td class="tg-c3ow"><a href="https://umich.box.com/shared/static/1so9cu9y06gy27rqbzwvek4aakfd8opf.pth" target="_blank" rel="noopener noreferrer">model</a></td>
+        <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>
     </tr>
     <tr>
         <td class="tg-0pky">depth_ablations/bicaptioning_R_50_L2_H1024.yaml</td>
         <td class="tg-c3ow">88.8</td>
         <td class="tg-c3ow">53.8</td>
-        <td class="tg-c3ow"><a href="https://umich.box.com/shared/static/9e88f6l13a9r8wq5bbe8qnoh9zenanq3.pth" target="_blank" rel="noopener noreferrer">model</a></td>
+        <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>
     </tr>
     <tr>
         <td class="tg-0pky"><span style="font-weight:400;font-style:normal">depth_ablations/bicaptioning_R_50_L3_H1024.yaml</span></td>
         <td class="tg-c3ow">88.7</td>
         <td class="tg-c3ow">53.9</td>
-        <td class="tg-c3ow"><a href="https://umich.box.com/shared/static/4cv8052xiq91h7lyx52cp2a6m7m9qkgo.pth" target="_blank" rel="noopener noreferrer">model</a></td>
+        <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>
     </tr>
     <tr>
         <td class="tg-0pky"><span style="font-weight:400;font-style:normal">depth_ablations/bicaptioning_R_50_L4_H1024.yaml</span></td>
         <td class="tg-c3ow">88.7</td>
         <td class="tg-c3ow">53.9</td>
-        <td class="tg-c3ow"><a href="https://umich.box.com/shared/static/bk5w4471mgvwa5mv6e4c7htgsafzmfm0.pth" target="_blank" rel="noopener noreferrer">model</a></td>
+        <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>
     </tr>
     </tbody>
     </table></div>
@@ -216,19 +216,19 @@ Backbone Ablations
         <td class="tg-0pky">backbone_ablations/bicaptioning_R_50_L1_H1024.yaml</td>
         <td class="tg-c3ow">88.3</td>
         <td class="tg-c3ow">53.2</td>
-        <td class="tg-c3ow"><a href="https://umich.box.com/shared/static/1so9cu9y06gy27rqbzwvek4aakfd8opf.pth" target="_blank" rel="noopener noreferrer">model</a></td>
+        <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>
     </tr>
     <tr>
         <td class="tg-0pky">backbone_ablations/bicaptioning_R_50W2X_L1_H1024.yaml</td>
         <td class="tg-c3ow">88.5</td>
         <td class="tg-c3ow">52.9</td>
-        <td class="tg-c3ow"><a href="https://umich.box.com/shared/static/19vcaf1488945836kir9ebm5itgtugaw.pth" target="_blank" rel="noopener noreferrer">model</a></td>
+        <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>
     </tr>
     <tr>
         <td class="tg-0pky">backbone_ablations/bicaptioning_R_101_L1_H1024.yaml</td>
         <td class="tg-c3ow">88.7</td>
         <td class="tg-c3ow">52.1</td>
-        <td class="tg-c3ow"><a href="https://umich.box.com/shared/static/nptbh4jsj0c0kjsnc2hw754fkikpgx9v.pth" target="_blank" rel="noopener noreferrer">model</a></td>
+        <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>
     </tr>
     </tbody>
     </table></div>
diff --git a/docs/virtex/usage/setup_dependencies.rst b/docs/virtex/usage/setup_dependencies.rst
@@ -30,12 +30,20 @@ For these steps to install through Anaconda (or Miniconda).
     .. code-block:: shell
 
         cd virtex
-        conda create -n virtex python=3.6
+        conda create -n virtex python=3.8
         conda activate virtex
         pip install -r requirements.txt
 
 
-4. Install this codebase as a package in development version.
+4. Install additional packages from Github.
+
+    .. code-block:: shell
+
+        pip install git+git://github.com/facebookresearch/fvcore.git#egg=fvcore
+        pip install git+git://github.com/cocodataset/cocoapi.git#subdirectory=PythonAPI
+
+
+5. Install this codebase as a package in development version.
 
     .. code-block:: shell
 

diff --git a/requirements.txt b/requirements.txt
@@ -1,15 +1,12 @@
-albumentations>=0.5.0
+albumentations>=1.0
 Cython>=0.25
 future==0.18.0
-loguru==0.3.2
-mypy_extensions==0.4.1
-lvis==0.5.3
+loguru>=0.3
+lvis>=0.5
 numpy>=1.17
-opencv-python==4.2.0.32
-scikit-learn==0.21.3
+opencv-python>=4.2.0
+scikit-learn>=1.0
 sentencepiece>=0.1.90
-torch==1.7.0
-torchvision==0.8
+torch>=1.9
+torchvision>=0.10
 tqdm>=4.50.0
-git+git://github.com/facebookresearch/fvcore.git#egg=fvcore
-git+git://github.com/cocodataset/cocoapi.git#subdirectory=PythonAPI
diff --git a/setup.py b/setup.py
@@ -41,11 +41,11 @@ def get_model_zoo_configs() -> List[str]:
 
 setup(
     name="virtex",
-    version="1.3.0",
+    version="1.4.0",
     author="Karan Desai and Justin Johnson",
     description="VirTex: Learning Visual Representations with Textual Annotations",
     package_data={"virtex.model_zoo": get_model_zoo_configs()},
-    python_requires=">=3.6",
+    python_requires=">=3.8",
     license="MIT",
     zip_safe=True,
 )