Commit 79e66200 authored by peastman's avatar peastman
Browse files

Merge pull request #1358 from jchodera/cuda75

Update travis to use CUDA 7.5
parents 97136edd 52d29909
...@@ -37,10 +37,11 @@ matrix: ...@@ -37,10 +37,11 @@ matrix:
addons: {apt: {packages: []}} addons: {apt: {packages: []}}
- sudo: required - sudo: required
dist: trusty
env: ==CUDA_COMPILE== env: ==CUDA_COMPILE==
CUDA=true CUDA=true
OPENCL=false OPENCL=false
CUDA_VERSION="7.0-28" CUDA_VERSION="7.5-18"
CC=$CCACHE/gcc CC=$CCACHE/gcc
CXX=$CCACHE/g++ CXX=$CCACHE/g++
CMAKE_FLAGS=" CMAKE_FLAGS="
...@@ -51,7 +52,12 @@ matrix: ...@@ -51,7 +52,12 @@ matrix:
-DOPENMM_BUILD_SERIALIZATION_TESTS=OFF -DOPENMM_BUILD_SERIALIZATION_TESTS=OFF
-DOPENMM_BUILD_C_AND_FORTRAN_WRAPPERS=OFF -DOPENMM_BUILD_C_AND_FORTRAN_WRAPPERS=OFF
-DOPENMM_BUILD_EXAMPLES=OFF -DOPENMM_BUILD_EXAMPLES=OFF
-DOPENCL_LIBRARY=/usr/local/cuda-7.0/lib64/libOpenCL.so" -DOPENCL_LIBRARY=/usr/local/cuda-7.5/lib64/libOpenCL.so
-DCUDA_CUDART_LIBRARY=/usr/local/cuda-7.5/lib64/libcudart.so
-DCUDA_NVCC_EXECUTABLE=/usr/local/cuda-7.5/bin/nvcc
-DCUDA_SDK_ROOT_DIR=/usr/local/cuda-7.5/
-DCUDA_TOOLKIT_INCLUDE=/usr/local/cuda-7.5/include
-DCUDA_TOOLKIT_ROOT_DIR=/usr/local/cuda-7.5/"
addons: {apt: {packages: []}} addons: {apt: {packages: []}}
- language: objective-c - language: objective-c
...@@ -75,7 +81,7 @@ matrix: ...@@ -75,7 +81,7 @@ matrix:
- sudo: false - sudo: false
python: 2.7_with_system_site_packages python: 2.7_with_system_site_packages
env: ==PYTNON_2== env: ==PYTHON_2==
OPENCL=false OPENCL=false
CUDA=false CUDA=false
CC=$CCACHE/clang CC=$CCACHE/clang
...@@ -118,8 +124,8 @@ before_install: ...@@ -118,8 +124,8 @@ before_install:
fi fi
- if [[ "$CUDA" == "true" ]]; then - if [[ "$CUDA" == "true" ]]; then
wget "http://developer.download.nvidia.com/compute/cuda/repos/ubuntu1204/x86_64/cuda-repo-ubuntu1204_${CUDA_VERSION}_amd64.deb"; wget "http://developer.download.nvidia.com/compute/cuda/repos/ubuntu1404/x86_64/cuda-repo-ubuntu1404_${CUDA_VERSION}_amd64.deb";
sudo dpkg -i cuda-repo-ubuntu1204_${CUDA_VERSION}_amd64.deb; sudo dpkg -i cuda-repo-ubuntu1404_${CUDA_VERSION}_amd64.deb;
sudo apt-get update -qq; sudo apt-get update -qq;
export CUDA_APT=${CUDA_VERSION%-*}; export CUDA_APT=${CUDA_VERSION%-*};
export CUDA_APT=${CUDA_APT/./-}; export CUDA_APT=${CUDA_APT/./-};
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment