[caffe] 01/01: Merge tag 'upstream/1.0.0_rc3'

[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 bc147a6b28380f5b21286e9fae5fb30a2e40c17e
Merge: 7336b3a 6b43d5a
Author: Zhou Mo <cdluminate at gmail.com>
Date:   Tue Mar 8 14:56:43 2016 +0000

    Merge tag 'upstream/1.0.0_rc3'
    
    Upstream version 1.0.0~rc3

 CMakeLists.txt                                     |   5 +
 Makefile                                           |  36 +-
 Makefile.config.example                            |   5 +
 cmake/Dependencies.cmake                           |   4 +-
 cmake/Summary.cmake                                |   2 +-
 data/ilsvrc12/get_ilsvrc_aux.sh                    |   2 +-
 docs/installation.md                               |  14 +-
 examples/feature_extraction/readme.md              |   2 +-
 examples/finetune_flickr_style/readme.md           |   4 +-
 examples/mnist/readme.md                           |   4 +-
 include/caffe/common.hpp                           |   4 +
 include/caffe/layers/base_conv_layer.hpp           |  22 +-
 .../layers/{im2col_layer.hpp => bias_layer.hpp}    |  45 +-
 include/caffe/layers/conv_layer.hpp                |   3 +
 include/caffe/layers/elu_layer.hpp                 |  86 ++++
 include/caffe/layers/im2col_layer.hpp              |   2 +
 include/caffe/layers/scale_layer.hpp               |  83 ++++
 include/caffe/net.hpp                              |  15 +
 include/caffe/solver.hpp                           |   3 +
 include/caffe/util/im2col.hpp                      |  20 +-
 matlab/+caffe/private/caffe_.cpp                   |   8 +
 matlab/+caffe/version.m                            |   7 +
 python/caffe/__init__.py                           |   1 +
 python/caffe/_caffe.cpp                            |   7 +
 python/caffe/draw.py                               |  11 +-
 python/caffe/io.py                                 |   2 +-
 python/caffe/pycaffe.py                            |  18 +
 src/caffe/CMakeLists.txt                           |   4 +
 src/caffe/layer_factory.cpp                        |  30 +-
 src/caffe/layers/base_conv_layer.cpp               |  20 +-
 src/caffe/layers/bias_layer.cpp                    | 121 +++++
 src/caffe/layers/bias_layer.cu                     |  59 +++
 src/caffe/layers/conv_layer.cpp                    |   4 +-
 src/caffe/layers/deconv_layer.cpp                  |   4 +-
 src/caffe/layers/elu_layer.cpp                     |  47 ++
 src/caffe/layers/elu_layer.cu                      |  62 +++
 src/caffe/layers/flatten_layer.cpp                 |   2 +
 src/caffe/layers/im2col_layer.cpp                  |  25 +-
 src/caffe/layers/im2col_layer.cu                   |   6 +-
 src/caffe/layers/reshape_layer.cpp                 |   2 +
 src/caffe/layers/scale_layer.cpp                   | 219 +++++++++
 src/caffe/layers/scale_layer.cu                    | 135 ++++++
 src/caffe/proto/caffe.proto                        |  86 +++-
 src/caffe/solver.cpp                               |  37 +-
 src/caffe/solvers/adadelta_solver.cpp              |  66 +--
 src/caffe/solvers/adadelta_solver.cu               |  30 ++
 src/caffe/solvers/adagrad_solver.cpp               |  37 +-
 src/caffe/solvers/adagrad_solver.cu                |  26 ++
 src/caffe/solvers/adam_solver.cpp                  |  39 +-
 src/caffe/solvers/adam_solver.cu                   |  29 ++
 src/caffe/solvers/nesterov_solver.cpp              |  29 +-
 src/caffe/solvers/nesterov_solver.cu               |  27 ++
 src/caffe/solvers/rmsprop_solver.cpp               |  35 +-
 src/caffe/solvers/rmsprop_solver.cu                |  28 ++
 src/caffe/solvers/sgd_solver.cpp                   |  16 +-
 src/caffe/solvers/sgd_solver.cu                    |  24 +
 src/caffe/test/test_bias_layer.cpp                 | 467 +++++++++++++++++++
 src/caffe/test/test_convolution_layer.cpp          | 129 +++++-
 src/caffe/test/test_data_transformer.cpp           | 136 +++---
 src/caffe/test/test_embed_layer.cpp                |   4 -
 src/caffe/test/test_im2col_kernel.cu               |  26 +-
 src/caffe/test/test_im2col_layer.cpp               |  51 ++-
 src/caffe/test/test_neuron_layer.cpp               |  59 +++
 src/caffe/test/test_scale_layer.cpp                | 507 +++++++++++++++++++++
 src/caffe/util/im2col.cpp                          | 124 +++--
 src/caffe/util/im2col.cu                           | 246 ++++++----
 tools/caffe.cpp                                    |   5 +-
 67 files changed, 2933 insertions(+), 485 deletions(-)

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