From 49381cc22c360b0c4c8c8e0df93ec6a445db3f30 Mon Sep 17 00:00:00 2001 From: Jonathan L Long Date: Fri, 18 Jul 2014 16:13:24 -0700 Subject: [PATCH 1/2] use /usr instead of /usr/local for default Python include/lib This makes the default settings usable with Travis/Ubuntu Python --- Makefile.config.example | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile.config.example b/Makefile.config.example index 708a39c7841..7c96d8a9356 100644 --- a/Makefile.config.example +++ b/Makefile.config.example @@ -42,15 +42,15 @@ BLAS := atlas # NOTE: this is required only if you will compile the python interface. # We need to be able to find Python.h and numpy/arrayobject.h. -PYTHON_INCLUDE := /usr/local/include/python2.7 \ - /usr/local/lib/python2.7/dist-packages/numpy/core/include +PYTHON_INCLUDE := /usr/include/python2.7 \ + /usr/lib/python2.7/dist-packages/numpy/core/include # Anaconda Python distribution is quite popular. Include path: # PYTHON_INCLUDE := $(HOME)/anaconda/include \ # $(HOME)/anaconda/include/python2.7 \ # $(HOME)/anaconda/lib/python2.7/site-packages/numpy/core/include # We need to be able to find libpythonX.X.so or .dylib. -PYTHON_LIB := /usr/local/lib +PYTHON_LIB := /usr/lib # PYTHON_LIB := $(HOME)/anaconda/lib # Whatever else you find you need goes here. From e8b23c47a9fe1b0cd6b707ced1b4ace202fd0e37 Mon Sep 17 00:00:00 2001 From: Jonathan L Long Date: Fri, 18 Jul 2014 15:48:36 -0700 Subject: [PATCH 2/2] Travis builds pycaffe --- .travis.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index c5445fcdb90..4a65090b7c4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -14,7 +14,7 @@ before_install: - echo $LANG - echo $LC_ALL - sudo apt-get -y update - - 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 bc + - sudo apt-get -y install wget git curl python-dev python-numpy libprotobuf-dev libleveldb-dev libsnappy-dev libopencv-dev libboost-all-dev libhdf5-serial-dev protobuf-compiler libatlas-dev libatlas-base-dev bc 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 @@ -42,6 +42,7 @@ script: - make --jobs=$NUM_THREADS test - make --jobs=$NUM_THREADS warn - make --jobs=$NUM_THREADS lint + - make --jobs=$NUM_THREADS pycaffe notifications: # Emails are sent to the committer's git-configured email address by default,