Skip to content

Commit 5f915ea

Browse files
committed
test cuda11
1 parent 406e03b commit 5f915ea

File tree

2 files changed

+27
-12
lines changed

2 files changed

+27
-12
lines changed

script/cuda.sh

Lines changed: 24 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ fi
66

77
if [ "${TRAVIS_OS_NAME}" = "linux" ] && [ "$IDX" = "cu92" ]; then
88
export CUDA_SHORT=9.2
9-
export CUDA=9-2_9.2.148-1
9+
export CUDA=9.2.148-1
1010
export UBUNTU_VERSION=ubuntu1604
1111
export CUBLAS=cuda-cublas-dev-9-2
1212
export TOOLKIT="cudatoolkit=${CUDA_SHORT}"
@@ -15,7 +15,7 @@ fi
1515
if [ "${TRAVIS_OS_NAME}" = "linux" ] && [ "$IDX" = "cu101" ]; then
1616
export IDX=cu101
1717
export CUDA_SHORT=10.1
18-
export CUDA=10-1_10.1.243-1
18+
export CUDA=10.1.243-1
1919
export UBUNTU_VERSION=ubuntu1804
2020
export CUBLAS=libcublas-dev
2121
export TOOLKIT="cudatoolkit=${CUDA_SHORT}"
@@ -24,17 +24,17 @@ fi
2424

2525
if [ "${TRAVIS_OS_NAME}" = "linux" ] && [ "$IDX" = "cu102" ]; then
2626
export CUDA_SHORT=10.2
27-
export CUDA=10-2_10.2.89-1
27+
export CUDA=10.2.89-1
2828
export UBUNTU_VERSION=ubuntu1804
2929
export CUBLAS=libcublas-dev
3030
export TOOLKIT="cudatoolkit=${CUDA_SHORT}"
3131
fi
3232

3333
if [ "${TRAVIS_OS_NAME}" = "linux" ] && [ "$IDX" = "cu110" ]; then
3434
export CUDA_SHORT=11.0
35-
export CUDA=11-1_11.0.3-1
36-
export UBUNTU_VERSION=ubuntu1804
37-
export CUBLAS=libcublas-dev
35+
# export CUDA=11-1_11.0.3-1
36+
# export UBUNTU_VERSION=ubuntu1804
37+
# export CUBLAS=libcublas-dev
3838
export TOOLKIT="cudatoolkit=${CUDA_SHORT}"
3939
fi
4040

@@ -80,14 +80,29 @@ else
8080
export FORCE_CUDA=1
8181
fi
8282

83-
if [ "${TRAVIS_OS_NAME}" = "linux" ] && [ "${IDX}" != "cpu" ]; then
84-
INSTALLER="cuda-${CUDA}_amd64.deb"
83+
if [ "${TRAVIS_OS_NAME}" = "linux" ] && [ "${IDX}" != "cpu" ] && [ "${IDX}" != "cu110" ]; then
84+
INSTALLER="cuda-repo-${UBUNTU_VERSION}_${CUDA}_amd64.deb"
8585
wget -nv "http://developer.download.nvidia.com/compute/cuda/repos/${UBUNTU_VERSION}/x86_64/${INSTALLER}"
8686
sudo dpkg -i "${INSTALLER}"
8787
wget -nv "https://developer.download.nvidia.com/compute/cuda/repos/${UBUNTU_VERSION}/x86_64/7fa2af80.pub"
8888
sudo apt-key add 7fa2af80.pub
8989
sudo apt update -qq
90-
sudo apt install -y cuda
90+
sudo apt install -y "cuda-core-${CUDA_SHORT/./-}" "cuda-cudart-dev-${CUDA_SHORT/./-}" "${CUBLAS}" "cuda-cusparse-dev-${CUDA_SHORT/./-}" "cuda-cusolver-dev-${CUDA_SHORT/./-}" "cuda-curand-dev-${CUDA_SHORT/./-}"
91+
sudo apt clean
92+
CUDA_HOME=/usr/local/cuda-${CUDA_SHORT}
93+
LD_LIBRARY_PATH=${CUDA_HOME}/lib64:${LD_LIBRARY_PATH}
94+
PATH=${CUDA_HOME}/bin:${PATH}
95+
nvcc --version
96+
fi
97+
98+
if [ "${TRAVIS_OS_NAME}" = "linux" ] [ "${IDX}" = "cu110" ]; then
99+
wget https://developer.download.nvidia.com/compute/cuda/repos/ubuntu1804/x86_64/cuda-ubuntu1804.pin
100+
sudo mv cuda-ubuntu1804.pin /etc/apt/preferences.d/cuda-repository-pin-600
101+
wget https://developer.download.nvidia.com/compute/cuda/11.0.3/local_installers/cuda-repo-ubuntu1804-11-0-local_11.0.3-450.51.06-1_amd64.deb
102+
sudo dpkg -i cuda-repo-ubuntu1804-11-0-local_11.0.3-450.51.06-1_amd64.deb
103+
sudo apt-key add /var/cuda-repo-ubuntu1804-11-0-local/7fa2af80.pub
104+
sudo apt update -qq
105+
sudo apt install cuda
91106
sudo apt clean
92107
CUDA_HOME=/usr/local/cuda-${CUDA_SHORT}
93108
LD_LIBRARY_PATH=${CUDA_HOME}/lib64:${LD_LIBRARY_PATH}

script/torch.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,11 @@ fi
1010
if [ "${TRAVIS_OS_NAME}" = "windows" ] && [ "${TORCH_VERSION}" = "1.7.0" ]; then
1111
echo "Fix nvcc for PyTorch 1.7.0"
1212
sed -i.bak -e 's/constexpr Symbol Kind = ::c10::prim::profile;/const Symbol Kind;/g' /c/tools/miniconda3/envs/test/lib/site-packages/torch/include/torch/csrc/jit/ir/ir.h
13-
sed -i.bak '1346a\
14-
const Symbol ProfileOp::Kind = ::c10::prim::profile;' /c/tools/miniconda3/envs/test/lib/site-packages/torch/include/torch/csrc/jit/ir/ir.h
13+
sed -i.bak '1345a\
14+
const Symbol ProfileOp::Kind = ::c10::prim::profile;' /c/tools/miniconda3/envs/test/lib/site-packages/torch/include/torch/csrc/jit/ir/ir.h
1515
sed -i.bak -e 's/constexpr Symbol Kind = ::c10::prim::profile_optional;/const Symbol Kind;/g' /c/tools/miniconda3/envs/test/lib/site-packages/torch/include/torch/csrc/jit/ir/ir.h
1616
sed -i.bak '1368a\
17-
const Symbol ProfileOptionalOp::Kind = ::c10::prim::profile_optional;' /c/tools/miniconda3/envs/test/lib/site-packages/torch/include/torch/csrc/jit/ir/ir.h
17+
const Symbol ProfileOptionalOp::Kind = ::c10::prim::profile_optional;' /c/tools/miniconda3/envs/test/lib/site-packages/torch/include/torch/csrc/jit/ir/ir.h
1818

1919
echo "-------------------------"
2020
sed -n '1327,1375p' /c/tools/miniconda3/envs/test/lib/site-packages/torch/include/torch/csrc/jit/ir/ir.h

0 commit comments

Comments
 (0)