[caffe] 02/02: Merge tag 'upstream/1.0.0_rc3+20160930-ga7f950b'

[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 126c96235b13f3e125696c6037361bb8842946f8
Merge: d08d71b b71d82f
Author: Zhou Mo <cdluminate at gmail.com>
Date:   Sat Oct 1 12:12:21 2016 +0000

    Merge tag 'upstream/1.0.0_rc3+20160930-ga7f950b'
    
    Upstream version 1.0.0~rc3+20160930-ga7f950b

 .gitignore                                         |  3 ++
 Makefile                                           |  5 +++-
 cmake/Cuda.cmake                                   | 15 +++++++---
 cmake/Dependencies.cmake                           |  8 ++++-
 cmake/Modules/FindAtlas.cmake                      |  6 ++--
 cmake/Modules/FindvecLib.cmake                     |  7 +++--
 docs/install_apt.md                                |  9 ++++--
 docs/tutorial/solver.md                            | 13 ++-------
 .../cifar10/cifar10_full_sigmoid_solver.prototxt   |  2 +-
 .../cifar10_full_sigmoid_solver_bn.prototxt        |  2 +-
 examples/cpp_classification/readme.md              |  4 +--
 examples/net_surgery.ipynb                         |  2 +-
 include/caffe/layer_factory.hpp                    |  2 +-
 include/caffe/layers/batch_norm_layer.hpp          | 29 +++++++++---------
 include/caffe/layers/bias_layer.hpp                | 10 +++----
 include/caffe/layers/scale_layer.hpp               | 12 ++++----
 include/caffe/solver.hpp                           |  2 +-
 include/caffe/solver_factory.hpp                   |  2 +-
 include/caffe/util/mkl_alternate.hpp               |  5 ++++
 include/caffe/util/upgrade_proto.hpp               |  6 ++++
 scripts/travis/install-deps.sh                     |  2 +-
 src/caffe/layers/batch_norm_layer.cpp              | 12 ++++++++
 src/caffe/layers/loss_layer.cpp                    |  4 +--
 src/caffe/layers/scale_layer.cpp                   | 14 +++++++--
 src/caffe/proto/caffe.proto                        |  2 +-
 src/caffe/util/benchmark.cpp                       |  3 +-
 src/caffe/util/upgrade_proto.cpp                   | 34 +++++++++++++++++++++-
 27 files changed, 148 insertions(+), 67 deletions(-)

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