Skip to content

Commit 709dc15

Browse files
shelhamershelhamer
committed
Merge pull request BVLC#880 from BVLC/next
Next: 0.9999
2 parents b1c4f12 + 70a6b0b commit 709dc15

File tree

238 files changed

+12214
-6412
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

238 files changed

+12214
-6412
lines changed

‎.gitignore

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,9 @@
2727
*.mex*
2828

2929
# build, distribute, and bins
30-
build/*
30+
build
31+
.build_debug/*
32+
.build_release/*
3133
distribute/*
3234
*.testbin
3335
*.bin

‎.travis.yml

Lines changed: 21 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,26 +14,43 @@ before_install:
1414
- echo $LANG
1515
- echo $LC_ALL
1616
- sudo apt-get -y update
17-
- 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
17+
- 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
1818

1919
install:
2020
- 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
2121
- cd /tmp/glog-0.3.3 && ./configure && make && sudo make install && cd -
22+
- 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
2223
- 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
23-
- sudo apt-get -y update && sudo apt-get -y install cuda
24+
- sudo apt-get -y update
25+
# Install the minimal CUDA subpackages required to test Caffe build.
26+
# For a full CUDA installation, add 'cuda' to the list of packages.
27+
- sudo apt-get -y install cuda-core-6-0 cuda-extra-libs-6-0
28+
# Create CUDA symlink at /usr/local/cuda
29+
# (This would normally be created by the CUDA installer, but we create it
30+
# manually since we did a partial installation.)
31+
- sudo ln -s /usr/local/cuda-6.0 /usr/local/cuda
2432
- 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
2533
- cd /tmp/mdb-mdb/libraries/liblmdb/ && make && sudo make install && cd -
2634

2735
before_script:
2836
- mv Makefile.config.example Makefile.config
29-
- export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/local/cuda/lib64:/usr/local/lib
37+
- export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/local/lib
3038
- export NUM_THREADS=4
3139

3240
script:
33-
- make --keep-going --jobs=$NUM_THREADS all test lint
41+
# CPU-GPU: build only.
42+
- export CPU_ONLY=0
43+
- make --keep-going --jobs=$NUM_THREADS all
44+
- make clean
45+
# CPU-only: comprehensive.
46+
- export CPU_ONLY=1
47+
- make --keep-going --jobs=$NUM_THREADS all test warn lint
48+
- make runtest
3449
- make --jobs=$NUM_THREADS all
3550
- make --jobs=$NUM_THREADS test
51+
- make --jobs=$NUM_THREADS warn
3652
- make --jobs=$NUM_THREADS lint
53+
- make --jobs=$NUM_THREADS pycaffe
3754

3855
notifications:
3956
# Emails are sent to the committer's git-configured email address by default,

‎CONTRIBUTORS.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,3 +15,5 @@ to see line-by-line credits and
1515
to see the change log even across renames and rewrites.
1616

1717
Please refer to the [acknowledgements](http://caffe.berkeleyvision.org/#acknowledgements) on the Caffe site for further details.
18+
19+
**Copyright** is held by the original contributor according to the versioning history; see LICENSE.

‎LICENSE

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,22 @@
1+
COPYRIGHT
2+
3+
All contributions by the University of California:
14
Copyright (c) 2014, The Regents of the University of California (Regents)
25
All rights reserved.
36

7+
All other contributions:
8+
Copyright (c) 2014, the respective contributors
9+
All rights reserved.
10+
11+
Caffe uses a shared copyright model: each contributor holds copyright over
12+
their contributions to Caffe. The project versioning records all such
13+
contribution and copyright details. If a contributor wants to further mark
14+
their specific copyright on a particular contribution, they should indicate
15+
their copyright solely in the commit message of the change when it is
16+
committed.
17+
18+
LICENSE
19+
420
Redistribution and use in source and binary forms, with or without
521
modification, are permitted provided that the following conditions are met:
622

@@ -20,3 +36,9 @@ LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
2036
ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
2137
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
2238
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
39+
40+
CONTRIBUTION AGREEMENT
41+
42+
By contributing to the BVLC/caffe repository through pull-request, comment,
43+
or otherwise, the contributor releases their content to the
44+
license and copyright terms herein.

0 commit comments

Comments
 (0)