Skip to content

Commit

Permalink
v0.3 release
Browse files Browse the repository at this point in the history
Summary: Pull Request resolved: fairinternal/detectron2#479

Reviewed By: alexander-kirillov

Differential Revision: D24774746

Pulled By: ppwwyyxx

fbshipit-source-id: 33780d23975e236f29594cda55ffa33024cbce2a
  • Loading branch information
ppwwyyxx authored and facebook-github-bot committed Nov 6, 2020
1 parent 8e3effc commit 4841e70
Show file tree
Hide file tree
Showing 6 changed files with 30 additions and 21 deletions.
30 changes: 16 additions & 14 deletions INSTALL.md
Original file line number Diff line number Diff line change
Expand Up @@ -33,38 +33,40 @@ old build first. You often need to rebuild detectron2 after reinstalling PyTorch

### Install Pre-Built Detectron2 (Linux only)

Choose from this table to install [v0.2.1 (Aug 2020)](https://github.com/facebookresearch/detectron2/releases):
Choose from this table to install [v0.3 (Nov 2020)](https://github.com/facebookresearch/detectron2/releases):

<table class="docutils"><tbody><th width="80"> CUDA </th><th valign="bottom" align="left" width="100">torch 1.6</th><th valign="bottom" align="left" width="100">torch 1.5</th><th valign="bottom" align="left" width="100">torch 1.4</th> <tr><td align="left">10.2</td><td align="left"><details><summary> install </summary><pre><code>python -m pip install detectron2 -f \
<table class="docutils"><tbody><th width="80"> CUDA </th><th valign="bottom" align="left" width="100">torch 1.7</th><th valign="bottom" align="left" width="100">torch 1.6</th><th valign="bottom" align="left" width="100">torch 1.5</th> <tr><td align="left">11.0</td><td align="left"><details><summary> install </summary><pre><code>python -m pip install detectron2 -f \
https://dl.fbaipublicfiles.com/detectron2/wheels/cu110/torch1.7/index.html
</code></pre> </details> </td> <td align="left"> </td> <td align="left"> </td> </tr> <tr><td align="left">10.2</td><td align="left"><details><summary> install </summary><pre><code>python -m pip install detectron2 -f \
https://dl.fbaipublicfiles.com/detectron2/wheels/cu102/torch1.7/index.html
</code></pre> </details> </td> <td align="left"><details><summary> install </summary><pre><code>python -m pip install detectron2 -f \
https://dl.fbaipublicfiles.com/detectron2/wheels/cu102/torch1.6/index.html
</code></pre> </details> </td> <td align="left"><details><summary> install </summary><pre><code>python -m pip install detectron2 -f \
https://dl.fbaipublicfiles.com/detectron2/wheels/cu102/torch1.5/index.html
</code></pre> </details> </td> <td align="left"> </td> </tr> <tr><td align="left">10.1</td><td align="left"><details><summary> install </summary><pre><code>python -m pip install detectron2 -f \
</code></pre> </details> </td> </tr> <tr><td align="left">10.1</td><td align="left"><details><summary> install </summary><pre><code>python -m pip install detectron2 -f \
https://dl.fbaipublicfiles.com/detectron2/wheels/cu101/torch1.7/index.html
</code></pre> </details> </td> <td align="left"><details><summary> install </summary><pre><code>python -m pip install detectron2 -f \
https://dl.fbaipublicfiles.com/detectron2/wheels/cu101/torch1.6/index.html
</code></pre> </details> </td> <td align="left"><details><summary> install </summary><pre><code>python -m pip install detectron2 -f \
https://dl.fbaipublicfiles.com/detectron2/wheels/cu101/torch1.5/index.html
</code></pre> </details> </td> <td align="left"><details><summary> install </summary><pre><code>python -m pip install detectron2 -f \
https://dl.fbaipublicfiles.com/detectron2/wheels/cu101/torch1.4/index.html
</code></pre> </details> </td> </tr> <tr><td align="left">10.0</td><td align="left"> </td> <td align="left"> </td> <td align="left"><details><summary> install </summary><pre><code>python -m pip install detectron2 -f \
https://dl.fbaipublicfiles.com/detectron2/wheels/cu100/torch1.4/index.html
</code></pre> </details> </td> </tr> <tr><td align="left">9.2</td><td align="left"><details><summary> install </summary><pre><code>python -m pip install detectron2 -f \
https://dl.fbaipublicfiles.com/detectron2/wheels/cu92/torch1.7/index.html
</code></pre> </details> </td> <td align="left"><details><summary> install </summary><pre><code>python -m pip install detectron2 -f \
https://dl.fbaipublicfiles.com/detectron2/wheels/cu92/torch1.6/index.html
</code></pre> </details> </td> <td align="left"><details><summary> install </summary><pre><code>python -m pip install detectron2 -f \
https://dl.fbaipublicfiles.com/detectron2/wheels/cu92/torch1.5/index.html
</code></pre> </details> </td> <td align="left"><details><summary> install </summary><pre><code>python -m pip install detectron2 -f \
https://dl.fbaipublicfiles.com/detectron2/wheels/cu92/torch1.4/index.html
</code></pre> </details> </td> </tr> <tr><td align="left">cpu</td><td align="left"><details><summary> install </summary><pre><code>python -m pip install detectron2 -f \
https://dl.fbaipublicfiles.com/detectron2/wheels/cpu/torch1.7/index.html
</code></pre> </details> </td> <td align="left"><details><summary> install </summary><pre><code>python -m pip install detectron2 -f \
https://dl.fbaipublicfiles.com/detectron2/wheels/cpu/torch1.6/index.html
</code></pre> </details> </td> <td align="left"><details><summary> install </summary><pre><code>python -m pip install detectron2 -f \
https://dl.fbaipublicfiles.com/detectron2/wheels/cpu/torch1.5/index.html
</code></pre> </details> </td> <td align="left"><details><summary> install </summary><pre><code>python -m pip install detectron2 -f \
https://dl.fbaipublicfiles.com/detectron2/wheels/cpu/torch1.4/index.html
</code></pre> </details> </td> </tr></tbody></table>
</code></pre> </details> </td> </tr></tbody></table>


Note that:
1. The pre-built package has to be used with corresponding version of CUDA and official PyTorch release.
It will not work with a different version of PyTorch or a non-official build of PyTorch.
1. The pre-built package has to be used with corresponding version of CUDA and the official package of PyTorch.
Otherwise, please build detectron2 from source.
2. New packages are released every few months. Therefore, packages may not contain latest features in the master
branch and may not be compatible with the master branch of a research project that uses detectron2
(e.g. those in [projects](projects)).
Expand Down
2 changes: 1 addition & 1 deletion detectron2/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,4 @@

# This line will be programatically read/write by setup.py.
# Leave them at the bottom of this file and don't touch them.
__version__ = "0.2.1"
__version__ = "0.3"
2 changes: 1 addition & 1 deletion dev/packaging/build_wheel.sh
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ pip_install "torch==$PYTORCH_VERSION" \
-f https://download.pytorch.org/whl/"$CU_VERSION"/torch_stable.html

# use separate directories to allow parallel build
BASE_BUILD_DIR=build/cu$CU_VERSION-py$PYTHON_VERSION-pt$PYTORCH_VERSION
BASE_BUILD_DIR=build/$CU_VERSION-py$PYTHON_VERSION-pt$PYTORCH_VERSION
python setup.py \
build -b "$BASE_BUILD_DIR" \
bdist_wheel -b "$BASE_BUILD_DIR/build_dist" -d "wheels/$CU_VERSION/torch$PYTORCH_VERSION"
Expand Down
13 changes: 10 additions & 3 deletions dev/packaging/gen_install_table.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,14 @@
python -m pip install detectron2{d2_version} -f \\
https://dl.fbaipublicfiles.com/detectron2/wheels/{cuda}/torch{torch}/index.html
</code></pre> </details>"""
CUDA_SUFFIX = {"10.2": "cu102", "10.1": "cu101", "10.0": "cu100", "9.2": "cu92", "cpu": "cpu"}
CUDA_SUFFIX = {
"11.0": "cu110",
"10.2": "cu102",
"10.1": "cu101",
"10.0": "cu100",
"9.2": "cu92",
"cpu": "cpu",
}


def gen_header(torch_versions):
Expand All @@ -26,9 +33,9 @@ def gen_header(torch_versions):
d2_version = f"=={args.d2_version}" if args.d2_version else ""

all_versions = (
[("1.4", k) for k in ["10.1", "10.0", "9.2", "cpu"]]
+ [("1.5", k) for k in ["10.2", "10.1", "9.2", "cpu"]]
[("1.5", k) for k in ["10.2", "10.1", "9.2", "cpu"]]
+ [("1.6", k) for k in ["10.2", "10.1", "9.2", "cpu"]]
+ [("1.7", k) for k in ["11.0", "10.2", "10.1", "9.2", "cpu"]]
)

torch_versions = sorted({k[0] for k in all_versions}, key=float, reverse=True)
Expand Down
2 changes: 1 addition & 1 deletion dev/packaging/gen_wheel_index.sh
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ export LC_ALL=C # reproducible sort
index=$root/index.html

cd "$root"
for cu in cpu cu92 cu100 cu101 cu102; do
for cu in cpu cu92 cu100 cu101 cu102 cu110; do
cd "$root/$cu"
echo "Creating $PWD/index.html ..."
# First sort by torch version, then stable sort by d2 version with unique.
Expand Down
2 changes: 1 addition & 1 deletion docs/modules/config.rst
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
detectron2.config package
=========================

Related tutorials: :doc:`../tutorials/config`, :doc:`../tutorials/extend`.
Related tutorials: :doc:`../tutorials/configs`, :doc:`../tutorials/extend`.

.. automodule:: detectron2.config
:members:
Expand Down

0 comments on commit 4841e70

Please sign in to comment.