diff options
| author | Willem Jan Palenstijn <wjp@usecode.org> | 2016-03-03 14:20:28 +0100 |
|---|---|---|
| committer | Willem Jan Palenstijn <wjp@usecode.org> | 2016-03-03 14:20:28 +0100 |
| commit | a924b809252a187d49635b72c8c36c31777137b4 (patch) | |
| tree | 6b2599fd9d4fa1f798894c28f22c4c38d804b4a2 | |
| parent | f24d9457f56f60aa927600261500e4ca681d0033 (diff) | |
| parent | a27cb41f2d1dda5df3bf783fc5e2010552eb43be (diff) | |
| download | astra-a924b809252a187d49635b72c8c36c31777137b4.tar.gz astra-a924b809252a187d49635b72c8c36c31777137b4.tar.bz2 astra-a924b809252a187d49635b72c8c36c31777137b4.tar.xz astra-a924b809252a187d49635b72c8c36c31777137b4.zip | |
Merge pull request #33 from wjp/travis-test
Use travis-ci's apt packages for cuda
| -rw-r--r-- | .travis.yml | 8 | ||||
| -rw-r--r-- | build/linux/Makefile.in | 6 |
2 files changed, 9 insertions, 5 deletions
diff --git a/.travis.yml b/.travis.yml index f7e09e2..c6c2801 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,6 +13,10 @@ addons: apt: packages: - libboost-all-dev + - nvidia-common + - nvidia-current + - nvidia-cuda-toolkit + - nvidia-cuda-dev env: - CUDA=yes - CUDA=no @@ -27,15 +31,13 @@ before_install: - export PATH="$HOME/miniconda/bin:$PATH" - conda config --set always_yes yes --set changeps1 no - conda update conda - - if [ $CUDA == yes ]; then wget http://developer.download.nvidia.com/compute/cuda/6_0/rel/installers/cuda_6.0.37_linux_64.run; fi - - if [ $CUDA == yes ]; then bash cuda_6.0.37_linux_64.run -toolkit -toolkitpath=$HOME/cuda/ -silent; fi install: - conda install python=$TRAVIS_PYTHON_VERSION six numpy scipy cython - conda info -a - cd build/linux - ./autogen.sh - - if [ $CUDA == yes ]; then ./configure --prefix=$HOME/astra --with-python --with-cuda=$HOME/cuda/; else ./configure --prefix=$HOME/astra --with-python; fi + - if [ $CUDA == yes ]; then ./configure --prefix=$HOME/astra --with-python --with-cuda=$HOME/cuda/; else ./configure --prefix=$HOME/astra --with-python --without-cuda; fi - make -j 4 - make install diff --git a/build/linux/Makefile.in b/build/linux/Makefile.in index 9535b4c..951e9f0 100644 --- a/build/linux/Makefile.in +++ b/build/linux/Makefile.in @@ -315,8 +315,10 @@ ifeq ($(cuda),yes) ifeq ($(gen_static_libs),yes) @$(NVCC) $(NVCCFLAGS) -c $(<) -o $*.o >/dev/null 2>&1 endif - @# Generate a .d file, with target name $*.lo - @$(NVCC) $(NVCCFLAGS) -M $(<) -MT $(*F).lo -odir $(*D) -o $(*D)/$(DEPDIR)/$(*F).d + @# Generate a .d file, and change the target name in it from .o to .lo + @$(NVCC) $(NVCCFLAGS) -M $(<) -odir $(*D) -o $(*D)/$(DEPDIR)/$(*F).d2 + @sed '1s/\.o :/.lo :/' < $(*D)/$(DEPDIR)/$(*F).d2 > $(*D)/$(DEPDIR)/$(*F).d + @rm -f $(*D)/$(DEPDIR)/$(*F).d2 @# Generate empty targets for all dependencies listed in the .d file. @# This mimics gcc's -MP option. @for x in `cat $(*D)/$(DEPDIR)/$(*F).d`; do if test a$$x != a: -a a$$x != a\\; then echo -e "\n$$x:\n" >> $(*D)/$(DEPDIR)/$(*F).d; fi; done |