[caffe-contrib] 234/362: Merge tag 'upstream/0.9999_rc2+20150925+g674b349'

[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-contrib.

commit 67882435cd6b0c559a5d3afee9c51183e504b526
Merge: 10e4abf ee1cded
Author: Zhou Mo <cdluminate at gmail.com>
Date:   Fri Sep 25 05:27:19 2015 +0000

    Merge tag 'upstream/0.9999_rc2+20150925+g674b349'
    
    Upstream version 0.9999~rc2+20150925+g674b349

 .travis.yml                                      |  11 +-
 CMakeLists.txt                                   |   9 +-
 Makefile                                         |  38 ++-
 Makefile.config.example                          |   5 +
 cmake/ConfigGen.cmake                            |  12 +
 cmake/Dependencies.cmake                         |  41 ++-
 cmake/Summary.cmake                              |  18 +-
 cmake/Templates/CaffeConfig.cmake.in             |  26 +-
 cmake/Templates/caffe_config.h.in                |   5 +
 docs/installation.md                             |   9 +-
 docs/multigpu.md                                 |  26 ++
 examples/cpp_classification/classification.cpp   |   8 +
 examples/feature_extraction/readme.md            |   2 +-
 examples/mnist/convert_mnist_data.cpp            |  12 +
 examples/siamese/convert_mnist_siamese_data.cpp  |   9 +-
 include/caffe/blob.hpp                           |   2 +
 include/caffe/common_layers.hpp                  |   4 +-
 include/caffe/data_layers.hpp                    |   3 +-
 include/caffe/data_transformer.hpp               |   5 +-
 include/caffe/solver.hpp                         |  16 +-
 include/caffe/util/db_leveldb.hpp                |   2 +
 include/caffe/util/db_lmdb.hpp                   |   2 +
 include/caffe/util/im2col.hpp                    |  24 ++
 include/caffe/util/io.hpp                        |   2 +
 include/caffe/vision_layers.hpp                  | 111 ++++--
 python/caffe/__init__.py                         |   2 +-
 python/caffe/_caffe.cpp                          |   9 +
 python/caffe/io.py                               |   2 +-
 python/caffe/net_spec.py                         |  10 +-
 python/caffe/pycaffe.py                          |   3 +-
 python/caffe/test/test_layer_type_list.py        |   1 +
 python/caffe/test/test_net_spec.py               |   3 +-
 scripts/travis/travis_build_and_test.sh          |  15 +-
 scripts/travis/travis_setup_makefile_config.sh   |   6 +
 src/caffe/blob.cpp                               |  11 +
 src/caffe/data_transformer.cpp                   |  16 +-
 src/caffe/layers/base_conv_layer.cpp             | 235 ++++++++-----
 src/caffe/layers/concat_layer.cpp                |   6 +
 src/caffe/layers/concat_layer.cu                 |   2 +
 src/caffe/layers/conv_layer.cpp                  |  31 +-
 src/caffe/layers/conv_layer.cu                   |  16 +-
 src/caffe/layers/cudnn_conv_layer.cpp            |  46 +--
 src/caffe/layers/cudnn_conv_layer.cu             |  18 +-
 src/caffe/layers/data_layer.cpp                  |   3 +-
 src/caffe/layers/deconv_layer.cpp                |  31 +-
 src/caffe/layers/deconv_layer.cu                 |  16 +-
 src/caffe/layers/im2col_layer.cpp                | 171 +++++++---
 src/caffe/layers/im2col_layer.cu                 |  41 ++-
 src/caffe/layers/image_data_layer.cpp            |   2 +
 src/caffe/layers/memory_data_layer.cpp           |   4 +
 src/caffe/layers/slice_layer.cpp                 |   7 +-
 src/caffe/layers/slice_layer.cu                  |   3 +-
 src/caffe/layers/window_data_layer.cpp           |   2 +
 src/caffe/net.cpp                                |  11 +-
 src/caffe/proto/caffe.proto                      |  44 ++-
 src/caffe/solver.cpp                             |  37 +-
 src/caffe/test/test_accuracy_layer.cpp           |  12 +-
 src/caffe/test/test_concat_layer.cpp             |  23 ++
 src/caffe/test/test_convolution_layer.cpp        | 409 +++++++++++++++++++----
 src/caffe/test/test_data/generate_sample_data.py |  12 +-
 src/caffe/test/test_data/sample_data_2_gzip.h5   | Bin 15446 -> 15446 bytes
 src/caffe/test/test_data_layer.cpp               |   6 +
 src/caffe/test/test_data_transformer.cpp         |   2 +
 src/caffe/test/test_db.cpp                       |   2 +
 src/caffe/test/test_deconvolution_layer.cpp      | 159 ++++++++-
 src/caffe/test/test_eltwise_layer.cpp            |   4 +-
 src/caffe/test/test_im2col_kernel.cu             |  87 ++++-
 src/caffe/test/test_im2col_layer.cpp             |  30 +-
 src/caffe/test/test_image_data_layer.cpp         |   2 +
 src/caffe/test/test_io.cpp                       |   2 +
 src/caffe/test/test_layer_factory.cpp            |   4 +
 src/caffe/test/test_memory_data_layer.cpp        |   5 +-
 src/caffe/test/test_net.cpp                      |  26 +-
 src/caffe/test/test_slice_layer.cpp              |  27 ++
 src/caffe/test/test_upgrade_proto.cpp            |  12 +-
 src/caffe/util/db.cpp                            |  14 +-
 src/caffe/util/db_leveldb.cpp                    |   2 +
 src/caffe/util/db_lmdb.cpp                       |   2 +
 src/caffe/util/hdf5.cpp                          |  29 +-
 src/caffe/util/im2col.cpp                        | 116 +++++++
 src/caffe/util/im2col.cu                         | 306 ++++++++++++++++-
 src/caffe/util/io.cpp                            |  10 +-
 src/caffe/util/upgrade_proto.cpp                 |   6 +-
 tools/caffe.cpp                                  |   1 +
 tools/compute_image_mean.cpp                     |   4 +
 tools/convert_imageset.cpp                       |   4 +
 tools/extract_features.cpp                       |   2 +-
 87 files changed, 2087 insertions(+), 439 deletions(-)

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