Merge pull request #880 from BVLC/next

Next: 0.9999

.gitignore

@@ -27,7 +27,9 @@
 *.mex*
 
 # build, distribute, and bins
-build/*
+build
+.build_debug/*
+.build_release/*
 distribute/*
 *.testbin
 *.bin

.travis.yml

@@ -14,26 +14,43 @@ 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
   - cd /tmp/glog-0.3.3 && ./configure && make && sudo make install && cd -
+  - wget https://github.com/schuhschuh/gflags/archive/master.zip -O /tmp/gflags-master.zip && pushd /tmp/ && unzip gflags-master.zip && cd gflags-master && mkdir build && cd build && export CXXFLAGS="-fPIC" && cmake .. && make VERBOSE=1 && sudo make install && popd
   - 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
+  - sudo apt-get -y update
+  # Install the minimal CUDA subpackages required to test Caffe build.
+  # For a full CUDA installation, add 'cuda' to the list of packages.
+  - sudo apt-get -y install cuda-core-6-0 cuda-extra-libs-6-0
+  # Create CUDA symlink at /usr/local/cuda
+  # (This would normally be created by the CUDA installer, but we create it
+  # manually since we did a partial installation.)
+  - sudo ln -s /usr/local/cuda-6.0 /usr/local/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:
-  - make --keep-going --jobs=$NUM_THREADS all test lint
+  # CPU-GPU: build only.
+  - export CPU_ONLY=0
+  - make --keep-going --jobs=$NUM_THREADS all
+  - make clean
+  # CPU-only: comprehensive.
+  - export CPU_ONLY=1
+  - make --keep-going --jobs=$NUM_THREADS all test warn lint
+  - make runtest
   - make --jobs=$NUM_THREADS all
   - 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,

CONTRIBUTORS.md

@@ -15,3 +15,5 @@ to see line-by-line credits and
 to see the change log even across renames and rewrites.
 
 Please refer to the [acknowledgements](http://caffe.berkeleyvision.org/#acknowledgements) on the Caffe site for further details.
+
+**Copyright** is held by the original contributor according to the versioning history; see LICENSE.

LICENSE

@@ -1,6 +1,22 @@
+COPYRIGHT
+
+All contributions by the University of California:
 Copyright (c) 2014, The Regents of the University of California (Regents)
 All rights reserved.
 
+All other contributions:
+Copyright (c) 2014, the respective contributors
+All rights reserved.
+
+Caffe uses a shared copyright model: each contributor holds copyright over
+their contributions to Caffe. The project versioning records all such
+contribution and copyright details. If a contributor wants to further mark
+their specific copyright on a particular contribution, they should indicate
+their copyright solely in the commit message of the change when it is
+committed.
+
+LICENSE
+
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are met: 
 
@@ -20,3 +36,9 @@ LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
 ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
 SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+CONTRIBUTION AGREEMENT
+
+By contributing to the BVLC/caffe repository through pull-request, comment,
+or otherwise, the contributor releases their content to the
+license and copyright terms herein.