From 866c1359853a2f9088bc4d2cd7ecb2fef0746de7 Mon Sep 17 00:00:00 2001 From: huy Date: Wed, 9 Jul 2014 23:02:06 -0700 Subject: [PATCH 01/23] added this branch for testing purposes --- .travis.yml | 39 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) create mode 100644 .travis.yml diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 00000000000..1ed410941bc --- /dev/null +++ b/.travis.yml @@ -0,0 +1,39 @@ +language: cpp +compiler: + - gcc + - clang +before_install: + - echo $LANG + - echo $LC_ALL + - apt-get -y update +install: + - apt-get -y install python-dev libprotobuf-dev libleveldb-dev libsnappy-dev libopencv-dev libboost-all-dev libhdf5-serial-dev + - pip install -r python/requirements.txt + - wget https://google-glog.googlecode.com/files/glog-0.3.3.tar.gz + - tar zxvf glog-0.3.3.tar.gz + - cd glog-0.3.3.tar.gz + - ./configure + - make && make install +script: + - make all + - make test + - make runtest +branches: + only: + - master + - dev + - travisci +notifications: + recipients: + - huy@huyng.com + email: + on_success: change + on_failure: always + irc: + channels: + - "chat.freenode.net#caffe" + template: + - "%{repository}/%{branch} (%{commit} - %{author}): %{message}" +os: + - linux + - osx From 02faffc448f847c5822be423d7a4c7e5dce9d127 Mon Sep 17 00:00:00 2001 From: huy Date: Wed, 9 Jul 2014 23:07:02 -0700 Subject: [PATCH 02/23] updated recipients --- .travis.yml | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index 1ed410941bc..a9ccfc1a61b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -24,9 +24,9 @@ branches: - dev - travisci notifications: - recipients: - - huy@huyng.com email: + recipients: + - huy@huyng.com on_success: change on_failure: always irc: @@ -34,6 +34,3 @@ notifications: - "chat.freenode.net#caffe" template: - "%{repository}/%{branch} (%{commit} - %{author}): %{message}" -os: - - linux - - osx From e238205b861dd4be6ab07cdc19b0c5153d24a541 Mon Sep 17 00:00:00 2001 From: huy Date: Wed, 9 Jul 2014 23:12:53 -0700 Subject: [PATCH 03/23] added before_script step --- .travis.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.travis.yml b/.travis.yml index a9ccfc1a61b..f5ad8ca8928 100644 --- a/.travis.yml +++ b/.travis.yml @@ -14,6 +14,8 @@ install: - cd glog-0.3.3.tar.gz - ./configure - make && make install +before_script: + - mv Makefile.config.example Makefile.config script: - make all - make test From fe42655803242bb396eaf8d243e19ff67af746fd Mon Sep 17 00:00:00 2001 From: huy Date: Wed, 9 Jul 2014 23:15:26 -0700 Subject: [PATCH 04/23] added sudo to all installation commands --- .travis.yml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index f5ad8ca8928..b30c3fd2149 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,15 +5,16 @@ compiler: before_install: - echo $LANG - echo $LC_ALL - - apt-get -y update + - sudo apt-get -y update install: - - apt-get -y install python-dev libprotobuf-dev libleveldb-dev libsnappy-dev libopencv-dev libboost-all-dev libhdf5-serial-dev - - pip install -r python/requirements.txt + - sudo apt-get -y install python-dev libprotobuf-dev libleveldb-dev libsnappy-dev libopencv-dev libboost-all-dev libhdf5-serial-dev + - sudo pip install -r python/requirements.txt - wget https://google-glog.googlecode.com/files/glog-0.3.3.tar.gz - tar zxvf glog-0.3.3.tar.gz - cd glog-0.3.3.tar.gz - ./configure - - make && make install + - make + - sudo make install before_script: - mv Makefile.config.example Makefile.config script: From bd5f6a73554dcea21ca6e642fc8bbdf404ed342e Mon Sep 17 00:00:00 2001 From: huy Date: Wed, 9 Jul 2014 23:24:12 -0700 Subject: [PATCH 05/23] added build status image --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index 6b45624fe50..70192f6a22a 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,5 @@ +![Build Status](https://travis-ci.org/huyng/caffe.svg?branch=travisci) + [Caffe: Convolutional Architecture for Fast Feature Extraction](http://caffe.berkeleyvision.org) Created by [Yangqing Jia](http://daggerfs.com), UC Berkeley EECS department. From 870c676e6b2c4865cd6d48ac063c86f1d4840edb Mon Sep 17 00:00:00 2001 From: huy Date: Wed, 9 Jul 2014 23:30:24 -0700 Subject: [PATCH 06/23] forgo install python deps --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index b30c3fd2149..2a0bb95718f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,7 +8,7 @@ before_install: - sudo apt-get -y update install: - sudo apt-get -y install python-dev libprotobuf-dev libleveldb-dev libsnappy-dev libopencv-dev libboost-all-dev libhdf5-serial-dev - - sudo pip install -r python/requirements.txt + # - sudo pip install -r python/requirements.txt - wget https://google-glog.googlecode.com/files/glog-0.3.3.tar.gz - tar zxvf glog-0.3.3.tar.gz - cd glog-0.3.3.tar.gz From 66751574801fb571a345f46595920324964fd53f Mon Sep 17 00:00:00 2001 From: huy Date: Wed, 9 Jul 2014 23:32:28 -0700 Subject: [PATCH 07/23] cd to glog dir --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 2a0bb95718f..11ae1a2b1c3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,7 +11,7 @@ install: # - sudo pip install -r python/requirements.txt - wget https://google-glog.googlecode.com/files/glog-0.3.3.tar.gz - tar zxvf glog-0.3.3.tar.gz - - cd glog-0.3.3.tar.gz + - cd glog-0.3.3 - ./configure - make - sudo make install From 7ca71ba146352912a6f05b731cfbb1ade9d5fe45 Mon Sep 17 00:00:00 2001 From: huy Date: Wed, 9 Jul 2014 23:34:37 -0700 Subject: [PATCH 08/23] leave glog dir --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 11ae1a2b1c3..fe2c6f4cbf4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -15,6 +15,7 @@ install: - ./configure - make - sudo make install + - cd .. before_script: - mv Makefile.config.example Makefile.config script: From 66ee738208386ebac0879dd53da4f8e64b5ae5fd Mon Sep 17 00:00:00 2001 From: huy Date: Wed, 9 Jul 2014 23:36:29 -0700 Subject: [PATCH 09/23] leave glog dir --- .travis.yml | 2 +- Makefile.config.example | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index fe2c6f4cbf4..3ef3ebdfb23 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,7 +7,7 @@ before_install: - echo $LC_ALL - sudo apt-get -y update install: - - sudo apt-get -y install python-dev libprotobuf-dev libleveldb-dev libsnappy-dev libopencv-dev libboost-all-dev libhdf5-serial-dev + - sudo apt-get -y install python-dev libprotobuf-dev libleveldb-dev libsnappy-dev libopencv-dev libboost-all-dev libhdf5-serial-dev nvidia-cuda-toolkit # - sudo pip install -r python/requirements.txt - wget https://google-glog.googlecode.com/files/glog-0.3.3.tar.gz - tar zxvf glog-0.3.3.tar.gz diff --git a/Makefile.config.example b/Makefile.config.example index 17c90016f75..715ca787990 100644 --- a/Makefile.config.example +++ b/Makefile.config.example @@ -6,10 +6,10 @@ # CUSTOM_CXX := g++ # CUDA directory contains bin/ and lib/ directories that we need. -CUDA_DIR := /usr/local/cuda +# CUDA_DIR := /usr/local/cuda # On Ubuntu 14.04, if cuda tools are installed via # "sudo apt-get install nvidia-cuda-toolkit" then use this instead: -# CUDA_DIR := /usr +CUDA_DIR := /usr # CUDA architecture setting: going with all of them (up to CUDA 5.5 compatible). # For the latest architecture, you need to install CUDA >= 6.0 and uncomment From 0ffeab5e2288dea466380737d23c51cdbd77448c Mon Sep 17 00:00:00 2001 From: huy Date: Wed, 9 Jul 2014 23:44:16 -0700 Subject: [PATCH 10/23] added protobuf compiler --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 3ef3ebdfb23..fabd078faed 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,7 +7,7 @@ before_install: - echo $LC_ALL - sudo apt-get -y update install: - - sudo apt-get -y install python-dev libprotobuf-dev libleveldb-dev libsnappy-dev libopencv-dev libboost-all-dev libhdf5-serial-dev nvidia-cuda-toolkit + - sudo apt-get -y install python-dev libprotobuf-dev libleveldb-dev libsnappy-dev libopencv-dev libboost-all-dev libhdf5-serial-dev nvidia-cuda-toolkit protobuf-compiler # - sudo pip install -r python/requirements.txt - wget https://google-glog.googlecode.com/files/glog-0.3.3.tar.gz - tar zxvf glog-0.3.3.tar.gz From faf761fa28eba5ede3a6470347e7eb94c745e423 Mon Sep 17 00:00:00 2001 From: huy Date: Thu, 10 Jul 2014 01:04:43 -0700 Subject: [PATCH 11/23] update cuda location --- Makefile.config.example | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile.config.example b/Makefile.config.example index 715ca787990..17c90016f75 100644 --- a/Makefile.config.example +++ b/Makefile.config.example @@ -6,10 +6,10 @@ # CUSTOM_CXX := g++ # CUDA directory contains bin/ and lib/ directories that we need. -# CUDA_DIR := /usr/local/cuda +CUDA_DIR := /usr/local/cuda # On Ubuntu 14.04, if cuda tools are installed via # "sudo apt-get install nvidia-cuda-toolkit" then use this instead: -CUDA_DIR := /usr +# CUDA_DIR := /usr # CUDA architecture setting: going with all of them (up to CUDA 5.5 compatible). # For the latest architecture, you need to install CUDA >= 6.0 and uncomment From 481ee574a6120b299133690eb7939d3f1776ebe1 Mon Sep 17 00:00:00 2001 From: huy Date: Thu, 10 Jul 2014 01:07:45 -0700 Subject: [PATCH 12/23] added cuda include --- Makefile.config.example | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile.config.example b/Makefile.config.example index 17c90016f75..0ad3c833512 100644 --- a/Makefile.config.example +++ b/Makefile.config.example @@ -51,7 +51,7 @@ PYTHON_LIB := /usr/local/lib # PYTHON_LIB := $(HOME)/anaconda/lib # Whatever else you find you need goes here. -INCLUDE_DIRS := $(PYTHON_INCLUDE) /usr/local/include +INCLUDE_DIRS := $(PYTHON_INCLUDE) /usr/local/include $(CUDA_DIR)/include LIBRARY_DIRS := $(PYTHON_LIB) /usr/local/lib /usr/lib BUILD_DIR := build From b9d9f69b407acec64ca3606f80e108343eeba0f6 Mon Sep 17 00:00:00 2001 From: huy Date: Thu, 10 Jul 2014 01:10:26 -0700 Subject: [PATCH 13/23] added open blas --- Makefile.config.example | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile.config.example b/Makefile.config.example index 0ad3c833512..53d026700ae 100644 --- a/Makefile.config.example +++ b/Makefile.config.example @@ -25,7 +25,7 @@ CUDA_ARCH := -gencode arch=compute_20,code=sm_20 \ # atlas for ATLAS (default) # mkl for MKL # open for OpenBlas -BLAS := atlas +BLAS := open # Custom (MKL/ATLAS/OpenBLAS) include and lib directories. # Leave commented to accept the defaults for your choice of BLAS # (which should work)! From bde49a60d0affe95aafa501ef8718d388bb26d92 Mon Sep 17 00:00:00 2001 From: huy Date: Thu, 10 Jul 2014 01:25:01 -0700 Subject: [PATCH 14/23] change back to atlas --- Makefile.config.example | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile.config.example b/Makefile.config.example index 53d026700ae..0ad3c833512 100644 --- a/Makefile.config.example +++ b/Makefile.config.example @@ -25,7 +25,7 @@ CUDA_ARCH := -gencode arch=compute_20,code=sm_20 \ # atlas for ATLAS (default) # mkl for MKL # open for OpenBlas -BLAS := open +BLAS := atlas # Custom (MKL/ATLAS/OpenBLAS) include and lib directories. # Leave commented to accept the defaults for your choice of BLAS # (which should work)! From e4a93d911c5134cfd81ef1b5a08c2821784f1320 Mon Sep 17 00:00:00 2001 From: huy Date: Thu, 10 Jul 2014 01:33:40 -0700 Subject: [PATCH 15/23] change back to atlas, added include dirs --- Makefile.config.example | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile.config.example b/Makefile.config.example index 0ad3c833512..27c181c58e4 100644 --- a/Makefile.config.example +++ b/Makefile.config.example @@ -51,8 +51,8 @@ PYTHON_LIB := /usr/local/lib # PYTHON_LIB := $(HOME)/anaconda/lib # Whatever else you find you need goes here. -INCLUDE_DIRS := $(PYTHON_INCLUDE) /usr/local/include $(CUDA_DIR)/include -LIBRARY_DIRS := $(PYTHON_LIB) /usr/local/lib /usr/lib +INCLUDE_DIRS := $(PYTHON_INCLUDE) /usr/local/include $(CUDA_DIR)/include /usr/include/atlas +LIBRARY_DIRS := $(PYTHON_LIB) /usr/local/lib /usr/lib $(CUDA_DIR)/lib /usr/lib/atlas BUILD_DIR := build DISTRIBUTE_DIR := distribute From 5065936f9da66a08ef164e05e209ccca5ef695f5 Mon Sep 17 00:00:00 2001 From: huy Date: Thu, 10 Jul 2014 01:34:34 -0700 Subject: [PATCH 16/23] change back to atlas, added include dirs --- Makefile.config.example | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile.config.example b/Makefile.config.example index 27c181c58e4..ebe61b18a68 100644 --- a/Makefile.config.example +++ b/Makefile.config.example @@ -52,7 +52,7 @@ PYTHON_LIB := /usr/local/lib # Whatever else you find you need goes here. INCLUDE_DIRS := $(PYTHON_INCLUDE) /usr/local/include $(CUDA_DIR)/include /usr/include/atlas -LIBRARY_DIRS := $(PYTHON_LIB) /usr/local/lib /usr/lib $(CUDA_DIR)/lib /usr/lib/atlas +LIBRARY_DIRS := $(PYTHON_LIB) /usr/local/lib /usr/lib $(CUDA_DIR)/lib /usr/lib/atlas-base BUILD_DIR := build DISTRIBUTE_DIR := distribute From 35ae80b3fd5723b3e078dd5563a1e8d984da26ed Mon Sep 17 00:00:00 2001 From: huy Date: Thu, 10 Jul 2014 01:45:06 -0700 Subject: [PATCH 17/23] should be working build --- .travis.yml | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/.travis.yml b/.travis.yml index fabd078faed..93d57f53e52 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,15 +7,19 @@ before_install: - echo $LC_ALL - sudo apt-get -y update install: - - sudo apt-get -y install python-dev libprotobuf-dev libleveldb-dev libsnappy-dev libopencv-dev libboost-all-dev libhdf5-serial-dev nvidia-cuda-toolkit protobuf-compiler - # - sudo pip install -r python/requirements.txt - - wget https://google-glog.googlecode.com/files/glog-0.3.3.tar.gz - - tar zxvf glog-0.3.3.tar.gz - - cd glog-0.3.3 - - ./configure - - make + - sudo apt-get -y install wget git curl python-dev libprotobuf-dev libleveldb-dev libsnappy-dev libopencv-dev libboost-all-dev libhdf5-serial-dev protobuf-compiler libatlas-dev libatlas-base-dev + - wget https://google-glog.googlecode.com/files/glog-0.3.3.tar.gz && tar xzvf glog-0.3.3.tar.gz + - cd 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 xzvf /tmp/mdb.tar.gz && rm /tmp/mdb.tar.gz + - cd mdb-mdb/libraries/liblmdb/ && make + - sudo make install before_script: - mv Makefile.config.example Makefile.config script: From ab4ca9aa6624d66d865ad5ccde8befff46fcd445 Mon Sep 17 00:00:00 2001 From: huy Date: Thu, 10 Jul 2014 02:27:35 -0700 Subject: [PATCH 18/23] should be working build --- .travis.yml | 20 +++++++------------- 1 file changed, 7 insertions(+), 13 deletions(-) diff --git a/.travis.yml b/.travis.yml index 93d57f53e52..8a79f5dfa74 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,19 +7,13 @@ before_install: - echo $LC_ALL - sudo apt-get -y update install: - - sudo apt-get -y install wget git curl python-dev libprotobuf-dev libleveldb-dev libsnappy-dev libopencv-dev libboost-all-dev libhdf5-serial-dev protobuf-compiler libatlas-dev libatlas-base-dev - - wget https://google-glog.googlecode.com/files/glog-0.3.3.tar.gz && tar xzvf glog-0.3.3.tar.gz - - cd 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 xzvf /tmp/mdb.tar.gz && rm /tmp/mdb.tar.gz - - cd mdb-mdb/libraries/liblmdb/ && make - - sudo make install + - apt-get -y install wget git curl python-dev libprotobuf-dev libleveldb-dev libsnappy-dev libopencv-dev libboost-all-dev libhdf5-serial-dev protobuf-compiler libatlas-dev libatlas-base-dev + - 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 && 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 && dpkg -i /tmp/cuda_install.deb && rm /tmp/cuda_install.deb + - apt-get -y update && 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 && make install && cd - before_script: - mv Makefile.config.example Makefile.config script: From c58c7a70e6755266adf78a93c2bc30e92754380d Mon Sep 17 00:00:00 2001 From: huy Date: Thu, 10 Jul 2014 02:28:36 -0700 Subject: [PATCH 19/23] should be working build --- .travis.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index 8a79f5dfa74..2e8226c2ce0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,13 +7,13 @@ before_install: - echo $LC_ALL - sudo apt-get -y update install: - - apt-get -y install wget git curl python-dev libprotobuf-dev libleveldb-dev libsnappy-dev libopencv-dev libboost-all-dev libhdf5-serial-dev protobuf-compiler libatlas-dev libatlas-base-dev + - sudo apt-get -y install wget git curl python-dev libprotobuf-dev libleveldb-dev libsnappy-dev libopencv-dev libboost-all-dev libhdf5-serial-dev protobuf-compiler libatlas-dev libatlas-base-dev - 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 && 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 && dpkg -i /tmp/cuda_install.deb && rm /tmp/cuda_install.deb - - apt-get -y update && apt-get -y install cuda + - 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 && make install && cd - + - cd /tmp/mdb-mdb/libraries/liblmdb/ && make && sudo make install && cd - before_script: - mv Makefile.config.example Makefile.config script: From 653f2bdb49ee5dbaa5aee2c165052f17f5fa1dd0 Mon Sep 17 00:00:00 2001 From: huy Date: Thu, 10 Jul 2014 03:03:17 -0700 Subject: [PATCH 20/23] point to the libfolder containing libcudart --- .travis.yml | 1 + Makefile.config.example | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 2e8226c2ce0..c8e0b8578dc 100644 --- a/.travis.yml +++ b/.travis.yml @@ -14,6 +14,7 @@ install: - 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 script: diff --git a/Makefile.config.example b/Makefile.config.example index ebe61b18a68..36ab08cef09 100644 --- a/Makefile.config.example +++ b/Makefile.config.example @@ -52,7 +52,7 @@ PYTHON_LIB := /usr/local/lib # Whatever else you find you need goes here. INCLUDE_DIRS := $(PYTHON_INCLUDE) /usr/local/include $(CUDA_DIR)/include /usr/include/atlas -LIBRARY_DIRS := $(PYTHON_LIB) /usr/local/lib /usr/lib $(CUDA_DIR)/lib /usr/lib/atlas-base +LIBRARY_DIRS := $(PYTHON_LIB) /usr/local/lib /usr/lib $(CUDA_DIR)/lib64 /usr/lib/atlas-base BUILD_DIR := build DISTRIBUTE_DIR := distribute From 1fd6f00ea520e564ec98f6eed46e4ee28741ba3c Mon Sep 17 00:00:00 2001 From: huy Date: Thu, 10 Jul 2014 03:26:01 -0700 Subject: [PATCH 21/23] added ld lib path --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index c8e0b8578dc..5c79c3d73e2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -20,7 +20,7 @@ before_script: script: - make all - make test - - make runtest + - LD_LIBRARY_PATH=/usr/local/cuda/lib64 make runtest branches: only: - master From 7108107b32771e40ac0fbc5233d6d760c2bf0784 Mon Sep 17 00:00:00 2001 From: huy Date: Thu, 10 Jul 2014 18:57:38 -0700 Subject: [PATCH 22/23] updated ldlibrary path --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 5c79c3d73e2..78619454bd5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -20,7 +20,7 @@ before_script: script: - make all - make test - - LD_LIBRARY_PATH=/usr/local/cuda/lib64 make runtest + - LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/local/cuda/lib64 make runtest branches: only: - master From 0333c9e86c2fd1fa46187a6288c3a24f9e8b26e1 Mon Sep 17 00:00:00 2001 From: huy Date: Thu, 10 Jul 2014 19:43:30 -0700 Subject: [PATCH 23/23] update so that we only run the build, forego the test until PR #561 gets merged --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 78619454bd5..153a32941e0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -20,7 +20,7 @@ before_script: script: - make all - make test - - LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/local/cuda/lib64 make runtest + # - LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/local/cuda/lib64 make runtest branches: only: - master