[caffe] 02/08: Merge tag 'upstream/1.0.0'

[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 a101065d7043c274e0a968b1b69c0311211d4cd1
Merge: f5220dc 195f1f4
Author: Zhou Mo <cdluminate at gmail.com>
Date:   Mon Apr 17 02:20:24 2017 +0000

    Merge tag 'upstream/1.0.0'
    
    Upstream version 1.0.0

 CMakeLists.txt                                 |  16 ++-
 CONTRIBUTORS.md                                |   2 +-
 Makefile                                       |   2 +-
 README.md                                      |   6 +-
 cmake/Dependencies.cmake                       |   2 +-
 cmake/Modules/FindAtlas.cmake                  |   4 +-
 cmake/Templates/caffe_config.h.in              |  15 +--
 cmake/Uninstall.cmake.in                       |  26 ++++
 docker/cpu/Dockerfile                          |   3 +-
 docker/gpu/Dockerfile                          |   5 +-
 docs/_layouts/default.html                     |   2 +-
 docs/development.md                            |   4 +-
 docs/index.md                                  |  47 +++----
 docs/install_apt.md                            |   2 +-
 docs/installation.md                           |   4 +-
 docs/model_zoo.md                              |  24 ++--
 docs/multigpu.md                               |   4 +-
 docs/performance_hardware.md                   |  73 -----------
 docs/tutorial/interfaces.md                    |   4 +-
 docs/tutorial/layers.md                        |   2 +-
 docs/tutorial/layers/sigmoid.md                |  10 ++
 examples/CMakeLists.txt                        |   3 +-
 examples/cifar10/cifar10_quick_solver.prototxt |   1 -
 examples/cifar10/train_full.sh                 |   4 +-
 examples/cifar10/train_quick.sh                |   2 +-
 examples/finetune_flickr_style/readme.md       |   2 +-
 include/caffe/layers/base_data_layer.hpp       |   2 -
 include/caffe/layers/data_layer.hpp            |   2 -
 include/caffe/layers/dummy_data_layer.hpp      |   2 -
 include/caffe/layers/hdf5_data_layer.hpp       |   2 -
 include/caffe/layers/hdf5_output_layer.hpp     |   2 -
 include/caffe/layers/infogain_loss_layer.hpp   |  35 +++++
 include/caffe/layers/input_layer.hpp           |   2 -
 include/caffe/layers/python_layer.hpp          |   4 -
 include/caffe/layers/window_data_layer.hpp     |   3 +-
 include/caffe/test/test_caffe_main.hpp         |   3 +-
 include/caffe/util/cudnn.hpp                   |  10 ++
 include/caffe/util/hdf5.hpp                    |   4 +-
 include/caffe/util/math_functions.hpp          |  12 +-
 include/caffe/util/mkl_alternate.hpp           |  19 +--
 models/bvlc_alexnet/readme.md                  |   2 +-
 models/bvlc_googlenet/readme.md                |   2 +-
 models/bvlc_reference_caffenet/readme.md       |   2 +-
 models/bvlc_reference_rcnn_ilsvrc13/readme.md  |   2 +-
 python/caffe/__init__.py                       |   2 +-
 python/caffe/_caffe.cpp                        |  56 ++++++--
 python/caffe/draw.py                           |  12 +-
 python/caffe/io.py                             |   2 +-
 python/caffe/net_spec.py                       |   4 +
 python/caffe/pycaffe.py                        |   4 +-
 python/caffe/test/test_draw.py                 |  37 ++++++
 python/caffe/test/test_nccl.py                 |  19 +++
 python/caffe/test/test_net.py                  |  45 ++++++-
 python/caffe/test/test_net_spec.py             |   8 ++
 scripts/caffe                                  |  73 +++++++++++
 scripts/cpp_lint.py                            |  39 +++---
 scripts/travis/install-deps.sh                 |  12 +-
 scripts/travis/install-python-deps.sh          |   1 +
 src/caffe/CMakeLists.txt                       |   6 +-
 src/caffe/layers/base_conv_layer.cpp           |   1 -
 src/caffe/layers/batch_norm_layer.cpp          |   6 +-
 src/caffe/layers/batch_norm_layer.cu           |   8 +-
 src/caffe/layers/cudnn_conv_layer.cpp          |   1 +
 src/caffe/layers/cudnn_relu_layer.cpp          |   1 +
 src/caffe/layers/eltwise_layer.cpp             |   4 +-
 src/caffe/layers/hdf5_data_layer.cpp           |   3 +-
 src/caffe/layers/infogain_loss_layer.cpp       | 172 +++++++++++++++++++++----
 src/caffe/layers/lstm_unit_layer.cpp           |   1 -
 src/caffe/layers/pooling_layer.cu              |   4 +-
 src/caffe/layers/sigmoid_layer.cpp             |   2 +-
 src/caffe/layers/sigmoid_layer.cu              |   2 +-
 src/caffe/net.cpp                              |   3 +-
 src/caffe/proto/caffe.proto                    |  23 +++-
 src/caffe/solver.cpp                           |   3 +-
 src/caffe/test/test_caffe_main.cpp             |   2 +-
 src/caffe/test/test_convolution_layer.cpp      |   2 +-
 src/caffe/test/test_gradient_based_solver.cpp  |  14 +-
 src/caffe/test/test_hdf5_output_layer.cpp      |  13 +-
 src/caffe/test/test_hdf5data_layer.cpp         |   5 +-
 src/caffe/test/test_infogain_loss_layer.cpp    |  83 +++++++++++-
 src/caffe/test/test_neuron_layer.cpp           |  11 +-
 src/caffe/util/hdf5.cpp                        |  34 ++++-
 src/caffe/util/math_functions.cpp              |  10 ++
 src/caffe/util/math_functions.cu               |  21 +++
 tools/CMakeLists.txt                           |   3 +-
 tools/compute_image_mean.cpp                   |   8 +-
 tools/extra/parse_log.sh                       |   2 +-
 tools/extra/resize_and_crop_images.py          |   2 +-
 88 files changed, 816 insertions(+), 327 deletions(-)

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