diff options
author | Evan Shelhamer <shelhamer@imaginarynumber.net> | 2014-07-15 15:56:36 +0200 |
---|---|---|
committer | Evan Shelhamer <shelhamer@imaginarynumber.net> | 2014-07-17 11:57:47 +0200 |
commit | e52d91ea331dfd1430384808db272926561b116f (patch) | |
tree | 34704ca094edd1cee6b812e0a2a7c2fec9947995 /.travis.yml | |
parent | b882c3b4707eeb072a04490c6f36bd7c4deb03df (diff) | |
download | caffeonacl-e52d91ea331dfd1430384808db272926561b116f.tar.gz caffeonacl-e52d91ea331dfd1430384808db272926561b116f.tar.bz2 caffeonacl-e52d91ea331dfd1430384808db272926561b116f.zip |
collect CUDA includes and calls, separate from CPU-only mode, leave out
- collect CUDA includes in device_alternate.hpp
- add guards for CUDA code
- move GPU code into cu from cpp
- make CUDA includes and libraries conditional in Makefile
- drop CUDA dependency from travis-ci build
Diffstat (limited to '.travis.yml')
-rw-r--r-- | .travis.yml | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/.travis.yml b/.travis.yml index 1f780471..c0119756 100644 --- a/.travis.yml +++ b/.travis.yml @@ -19,14 +19,12 @@ before_install: install: - wget https://google-glog.googlecode.com/files/glog-0.3.3.tar.gz -O /tmp/glog-0.3.3.tar.gz && tar -C /tmp -xzvf /tmp/glog-0.3.3.tar.gz && rm /tmp/glog-0.3.3.tar.gz - cd /tmp/glog-0.3.3 && ./configure && make && sudo make install && cd - - - curl http://developer.download.nvidia.com/compute/cuda/repos/ubuntu1204/x86_64/cuda-repo-ubuntu1204_6.0-37_amd64.deb -o /tmp/cuda_install.deb && sudo dpkg -i /tmp/cuda_install.deb && rm /tmp/cuda_install.deb - - sudo apt-get -y update && sudo apt-get -y install cuda - curl https://gitorious.org/mdb/mdb/archive/7f038d0f15bec57b4c07aa3f31cd5564c88a1897.tar.gz -o /tmp/mdb.tar.gz && tar -C /tmp -xzvf /tmp/mdb.tar.gz && rm /tmp/mdb.tar.gz - cd /tmp/mdb-mdb/libraries/liblmdb/ && make && sudo make install && cd - before_script: - mv Makefile.config.example Makefile.config - - export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/local/cuda/lib64:/usr/local/lib + - export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/local/lib - export NUM_THREADS=4 script: |