diff --git a/docs/_static/custom.css b/docs/_static/custom.css deleted file mode 100644 index 558bb8f1..00000000 --- a/docs/_static/custom.css +++ /dev/null @@ -1,116 +0,0 @@ -body { - padding: 40px 0 0 0; - font-size: 11pt; - font-family: Inconsolata !important; -} - -/* Monospace everywhere */ -h1, h2, h3, h4, div.sphinxsidebar h1, div.sphinxsidebar h2, -div.sphinxsidebar h3, div.sphinxsidebar h4, div.body h1, -div.body h2, div.body h3, div.body h4, .admonition-title { - font-family: Inconsolata !important; -} - -/* Make main content wider */ -div.document { - margin: auto; - width: 65%; -} - -/* Make sidebar slightly wider. */ -div.sphinxsidebar { - width: 250px; -} - -div.bodywrapper { - margin: 0 0 0 250px; -} - -div.body { - color: black; - max-width: 100% -} - -/* Darker headings */ -h1, h2, h3, h4, div.sphinxsidebar h1, div.sphinxsidebar h2, -div.sphinxsidebar h3, div.sphinxsidebar h4, div.body h1, -div.body h2, div.body h3, div.body h4 { - color: black; -} - -@media screen and (max-width: 875px) { - div.sphinxsidebar { - background-color: white; - } -} - -/* Darker bold words */ -strong { - color: #252525; -} - -/* TOC tree tag, view source link & permalink anchor styling. */ -div.sphinxsidebar a, .viewcode-link, a.reference { - color: darkgreen; - text-decoration: none; - border-bottom: 1px dashed green; - text-underline-position: under; -} -a.headerlink { - color: black; -} - -/* TOC tree tag, view source link & permalink anchor styling. */ -div.sphinxsidebar a:hover, .viewcode-link:hover, a.reference:hover, -a.headerlink:hover { - font-weight: 700; - border-bottom: 1px solid green; -} - -/* Add a light background to class signatures. */ -dl.class > dt:first-of-type, dl.function > dt:first-of-type, -dl.method > dt:first-of-type, dl.classmethod > dt:first-of-type, -dl.attribute > dt:first-of-type, dl.data > dt:first-of-type { - font-size: 12pt; - background-color: #d8f6e9; - padding: 10px 20px 10px 10px; - border: 1px solid #1b5e20; -} - -/* Add lightgrey background to code snippets. */ -pre { - background-color: #eeeeee !important; - border: 1pt solid #999999; - border-radius: 5px; -} - -/* Dark orange-red comments in code snippets. */ -.highlight .c1 { - color: #dd4533; -} - -.admonition, .note { - background-color: #fed8b1 !important; - border: 1pt solid #ff7700; - border-radius: 5px; -} - -/* Make "Parameters" subsection wider - display heading and content vertically. */ -dl.field-list { - display: block; -} - -/* Increase font size of subsection headings ("Parameters", "Examples" etc.) */ -.rubric, dl.field-list > dt.field-odd, dl.field-list > dt.field-even { - color: black; - font-size: 14pt; - font-weight: 700; - text-decoration: underline; - padding: 0px; - margin: 20px 0px 10px 0px; -} - -/* Add margins around methods and properties. */ -.py { - margin: 20px 0px 10px 0px; -} diff --git a/docs/conf.py b/docs/conf.py index 69dde551..e05efae6 100644 --- 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 index daee9ee4..ea39e95d 100644 --- a/docs/virtex/usage/model_zoo.rst +++ b/docs/virtex/usage/model_zoo.rst @@ -87,31 +87,31 @@ Pretraining Task Ablations task_ablations/bicaptioning_R_50_L1_H2048.yaml 88.7 53.8 - model + model task_ablations/captioning_R_50_L1_H2048.yaml 88.6 50.8 - model + model task_ablations/token_classification_R_50.yaml 88.8 48.6 - model + model task_ablations/multilabel_classification_R_50.yaml 86.2 46.2 - model + model task_ablations/masked_lm_R_50_L1_H2048.yaml 86.4 46.7 - model + model @@ -134,25 +134,25 @@ Width Ablations width_ablations/bicaptioning_R_50_L1_H512.yaml 88.4 51.8 - model + model width_ablations/bicaptioning_R_50_L1_H768.yaml 88.3 52.3 - model + model width_ablations/bicaptioning_R_50_L1_H1024.yaml 88.3 53.2 - model + model width_ablations/bicaptioning_R_50_L1_H2048.yaml 88.7 53.8 - model + model @@ -175,25 +175,25 @@ Depth Ablations depth_ablations/bicaptioning_R_50_L1_H1024.yaml 88.3 53.2 - model + model depth_ablations/bicaptioning_R_50_L2_H1024.yaml 88.8 53.8 - model + model depth_ablations/bicaptioning_R_50_L3_H1024.yaml 88.7 53.9 - model + model depth_ablations/bicaptioning_R_50_L4_H1024.yaml 88.7 53.9 - model + model @@ -216,19 +216,19 @@ Backbone Ablations backbone_ablations/bicaptioning_R_50_L1_H1024.yaml 88.3 53.2 - model + model backbone_ablations/bicaptioning_R_50W2X_L1_H1024.yaml 88.5 52.9 - model + model backbone_ablations/bicaptioning_R_101_L1_H1024.yaml 88.7 52.1 - model + model diff --git a/docs/virtex/usage/setup_dependencies.rst b/docs/virtex/usage/setup_dependencies.rst index d2f3ff47..289eeabb 100644 --- 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 index 35f7de76..f6ec3273 100644 --- 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 index 9a5e6ef0..a7d3693b 100644 --- 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, )