Merge 58f9263 into 8da2088

.travis.yml

@@ -7,15 +7,21 @@ env:
     - CUDA_VERSION="10.0"
     - CUDA_PKG_VERSION="130-1"
     - CUDA_PKG=cuda-repo-ubuntu1404_${CUDA_VERSION}.${CUDA_PKG_VERSION}_amd64.deb
-    - CUDA_HOME=/usr/local/cuda
-    - PATH=${PATH}:${CUDA_HOME}/bin:${GOPATH}/bin
-    - LD_LIBRARY_PATH=${CUDA_HOME}/lib:${TRAVIS_HOME}/gopath/src/github.com/uber/aresdb/lib
+    - CUDA_LIB_LOCAL=${HOME}/cuda_lib_${CUDA_VERSION}
+    - CUDA_HOME=${CUDA_LIB_LOCAL}
+    - PATH=${PATH}:${CUDA_HOME}/bin:${GOPATH}/bin:${CUDA_HOME}/nvvm/bin
+    - LD_LIBRARY_PATH=${CUDA_HOME}/lib64:${TRAVIS_HOME}/gopath/src/github.com/uber/aresdb/lib
+    - NVCCFLAGS="-ldir ${CUDA_HOME}/nvvm/libdevice -noprof -I ${CUDA_HOME}/include/ -L ${CUDA_HOME}/lib64"
     - GTEST_ROOT=./build/googletest
 cache: 
   directories:
     - lib
     - gtest
 
+cache:
+  directories:
+  - $CUDA_LIB_LOCAL
+
 # safelist
 branches:
   only:

.travis/install_clang_tools.sh

@@ -13,6 +13,7 @@ popd
 mv /tmp/googletest ${output_dir}
 
 # install cppcheck
+sudo apt-get update
 sudo apt-get install cppcheck
 
 # install cpplint

.travis/install_cuda.sh

@@ -1,9 +1,15 @@
 #!/usr/bin/env bash
 set -ex
-wget http://developer.download.nvidia.com/compute/cuda/repos/ubuntu1404/x86_64/${CUDA_PKG}
-sudo apt-key adv --fetch-keys http://developer.download.nvidia.com/compute/cuda/repos/ubuntu1404/x86_64/7fa2af80.pub
-sudo dpkg -i ${CUDA_PKG}
-rm ${CUDA_PKG}
-sudo apt-get -y update
-sudo apt-get install -y --no-install-recommends  cuda-core-${CUDA_VERSION}  cuda-cudart-dev-${CUDA_VERSION}  cuda-cublas-dev-${CUDA_VERSION} cuda-curand-dev-${CUDA_VERSION}
-sudo ln -sf /usr/local/cuda-${CUDA_VERSION} /usr/local/cuda
+
+if [ "$(ls -A $CUDA_LIB_LOCAL)" ]; then
+    echo "Fetched cuda deps from cache"
+else
+    wget http://developer.download.nvidia.com/compute/cuda/repos/ubuntu1404/x86_64/${CUDA_PKG}
+    sudo apt-key adv --fetch-keys http://developer.download.nvidia.com/compute/cuda/repos/ubuntu1404/x86_64/7fa2af80.pub
+    sudo dpkg -i ${CUDA_PKG}
+    rm ${CUDA_PKG}
+    sudo apt-get -y update
+    sudo apt-get install -y --no-install-recommends  cuda-core-${CUDA_VERSION}  cuda-cudart-dev-${CUDA_VERSION}  cuda-cublas-dev-${CUDA_VERSION} cuda-curand-dev-${CUDA_VERSION}
+    mkdir -p ${CUDA_LIB_LOCAL}
+    sudo cp -rL /usr/local/cuda-${CUDA_VERSION}/bin /usr/local/cuda-${CUDA_VERSION}/lib64 /usr/local/cuda-${CUDA_VERSION}/include /usr/local/cuda-${CUDA_VERSION}/nvvm ${CUDA_LIB_LOCAL}
+fi