[caffe] 02/05: Merge tag 'upstream/1.0.0_rc5'

[Zhou Mo]

This is an automated email from the git hooks/post-receive script.

cdluminate-guest pushed a commit to branch master
in repository caffe.

commit 0cb24cbcd80bf15df4d19b2b3213566b81401650
Merge: b8af4df 49b591a
Author: Zhou Mo <cdluminate at gmail.com>
Date:   Wed Mar 15 07:33:06 2017 +0000

    Merge tag 'upstream/1.0.0_rc5'
    
    Upstream version 1.0.0~rc5

 CMakeLists.txt                                  | 29 ++++++--
 Makefile                                        |  2 +-
 Makefile.config.example                         |  8 ++-
 cmake/ConfigGen.cmake                           | 65 +----------------
 cmake/Cuda.cmake                                | 12 ++--
 cmake/Dependencies.cmake                        | 92 +++++++++++++++----------
 cmake/Modules/FindvecLib.cmake                  |  2 +-
 cmake/ProtoBuf.cmake                            |  4 +-
 cmake/Templates/CaffeConfig.cmake.in            | 15 ++--
 cmake/Templates/caffe_config.h.in               | 19 -----
 docker/Makefile                                 | 50 --------------
 docker/README.md                                | 69 +++++++++----------
 docker/{standalone => }/cpu/Dockerfile          | 12 ++--
 docker/{standalone => }/gpu/Dockerfile          | 15 ++--
 docker/templates/Dockerfile.template            | 42 -----------
 docs/install_apt_debian.md                      | 76 ++++++++++----------
 docs/installation.md                            |  2 +-
 docs/tutorial/layers/accuracy.md                |  3 +-
 docs/tutorial/layers/argmax.md                  |  3 +-
 docs/tutorial/layers/infogainloss.md            |  5 +-
 docs/tutorial/layers/lrn.md                     |  4 +-
 docs/tutorial/layers/memorydata.md              |  2 +-
 docs/tutorial/layers/multinomiallogisticloss.md |  2 +-
 docs/tutorial/layers/silence.md                 |  8 +--
 matlab/+caffe/Net.m                             |  3 +
 matlab/+caffe/Solver.m                          |  3 +
 matlab/+caffe/private/caffe_.cpp                | 24 +++++++
 matlab/demo/classification_demo.m               |  7 +-
 python/CMakeLists.txt                           |  6 +-
 python/caffe/draw.py                            |  6 +-
 python/caffe/pycaffe.py                         | 11 +++
 python/caffe/test/test_net.py                   |  7 ++
 src/caffe/CMakeLists.txt                        | 16 ++++-
 src/caffe/net.cpp                               |  2 -
 src/caffe/proto/caffe.proto                     |  3 +-
 src/caffe/solver.cpp                            |  1 -
 src/gtest/CMakeLists.txt                        |  3 +
 tools/extra/parse_log.py                        |  2 +-
 tools/extra/plot_training_log.py.example        | 17 ++---
 39 files changed, 280 insertions(+), 372 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/caffe.git