From 82a57ce0b70057685962b352535147d9a8118578 Mon Sep 17 00:00:00 2001 From: Yuxin Wu Date: Fri, 23 Jul 2021 09:25:54 -0700 Subject: [PATCH] 0.5 release Summary: close /~https://github.com/facebookresearch/detectron2/issues/3158 Pull Request resolved: /~https://github.com/facebookresearch/detectron2/pull/3266 Reviewed By: zhanghang1989 Differential Revision: D29837548 Pulled By: ppwwyyxx fbshipit-source-id: 08c6341f038117667510e90b1e2a29d64fd38c13 --- INSTALL.md | 26 ++++++++++++-------------- detectron2/__init__.py | 2 +- dev/packaging/build_all_wheels.sh | 11 +++++------ dev/packaging/gen_install_table.py | 4 ++-- setup.py | 2 +- 5 files changed, 21 insertions(+), 24 deletions(-) diff --git a/INSTALL.md b/INSTALL.md index 8b4bcca813..60b37b4e99 100644 --- a/INSTALL.md +++ b/INSTALL.md @@ -28,34 +28,32 @@ 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.4 (Mar 2021)](/~https://github.com/facebookresearch/detectron2/releases): +Choose from this table to install [v0.5 (Jul 2021)](/~https://github.com/facebookresearch/detectron2/releases): -
CUDA torch 1.8torch 1.7torch 1.6
11.1
install 
python -m pip install detectron2 -f \
+
 CUDA torch 1.9torch 1.8torch 1.7 
11.1
 install 
python -m pip install detectron2 -f \
+  https://dl.fbaipublicfiles.com/detectron2/wheels/cu111/torch1.9/index.html
+
 
 		 
 install 
python -m pip install detectron2 -f \
   https://dl.fbaipublicfiles.com/detectron2/wheels/cu111/torch1.8/index.html
-
 
 		     
 
11.0  
 install 
python -m pip install detectron2 -f \
+
 
 		   
 
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 \
+
 
 		 
 
10.2
 install 
python -m pip install detectron2 -f \
+  https://dl.fbaipublicfiles.com/detectron2/wheels/cu102/torch1.9/index.html
+
 
 		 
 install 
python -m pip install detectron2 -f \
   https://dl.fbaipublicfiles.com/detectron2/wheels/cu102/torch1.8/index.html
 
 
 		 
 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
-
 
 		 
 
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.8/index.html
 
 
 		 
 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
-
 
 		 
 
9.2  
 install 
python -m pip install detectron2 -f \
+
 
 		 
 
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
 
 
 		 
 
cpu
 install 
python -m pip install detectron2 -f \
+  https://dl.fbaipublicfiles.com/detectron2/wheels/cpu/torch1.9/index.html
+
 
 		 
 install 
python -m pip install detectron2 -f \
   https://dl.fbaipublicfiles.com/detectron2/wheels/cpu/torch1.8/index.html
 
 
 		 
 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
 
 
 		 

 
 
diff --git a/detectron2/__init__.py b/detectron2/__init__.py
index 289017a728..89714dab72 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.4.1"
+__version__ = "0.5"
diff --git a/dev/packaging/build_all_wheels.sh b/dev/packaging/build_all_wheels.sh
index 00bdb9e595..40f2782516 100755
--- a/dev/packaging/build_all_wheels.sh
+++ b/dev/packaging/build_all_wheels.sh
@@ -27,7 +27,7 @@ build_one() {
   container_id="$container_name"_"$cu"_"$pytorch_ver"
 
   py_versions=(3.6 3.7 3.8)
-  if [[ $pytorch_ver == "1.8" ]]; then
+  if [[ $pytorch_ver != "1.7" ]]; then
     py_versions+=(3.9)
   fi
 
@@ -52,6 +52,10 @@ EOF
 if [[ -n "$1" ]] && [[ -n "$2" ]]; then
   build_one "$1" "$2"
 else
+  build_one cu111 1.9
+  build_one cu102 1.9
+  build_one cpu 1.9
+
   build_one cu111 1.8
   build_one cu102 1.8
   build_one cu101 1.8
@@ -62,9 +66,4 @@ else
   build_one cu101 1.7
   build_one cu92 1.7
   build_one cpu 1.7
-
-  build_one cu102 1.6
-  build_one cu101 1.6
-  build_one cu92 1.6
-  build_one cpu 1.6
 fi
diff --git a/dev/packaging/gen_install_table.py b/dev/packaging/gen_install_table.py
index bc7cf5aad4..5233ef6027 100755
--- a/dev/packaging/gen_install_table.py
+++ b/dev/packaging/gen_install_table.py
@@ -35,9 +35,9 @@ def gen_header(torch_versions):
     d2_version = f"=={args.d2_version}" if args.d2_version else ""
 
     all_versions = (
-        [("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"]]
+        [("1.7", k) for k in ["11.0", "10.2", "10.1", "9.2", "cpu"]]
         + [("1.8", k) for k in ["11.1", "10.2", "10.1", "cpu"]]
+        + [("1.9", k) for k in ["11.1", "10.2", "cpu"]]
     )
 
     torch_versions = sorted({k[0] for k in all_versions}, key=float, reverse=True)
diff --git a/setup.py b/setup.py
index 987ebdea65..6b259f25fc 100644
--- a/setup.py
+++ b/setup.py
@@ -177,7 +177,7 @@ def get_model_zoo_configs() -> List[str]:
         # NOTE: when updating fvcore/iopath version, make sure fvcore depends
         # on compatible version of iopath.
         "fvcore>=0.1.5,<0.1.6",  # required like this to make it pip installable
-        "iopath>=0.1.7,<0.1.9",
+        "iopath>=0.1.7,<0.1.10",
         "future",  # used by caffe2
         "pydot",  # used to save caffe2 SVGs
         "dataclasses; python_version<'3.7'",