Merge pull request #732 from longjon/travis-pycaffe

Have Travis build pycaffe

.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,

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.