Skip to content

Commit 4841e70

Browse files
ppwwyyxxfacebook-github-bot
authored andcommitted
v0.3 release
Summary: Pull Request resolved: fairinternal/detectron2#479 Reviewed By: alexander-kirillov Differential Revision: D24774746 Pulled By: ppwwyyxx fbshipit-source-id: 33780d23975e236f29594cda55ffa33024cbce2a
1 parent 8e3effc commit 4841e70

File tree

6 files changed

+30
-21
lines changed

6 files changed

+30
-21
lines changed

INSTALL.md

Lines changed: 16 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -33,38 +33,40 @@ old build first. You often need to rebuild detectron2 after reinstalling PyTorch
3333

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

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

38-
<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 \
38+
<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 \
39+
https://dl.fbaipublicfiles.com/detectron2/wheels/cu110/torch1.7/index.html
40+
</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 \
41+
https://dl.fbaipublicfiles.com/detectron2/wheels/cu102/torch1.7/index.html
42+
</code></pre> </details> </td> <td align="left"><details><summary> install </summary><pre><code>python -m pip install detectron2 -f \
3943
https://dl.fbaipublicfiles.com/detectron2/wheels/cu102/torch1.6/index.html
4044
</code></pre> </details> </td> <td align="left"><details><summary> install </summary><pre><code>python -m pip install detectron2 -f \
4145
https://dl.fbaipublicfiles.com/detectron2/wheels/cu102/torch1.5/index.html
42-
</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 \
46+
</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 \
47+
https://dl.fbaipublicfiles.com/detectron2/wheels/cu101/torch1.7/index.html
48+
</code></pre> </details> </td> <td align="left"><details><summary> install </summary><pre><code>python -m pip install detectron2 -f \
4349
https://dl.fbaipublicfiles.com/detectron2/wheels/cu101/torch1.6/index.html
4450
</code></pre> </details> </td> <td align="left"><details><summary> install </summary><pre><code>python -m pip install detectron2 -f \
4551
https://dl.fbaipublicfiles.com/detectron2/wheels/cu101/torch1.5/index.html
46-
</code></pre> </details> </td> <td align="left"><details><summary> install </summary><pre><code>python -m pip install detectron2 -f \
47-
https://dl.fbaipublicfiles.com/detectron2/wheels/cu101/torch1.4/index.html
48-
</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 \
49-
https://dl.fbaipublicfiles.com/detectron2/wheels/cu100/torch1.4/index.html
5052
</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 \
53+
https://dl.fbaipublicfiles.com/detectron2/wheels/cu92/torch1.7/index.html
54+
</code></pre> </details> </td> <td align="left"><details><summary> install </summary><pre><code>python -m pip install detectron2 -f \
5155
https://dl.fbaipublicfiles.com/detectron2/wheels/cu92/torch1.6/index.html
5256
</code></pre> </details> </td> <td align="left"><details><summary> install </summary><pre><code>python -m pip install detectron2 -f \
5357
https://dl.fbaipublicfiles.com/detectron2/wheels/cu92/torch1.5/index.html
54-
</code></pre> </details> </td> <td align="left"><details><summary> install </summary><pre><code>python -m pip install detectron2 -f \
55-
https://dl.fbaipublicfiles.com/detectron2/wheels/cu92/torch1.4/index.html
5658
</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 \
59+
https://dl.fbaipublicfiles.com/detectron2/wheels/cpu/torch1.7/index.html
60+
</code></pre> </details> </td> <td align="left"><details><summary> install </summary><pre><code>python -m pip install detectron2 -f \
5761
https://dl.fbaipublicfiles.com/detectron2/wheels/cpu/torch1.6/index.html
5862
</code></pre> </details> </td> <td align="left"><details><summary> install </summary><pre><code>python -m pip install detectron2 -f \
5963
https://dl.fbaipublicfiles.com/detectron2/wheels/cpu/torch1.5/index.html
60-
</code></pre> </details> </td> <td align="left"><details><summary> install </summary><pre><code>python -m pip install detectron2 -f \
61-
https://dl.fbaipublicfiles.com/detectron2/wheels/cpu/torch1.4/index.html
62-
</code></pre> </details> </td> </tr></tbody></table>
64+
</code></pre> </details> </td> </tr></tbody></table>
6365

6466

6567
Note that:
66-
1. The pre-built package has to be used with corresponding version of CUDA and official PyTorch release.
67-
It will not work with a different version of PyTorch or a non-official build of PyTorch.
68+
1. The pre-built package has to be used with corresponding version of CUDA and the official package of PyTorch.
69+
Otherwise, please build detectron2 from source.
6870
2. New packages are released every few months. Therefore, packages may not contain latest features in the master
6971
branch and may not be compatible with the master branch of a research project that uses detectron2
7072
(e.g. those in [projects](projects)).

detectron2/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,4 @@
77

88
# This line will be programatically read/write by setup.py.
99
# Leave them at the bottom of this file and don't touch them.
10-
__version__ = "0.2.1"
10+
__version__ = "0.3"

dev/packaging/build_wheel.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ pip_install "torch==$PYTORCH_VERSION" \
2424
-f https://download.pytorch.org/whl/"$CU_VERSION"/torch_stable.html
2525

2626
# use separate directories to allow parallel build
27-
BASE_BUILD_DIR=build/cu$CU_VERSION-py$PYTHON_VERSION-pt$PYTORCH_VERSION
27+
BASE_BUILD_DIR=build/$CU_VERSION-py$PYTHON_VERSION-pt$PYTORCH_VERSION
2828
python setup.py \
2929
build -b "$BASE_BUILD_DIR" \
3030
bdist_wheel -b "$BASE_BUILD_DIR/build_dist" -d "wheels/$CU_VERSION/torch$PYTORCH_VERSION"

dev/packaging/gen_install_table.py

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,14 @@
77
python -m pip install detectron2{d2_version} -f \\
88
https://dl.fbaipublicfiles.com/detectron2/wheels/{cuda}/torch{torch}/index.html
99
</code></pre> </details>"""
10-
CUDA_SUFFIX = {"10.2": "cu102", "10.1": "cu101", "10.0": "cu100", "9.2": "cu92", "cpu": "cpu"}
10+
CUDA_SUFFIX = {
11+
"11.0": "cu110",
12+
"10.2": "cu102",
13+
"10.1": "cu101",
14+
"10.0": "cu100",
15+
"9.2": "cu92",
16+
"cpu": "cpu",
17+
}
1118

1219

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

2835
all_versions = (
29-
[("1.4", k) for k in ["10.1", "10.0", "9.2", "cpu"]]
30-
+ [("1.5", k) for k in ["10.2", "10.1", "9.2", "cpu"]]
36+
[("1.5", k) for k in ["10.2", "10.1", "9.2", "cpu"]]
3137
+ [("1.6", k) for k in ["10.2", "10.1", "9.2", "cpu"]]
38+
+ [("1.7", k) for k in ["11.0", "10.2", "10.1", "9.2", "cpu"]]
3239
)
3340

3441
torch_versions = sorted({k[0] for k in all_versions}, key=float, reverse=True)

dev/packaging/gen_wheel_index.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ export LC_ALL=C # reproducible sort
1414
index=$root/index.html
1515

1616
cd "$root"
17-
for cu in cpu cu92 cu100 cu101 cu102; do
17+
for cu in cpu cu92 cu100 cu101 cu102 cu110; do
1818
cd "$root/$cu"
1919
echo "Creating $PWD/index.html ..."
2020
# First sort by torch version, then stable sort by d2 version with unique.

docs/modules/config.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
detectron2.config package
22
=========================
33

4-
Related tutorials: :doc:`../tutorials/config`, :doc:`../tutorials/extend`.
4+
Related tutorials: :doc:`../tutorials/configs`, :doc:`../tutorials/extend`.
55

66
.. automodule:: detectron2.config
77
:members:

0 commit comments

Comments
 (0)