Skip to content

Commit 1e21fa4

Browse files
ppwwyyxxfacebook-github-bot
authored andcommitted
bump version
Summary: Pull Request resolved: fairinternal/detectron2#404 Reviewed By: rbgirshick Differential Revision: D21368444 Pulled By: ppwwyyxx fbshipit-source-id: 4dd1fbee4487e9ff0a0da4d55b7164302752ceef
1 parent 04958b9 commit 1e21fa4

File tree

5 files changed

+20
-15
lines changed

5 files changed

+20
-15
lines changed

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.1.1"
10+
__version__ = "0.1.2"

dev/packaging/build_all_wheels.sh

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/bin/bash -e
22
# Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved
33

4-
PYTORCH_VERSION=1.4
4+
PYTORCH_VERSION=1.5
55

66
build_for_one_cuda() {
77
cu=$1
@@ -33,14 +33,14 @@ build_for_one_cuda() {
3333
cd /detectron2 && ./dev/packaging/build_wheel.sh
3434
EOF
3535

36-
if [[ "$cu" == "cu101" ]]; then
37-
# build wheel without local version
38-
cat <<EOF | docker exec -i $container_name sh
39-
export CU_VERSION=$cu D2_VERSION_SUFFIX= PYTHON_VERSION=$py
40-
export PYTORCH_VERSION=$PYTORCH_VERSION
41-
cd /detectron2 && ./dev/packaging/build_wheel.sh
42-
EOF
43-
fi
36+
# if [[ "$cu" == "cu101" ]]; then
37+
# # build wheel without local version
38+
# cat <<EOF | docker exec -i $container_name sh
39+
# export CU_VERSION=$cu D2_VERSION_SUFFIX= PYTHON_VERSION=$py
40+
# export PYTORCH_VERSION=$PYTORCH_VERSION
41+
# cd /detectron2 && ./dev/packaging/build_wheel.sh
42+
# EOF
43+
# fi
4444

4545
docker exec -i $container_name rm -rf /detectron2/build/$cu
4646
docker container stop $container_name
@@ -51,7 +51,7 @@ EOF
5151
if [[ -n "$1" ]]; then
5252
build_for_one_cuda "$1"
5353
else
54-
for cu in cu101 cu100 cu92 cpu; do
54+
for cu in cu102 cu101 cu92 cpu; do
5555
build_for_one_cuda "$cu"
5656
done
5757
fi

dev/packaging/build_wheel.sh

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,16 +8,17 @@ script_dir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
88
. "$script_dir/pkg_helpers.bash"
99

1010
echo "Build Settings:"
11-
echo "CU_VERSION: $CU_VERSION" # e.g. cu100
12-
echo "D2_VERSION_SUFFIX: $D2_VERSION_SUFFIX" # e.g. +cu100 or ""
11+
echo "CU_VERSION: $CU_VERSION" # e.g. cu101
12+
echo "D2_VERSION_SUFFIX: $D2_VERSION_SUFFIX" # e.g. +cu101 or ""
1313
echo "PYTHON_VERSION: $PYTHON_VERSION" # e.g. 3.6
1414
echo "PYTORCH_VERSION: $PYTORCH_VERSION" # e.g. 1.4
1515

1616
setup_cuda
1717
setup_wheel_python
18+
yum install ninja-build -y && ln -sv /usr/bin/ninja-build /usr/bin/ninja
1819

1920
export TORCH_VERSION_SUFFIX="+$CU_VERSION"
20-
if [[ "$CU_VERSION" == "cu101" ]]; then
21+
if [[ "$CU_VERSION" == "cu102" ]]; then
2122
export TORCH_VERSION_SUFFIX=""
2223
fi
2324
pip_install pip numpy -U

dev/packaging/pkg_helpers.bash

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,10 @@ setup_cuda() {
1616
# Like other torch domain libraries, we choose common GPU architectures only.
1717
export FORCE_CUDA=1
1818
case "$CU_VERSION" in
19+
cu102)
20+
export CUDA_HOME=/usr/local/cuda-10.2/
21+
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"
22+
;;
1923
cu101)
2024
export CUDA_HOME=/usr/local/cuda-10.1/
2125
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"

setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ def get_model_zoo_configs() -> List[str]:
124124
url="https://github.com/facebookresearch/detectron2",
125125
description="Detectron2 is FAIR's next-generation research "
126126
"platform for object detection and segmentation.",
127-
packages=find_packages(exclude=("configs", "tests")),
127+
packages=find_packages(exclude=("configs", "tests*")),
128128
package_data={"detectron2.model_zoo": get_model_zoo_configs()},
129129
python_requires=">=3.6",
130130
install_requires=[

0 commit comments

Comments
 (0)