diff --git a/INSTALL.md b/INSTALL.md index cd382769a9..a8d114fcb0 100644 --- a/INSTALL.md +++ b/INSTALL.md @@ -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): -
CUDA torch 1.6torch 1.5torch 1.4
10.2
install 
python -m pip install detectron2 -f \
+
 CUDA torch 1.7torch 1.6torch 1.5 
11.0
 install 
python -m pip install detectron2 -f \
+  https://dl.fbaipublicfiles.com/detectron2/wheels/cu110/torch1.7/index.html
+
 
 		     
 
10.2
 install 
python -m pip install detectron2 -f \
+  https://dl.fbaipublicfiles.com/detectron2/wheels/cu102/torch1.7/index.html
+
 
 		 
 install 
python -m pip install detectron2 -f \
   https://dl.fbaipublicfiles.com/detectron2/wheels/cu102/torch1.6/index.html
 
 
 		 
 install 
python -m pip install detectron2 -f \
   https://dl.fbaipublicfiles.com/detectron2/wheels/cu102/torch1.5/index.html
-
 
 		   
 
10.1
 install 
python -m pip install detectron2 -f \
+
 
 		 
 
10.1
 install 
python -m pip install detectron2 -f \
+  https://dl.fbaipublicfiles.com/detectron2/wheels/cu101/torch1.7/index.html
+
 
 		 
 install 
python -m pip install detectron2 -f \
   https://dl.fbaipublicfiles.com/detectron2/wheels/cu101/torch1.6/index.html
 
 
 		 
 install 
python -m pip install detectron2 -f \
   https://dl.fbaipublicfiles.com/detectron2/wheels/cu101/torch1.5/index.html
-
 
 		 
 install 
python -m pip install detectron2 -f \
-  https://dl.fbaipublicfiles.com/detectron2/wheels/cu101/torch1.4/index.html
-
 
 		 
 
10.0    
 install 
python -m pip install detectron2 -f \
-  https://dl.fbaipublicfiles.com/detectron2/wheels/cu100/torch1.4/index.html
 
 
 		 
 
9.2
 install 
python -m pip install detectron2 -f \
+  https://dl.fbaipublicfiles.com/detectron2/wheels/cu92/torch1.7/index.html
+
 
 		 
 install 
python -m pip install detectron2 -f \
   https://dl.fbaipublicfiles.com/detectron2/wheels/cu92/torch1.6/index.html
 
 
 		 
 install 
python -m pip install detectron2 -f \
   https://dl.fbaipublicfiles.com/detectron2/wheels/cu92/torch1.5/index.html
-
 
 		 
 install 
python -m pip install detectron2 -f \
-  https://dl.fbaipublicfiles.com/detectron2/wheels/cu92/torch1.4/index.html
 
 
 		 
 
cpu
 install 
python -m pip install detectron2 -f \
+  https://dl.fbaipublicfiles.com/detectron2/wheels/cpu/torch1.7/index.html
+
 
 		 
 install 
python -m pip install detectron2 -f \
   https://dl.fbaipublicfiles.com/detectron2/wheels/cpu/torch1.6/index.html
 
 
 		 
 install 
python -m pip install detectron2 -f \
   https://dl.fbaipublicfiles.com/detectron2/wheels/cpu/torch1.5/index.html
-
 
 		 
 install 
python -m pip install detectron2 -f \
-  https://dl.fbaipublicfiles.com/detectron2/wheels/cpu/torch1.4/index.html
-  
 
 		 

+
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)). diff --git a/detectron2/__init__.py b/detectron2/__init__.py index 75deed8f32..93a2bd6bfe 100644 --- a/detectron2/__init__.py +++ b/detectron2/__init__.py @@ -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" diff --git a/dev/packaging/build_wheel.sh b/dev/packaging/build_wheel.sh index a7e0945fc3..2d9facccdc 100755 --- a/dev/packaging/build_wheel.sh +++ b/dev/packaging/build_wheel.sh @@ -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" diff --git a/dev/packaging/gen_install_table.py b/dev/packaging/gen_install_table.py index 2340698e71..954eea45e6 100755 --- a/dev/packaging/gen_install_table.py +++ b/dev/packaging/gen_install_table.py @@ -7,7 +7,14 @@ python -m pip install detectron2{d2_version} -f \\ https://dl.fbaipublicfiles.com/detectron2/wheels/{cuda}/torch{torch}/index.html """ -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): @@ -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) diff --git a/dev/packaging/gen_wheel_index.sh b/dev/packaging/gen_wheel_index.sh index 558a11cf4e..7413bace10 100755 --- a/dev/packaging/gen_wheel_index.sh +++ b/dev/packaging/gen_wheel_index.sh @@ -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. diff --git a/docs/modules/config.rst b/docs/modules/config.rst index ea3766d713..20f978c41e 100644 --- a/docs/modules/config.rst +++ b/docs/modules/config.rst @@ -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: