[caffe] branch master updated (7336b3a -> bc147a6)

Zhou Mo cdluminate-guest at moszumanska.debian.org
Tue Mar 8 14:58:08 UTC 2016


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

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

      from  7336b3a   Merge tag 'upstream/1.0.0_rc2-git20151212-g7953918'
      adds  6b43d5a   Imported Upstream version 1.0.0~rc3
       new  bc147a6   Merge tag 'upstream/1.0.0_rc3'

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.


Summary of changes:
 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 +-
 .../{inner_product_layer.hpp => bias_layer.hpp}    |  33 +-
 include/caffe/layers/conv_layer.hpp                |   3 +
 .../caffe/layers/{relu_layer.hpp => elu_layer.hpp} |  55 +--
 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/{relu_layer.cpp => elu_layer.cpp} |  20 +-
 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, 2839 insertions(+), 509 deletions(-)
 copy include/caffe/layers/{inner_product_layer.hpp => bias_layer.hpp} (57%)
 copy include/caffe/layers/{relu_layer.hpp => elu_layer.hpp} (57%)
 create mode 100644 include/caffe/layers/scale_layer.hpp
 create mode 100644 matlab/+caffe/version.m
 create mode 100644 src/caffe/layers/bias_layer.cpp
 create mode 100644 src/caffe/layers/bias_layer.cu
 copy src/caffe/layers/{relu_layer.cpp => elu_layer.cpp} (61%)
 create mode 100644 src/caffe/layers/elu_layer.cu
 create mode 100644 src/caffe/layers/scale_layer.cpp
 create mode 100644 src/caffe/layers/scale_layer.cu
 create mode 100644 src/caffe/solvers/adadelta_solver.cu
 create mode 100644 src/caffe/solvers/adagrad_solver.cu
 create mode 100644 src/caffe/solvers/adam_solver.cu
 create mode 100644 src/caffe/solvers/nesterov_solver.cu
 create mode 100644 src/caffe/solvers/rmsprop_solver.cu
 create mode 100644 src/caffe/solvers/sgd_solver.cu
 create mode 100644 src/caffe/test/test_bias_layer.cpp
 create mode 100644 src/caffe/test/test_scale_layer.cpp

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



More information about the debian-science-commits mailing list