diff --git a/detectron2/__init__.py b/detectron2/__init__.py index 51685f6233..9cef6f0a6a 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.1.1" +__version__ = "0.1.2" diff --git a/dev/packaging/build_all_wheels.sh b/dev/packaging/build_all_wheels.sh index f865946a5c..eb64dea70c 100755 --- a/dev/packaging/build_all_wheels.sh +++ b/dev/packaging/build_all_wheels.sh @@ -1,7 +1,7 @@ #!/bin/bash -e # Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved -PYTORCH_VERSION=1.4 +PYTORCH_VERSION=1.5 build_for_one_cuda() { cu=$1 @@ -33,14 +33,14 @@ build_for_one_cuda() { cd /detectron2 && ./dev/packaging/build_wheel.sh EOF - if [[ "$cu" == "cu101" ]]; then - # build wheel without local version - cat </dev/null 2>&1 && pwd )" . "$script_dir/pkg_helpers.bash" echo "Build Settings:" -echo "CU_VERSION: $CU_VERSION" # e.g. cu100 -echo "D2_VERSION_SUFFIX: $D2_VERSION_SUFFIX" # e.g. +cu100 or "" +echo "CU_VERSION: $CU_VERSION" # e.g. cu101 +echo "D2_VERSION_SUFFIX: $D2_VERSION_SUFFIX" # e.g. +cu101 or "" echo "PYTHON_VERSION: $PYTHON_VERSION" # e.g. 3.6 echo "PYTORCH_VERSION: $PYTORCH_VERSION" # e.g. 1.4 setup_cuda setup_wheel_python +yum install ninja-build -y && ln -sv /usr/bin/ninja-build /usr/bin/ninja export TORCH_VERSION_SUFFIX="+$CU_VERSION" -if [[ "$CU_VERSION" == "cu101" ]]; then +if [[ "$CU_VERSION" == "cu102" ]]; then export TORCH_VERSION_SUFFIX="" fi pip_install pip numpy -U diff --git a/dev/packaging/pkg_helpers.bash b/dev/packaging/pkg_helpers.bash index ea89276c79..51e6185c7f 100755 --- a/dev/packaging/pkg_helpers.bash +++ b/dev/packaging/pkg_helpers.bash @@ -16,6 +16,10 @@ setup_cuda() { # Like other torch domain libraries, we choose common GPU architectures only. export FORCE_CUDA=1 case "$CU_VERSION" in + cu102) + export CUDA_HOME=/usr/local/cuda-10.2/ + export TORCH_CUDA_ARCH_LIST="3.5;3.7;5.0;5.2;6.0+PTX;6.1+PTX;7.0+PTX;7.5+PTX" + ;; cu101) export CUDA_HOME=/usr/local/cuda-10.1/ export TORCH_CUDA_ARCH_LIST="3.5;3.7;5.0;5.2;6.0+PTX;6.1+PTX;7.0+PTX;7.5+PTX" diff --git a/setup.py b/setup.py index e2129e7840..95816726fa 100644 --- a/setup.py +++ b/setup.py @@ -124,7 +124,7 @@ def get_model_zoo_configs() -> List[str]: url="https://github.com/facebookresearch/detectron2", description="Detectron2 is FAIR's next-generation research " "platform for object detection and segmentation.", - packages=find_packages(exclude=("configs", "tests")), + packages=find_packages(exclude=("configs", "tests*")), package_data={"detectron2.model_zoo": get_model_zoo_configs()}, python_requires=">=3.6", install_requires=[