[caffe-contrib] 241/362: Merge tag 'upstream/1.0.0_rc2-git20151212-g7953918'
Zhou Mo
cdluminate-guest at moszumanska.debian.org
Tue May 3 09:24:38 UTC 2016
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 7336b3a55becd351f9f813900b27af35456e3fea
Merge: 7b25715 9cdffcc
Author: Zhou Mo <cdluminate at gmail.com>
Date: Sat Dec 12 07:06:42 2015 +0000
Merge tag 'upstream/1.0.0_rc2-git20151212-g7953918'
Upstream version 1.0.0~rc2-git20151212-g7953918
CMakeLists.txt | 17 +-
INSTALL.md | 4 +-
Makefile | 16 +-
Makefile.config.example | 10 +-
README.md | 3 +
cmake/ConfigGen.cmake | 3 +
cmake/Cuda.cmake | 35 +-
cmake/Dependencies.cmake | 9 +-
cmake/Summary.cmake | 7 +-
cmake/Templates/caffe_config.h.in | 3 +-
docs/installation.md | 3 +-
docs/tutorial/forward_backward.md | 2 +-
docs/tutorial/interfaces.md | 2 +-
docs/tutorial/layers.md | 6 +-
docs/tutorial/solver.md | 28 +-
examples/00-classification.ipynb | 2 +-
.../cifar10/cifar10_full_sigmoid_solver.prototxt | 28 +
.../cifar10_full_sigmoid_solver_bn.prototxt | 28 +
.../cifar10_full_sigmoid_train_test.prototxt | 212 ++++++
.../cifar10_full_sigmoid_train_test_bn.prototxt | 240 ++++++
examples/cifar10/convert_cifar_data.cpp | 13 +-
examples/cifar10/train_full_sigmoid.sh | 7 +
examples/cifar10/train_full_sigmoid_bn.sh | 7 +
examples/cpp_classification/classification.cpp | 8 +-
examples/mnist/convert_mnist_data.cpp | 12 +-
examples/mnist/lenet_adadelta_solver.prototxt | 2 +-
examples/mnist/lenet_solver_adam.prototxt | 2 +-
examples/mnist/lenet_solver_rmsprop.prototxt | 2 +-
examples/mnist/lenet_stepearly_solver.prototxt | 28 -
.../mnist_autoencoder_solver_adadelta.prototxt | 2 +-
.../mnist_autoencoder_solver_adagrad.prototxt | 2 +-
.../mnist_autoencoder_solver_nesterov.prototxt | 2 +-
examples/siamese/convert_mnist_siamese_data.cpp | 7 +-
examples/web_demo/requirements.txt | 1 +
include/caffe/blob.hpp | 1 -
include/caffe/caffe.hpp | 3 +-
include/caffe/common_layers.hpp | 678 -----------------
include/caffe/data_layers.hpp | 344 ---------
include/caffe/filler.hpp | 1 -
include/caffe/layer.hpp | 2 +-
include/caffe/layer_factory.hpp | 1 +
include/caffe/layers/absval_layer.hpp | 68 ++
include/caffe/layers/accuracy_layer.hpp | 95 +++
include/caffe/layers/argmax_layer.hpp | 77 ++
include/caffe/layers/base_conv_layer.hpp | 168 +++++
include/caffe/layers/base_data_layer.hpp | 86 +++
include/caffe/layers/batch_norm_layer.hpp | 81 ++
include/caffe/layers/batch_reindex_layer.hpp | 83 +++
include/caffe/layers/bnll_layer.hpp | 70 ++
include/caffe/layers/concat_layer.hpp | 87 +++
include/caffe/layers/contrastive_loss_layer.hpp | 101 +++
include/caffe/layers/conv_layer.hpp | 81 ++
include/caffe/layers/cudnn_conv_layer.hpp | 72 ++
include/caffe/layers/cudnn_lcn_layer.hpp | 49 ++
include/caffe/layers/cudnn_lrn_layer.hpp | 44 ++
include/caffe/layers/cudnn_pooling_layer.hpp | 49 ++
include/caffe/layers/cudnn_relu_layer.hpp | 45 ++
include/caffe/layers/cudnn_sigmoid_layer.hpp | 45 ++
include/caffe/layers/cudnn_softmax_layer.hpp | 45 ++
include/caffe/layers/cudnn_tanh_layer.hpp | 45 ++
include/caffe/layers/data_layer.hpp | 39 +
include/caffe/layers/deconv_layer.hpp | 51 ++
include/caffe/layers/dropout_layer.hpp | 80 ++
include/caffe/layers/dummy_data_layer.hpp | 49 ++
include/caffe/layers/eltwise_layer.hpp | 51 ++
include/caffe/layers/embed_layer.hpp | 52 ++
include/caffe/layers/euclidean_loss_layer.hpp | 107 +++
include/caffe/layers/exp_layer.hpp | 80 ++
include/caffe/layers/filter_layer.hpp | 77 ++
include/caffe/layers/flatten_layer.hpp | 61 ++
include/caffe/layers/hdf5_data_layer.hpp | 62 ++
include/caffe/layers/hdf5_output_layer.hpp | 64 ++
include/caffe/layers/hinge_loss_layer.hpp | 104 +++
include/caffe/layers/im2col_layer.hpp | 63 ++
include/caffe/layers/image_data_layer.hpp | 47 ++
include/caffe/layers/infogain_loss_layer.hpp | 110 +++
include/caffe/layers/inner_product_layer.hpp | 51 ++
include/caffe/layers/log_layer.hpp | 82 ++
include/caffe/layers/loss_layer.hpp | 53 ++
include/caffe/layers/lrn_layer.hpp | 94 +++
include/caffe/layers/memory_data_layer.hpp | 63 ++
.../layers/multinomial_logistic_loss_layer.hpp | 92 +++
include/caffe/layers/mvn_layer.hpp | 48 ++
include/caffe/layers/neuron_layer.hpp | 32 +
include/caffe/layers/pooling_layer.hpp | 60 ++
include/caffe/layers/power_layer.hpp | 89 +++
include/caffe/layers/prelu_layer.hpp | 101 +++
include/caffe/{ => layers}/python_layer.hpp | 6 +
include/caffe/layers/reduction_layer.hpp | 59 ++
include/caffe/layers/relu_layer.hpp | 85 +++
include/caffe/layers/reshape_layer.hpp | 52 ++
.../layers/sigmoid_cross_entropy_loss_layer.hpp | 110 +++
include/caffe/layers/sigmoid_layer.hpp | 71 ++
include/caffe/layers/silence_layer.hpp | 43 ++
include/caffe/layers/slice_layer.hpp | 51 ++
include/caffe/layers/softmax_layer.hpp | 50 ++
include/caffe/layers/softmax_loss_layer.hpp | 130 ++++
include/caffe/layers/split_layer.hpp | 45 ++
include/caffe/layers/spp_layer.hpp | 76 ++
include/caffe/layers/tanh_layer.hpp | 73 ++
include/caffe/layers/threshold_layer.hpp | 64 ++
include/caffe/layers/tile_layer.hpp | 43 ++
include/caffe/layers/window_data_layer.hpp | 55 ++
include/caffe/loss_layers.hpp | 773 -------------------
include/caffe/neuron_layers.hpp | 809 --------------------
include/caffe/sgd_solvers.hpp | 148 ++++
include/caffe/solver.hpp | 173 +----
include/caffe/solver_factory.hpp | 137 ++++
include/caffe/syncedmem.hpp | 16 +-
include/caffe/test/test_gradient_check_util.hpp | 5 +-
include/caffe/util/blocking_queue.hpp | 2 -
include/caffe/util/cudnn.hpp | 3 +
include/caffe/util/device_alternate.hpp | 10 +-
include/caffe/util/format.hpp | 18 +
include/caffe/util/im2col.hpp | 4 +-
include/caffe/util/io.hpp | 57 +-
include/caffe/util/math_functions.hpp | 7 -
include/caffe/util/upgrade_proto.hpp | 26 +-
include/caffe/vision_layers.hpp | 589 ---------------
matlab/+caffe/+test/test_io.m | 18 +
matlab/+caffe/io.m | 8 +
matlab/+caffe/private/caffe_.cpp | 29 +-
matlab/+caffe/run_tests.m | 3 +-
matlab/hdf5creation/store2hdf5.m | 4 +-
models/bvlc_reference_caffenet/train_val.prototxt | 2 +-
models/finetune_flickr_style/train_val.prototxt | 14 +-
python/CMakeLists.txt | 2 +-
python/caffe/_caffe.cpp | 11 +-
python/caffe/draw.py | 6 +-
python/caffe/io.py | 23 +-
python/caffe/pycaffe.py | 6 +-
python/caffe/test/test_io.py | 41 +
python/caffe/test/test_python_layer.py | 2 +
.../caffe/test/test_python_layer_with_param_str.py | 2 +
python/caffe/test/test_solver.py | 11 +-
python/detect.py | 2 +-
scripts/download_model_binary.py | 2 +-
scripts/travis/travis_install.sh | 52 +-
src/caffe/data_reader.cpp | 2 +-
src/caffe/layer_factory.cpp | 64 +-
src/caffe/layers/absval_layer.cpp | 3 +-
src/caffe/layers/absval_layer.cu | 3 +-
src/caffe/layers/accuracy_layer.cpp | 5 +-
src/caffe/layers/argmax_layer.cpp | 82 +-
src/caffe/layers/base_conv_layer.cpp | 3 +-
src/caffe/layers/base_data_layer.cpp | 11 +-
src/caffe/layers/base_data_layer.cu | 2 +-
src/caffe/layers/batch_norm_layer.cpp | 239 ++++++
src/caffe/layers/batch_norm_layer.cu | 171 +++++
src/caffe/layers/batch_reindex_layer.cpp | 78 ++
src/caffe/layers/batch_reindex_layer.cu | 106 +++
src/caffe/layers/bnll_layer.cpp | 3 +-
src/caffe/layers/bnll_layer.cu | 3 +-
src/caffe/layers/concat_layer.cpp | 3 +-
src/caffe/layers/concat_layer.cu | 3 +-
src/caffe/layers/contrastive_loss_layer.cpp | 7 +-
src/caffe/layers/contrastive_loss_layer.cu | 4 +-
src/caffe/layers/conv_layer.cpp | 6 +-
src/caffe/layers/conv_layer.cu | 6 +-
src/caffe/layers/cudnn_conv_layer.cpp | 144 +++-
src/caffe/layers/cudnn_conv_layer.cu | 70 +-
src/caffe/layers/cudnn_lcn_layer.cpp | 73 ++
.../{cudnn_pooling_layer.cu => cudnn_lcn_layer.cu} | 33 +-
src/caffe/layers/cudnn_lrn_layer.cpp | 53 ++
.../{cudnn_pooling_layer.cu => cudnn_lrn_layer.cu} | 33 +-
src/caffe/layers/cudnn_pooling_layer.cpp | 6 +-
src/caffe/layers/cudnn_pooling_layer.cu | 6 +-
src/caffe/layers/cudnn_relu_layer.cpp | 4 +-
src/caffe/layers/cudnn_relu_layer.cu | 4 +-
src/caffe/layers/cudnn_sigmoid_layer.cpp | 4 +-
src/caffe/layers/cudnn_sigmoid_layer.cu | 4 +-
src/caffe/layers/cudnn_softmax_layer.cpp | 6 +-
src/caffe/layers/cudnn_softmax_layer.cu | 6 +-
src/caffe/layers/cudnn_tanh_layer.cpp | 4 +-
src/caffe/layers/cudnn_tanh_layer.cu | 4 +-
src/caffe/layers/data_layer.cpp | 8 +-
src/caffe/layers/deconv_layer.cpp | 6 +-
src/caffe/layers/deconv_layer.cu | 6 +-
src/caffe/layers/dropout_layer.cpp | 5 +-
src/caffe/layers/dropout_layer.cu | 9 +-
src/caffe/layers/dummy_data_layer.cpp | 3 +-
src/caffe/layers/eltwise_layer.cpp | 3 +-
src/caffe/layers/eltwise_layer.cu | 3 +-
src/caffe/layers/embed_layer.cpp | 5 +-
src/caffe/layers/embed_layer.cu | 5 +-
src/caffe/layers/euclidean_loss_layer.cpp | 4 +-
src/caffe/layers/euclidean_loss_layer.cu | 4 +-
src/caffe/layers/exp_layer.cpp | 4 +-
src/caffe/layers/exp_layer.cu | 4 +-
src/caffe/layers/filter_layer.cpp | 4 +-
src/caffe/layers/filter_layer.cu | 3 +-
src/caffe/layers/flatten_layer.cpp | 4 +-
src/caffe/layers/hdf5_data_layer.cpp | 3 +-
src/caffe/layers/hdf5_data_layer.cu | 5 +-
src/caffe/layers/hdf5_output_layer.cpp | 5 +-
src/caffe/layers/hdf5_output_layer.cu | 5 +-
src/caffe/layers/hinge_loss_layer.cpp | 6 +-
src/caffe/layers/im2col_layer.cpp | 4 +-
src/caffe/layers/im2col_layer.cu | 4 +-
src/caffe/layers/image_data_layer.cpp | 5 +-
src/caffe/layers/infogain_loss_layer.cpp | 5 +-
src/caffe/layers/inner_product_layer.cpp | 5 +-
src/caffe/layers/inner_product_layer.cu | 5 +-
src/caffe/layers/log_layer.cpp | 4 +-
src/caffe/layers/log_layer.cu | 4 +-
src/caffe/layers/loss_layer.cpp | 8 +-
src/caffe/layers/lrn_layer.cpp | 4 +-
src/caffe/layers/lrn_layer.cu | 3 +-
src/caffe/layers/memory_data_layer.cpp | 4 +-
.../layers/multinomial_logistic_loss_layer.cpp | 5 +-
src/caffe/layers/mvn_layer.cpp | 46 +-
src/caffe/layers/mvn_layer.cu | 47 +-
src/caffe/layers/neuron_layer.cpp | 3 +-
src/caffe/layers/pooling_layer.cpp | 5 +-
src/caffe/layers/pooling_layer.cu | 3 +-
src/caffe/layers/power_layer.cpp | 4 +-
src/caffe/layers/power_layer.cu | 4 +-
src/caffe/layers/prelu_layer.cpp | 5 +-
src/caffe/layers/prelu_layer.cu | 48 +-
src/caffe/layers/reduction_layer.cpp | 5 +-
src/caffe/layers/reduction_layer.cu | 4 +-
src/caffe/layers/relu_layer.cpp | 3 +-
src/caffe/layers/relu_layer.cu | 3 +-
src/caffe/layers/reshape_layer.cpp | 3 +-
.../layers/sigmoid_cross_entropy_loss_layer.cpp | 5 +-
.../layers/sigmoid_cross_entropy_loss_layer.cu | 5 +-
src/caffe/layers/sigmoid_layer.cpp | 4 +-
src/caffe/layers/sigmoid_layer.cu | 4 +-
src/caffe/layers/silence_layer.cpp | 5 +-
src/caffe/layers/silence_layer.cu | 5 +-
src/caffe/layers/slice_layer.cpp | 3 +-
src/caffe/layers/slice_layer.cu | 3 +-
src/caffe/layers/softmax_layer.cpp | 3 +-
src/caffe/layers/softmax_layer.cu | 3 +-
src/caffe/layers/softmax_loss_layer.cpp | 58 +-
src/caffe/layers/softmax_loss_layer.cu | 35 +-
src/caffe/layers/split_layer.cpp | 3 +-
src/caffe/layers/split_layer.cu | 3 +-
src/caffe/layers/spp_layer.cpp | 11 +-
src/caffe/layers/tanh_layer.cpp | 4 +-
src/caffe/layers/tanh_layer.cu | 4 +-
src/caffe/layers/threshold_layer.cpp | 4 +-
src/caffe/layers/threshold_layer.cu | 4 +-
src/caffe/layers/tile_layer.cpp | 3 +-
src/caffe/layers/tile_layer.cu | 3 +-
src/caffe/layers/window_data_layer.cpp | 7 +-
src/caffe/net.cpp | 188 ++---
src/caffe/parallel.cpp | 4 -
src/caffe/proto/caffe.proto | 77 +-
src/caffe/solver.cpp | 821 +--------------------
src/caffe/solvers/adadelta_solver.cpp | 156 ++++
src/caffe/solvers/adagrad_solver.cpp | 89 +++
src/caffe/solvers/adam_solver.cpp | 113 +++
src/caffe/solvers/nesterov_solver.cpp | 71 ++
src/caffe/solvers/rmsprop_solver.cpp | 85 +++
src/caffe/solvers/sgd_solver.cpp | 348 +++++++++
src/caffe/syncedmem.cpp | 12 +-
src/caffe/test/test_accuracy_layer.cpp | 4 +-
src/caffe/test/test_argmax_layer.cpp | 139 +++-
src/caffe/test/test_batch_norm_layer.cpp | 133 ++++
src/caffe/test/test_batch_reindex_layer.cpp | 118 +++
src/caffe/test/test_benchmark.cpp | 6 +-
src/caffe/test/test_blob.cpp | 1 -
src/caffe/test/test_common.cpp | 2 -
src/caffe/test/test_concat_layer.cpp | 3 +-
src/caffe/test/test_contrastive_loss_layer.cpp | 6 +-
src/caffe/test/test_convolution_layer.cpp | 7 +-
src/caffe/test/test_data_layer.cpp | 2 +-
src/caffe/test/test_deconvolution_layer.cpp | 3 +-
src/caffe/test/test_dummy_data_layer.cpp | 2 +-
src/caffe/test/test_eltwise_layer.cpp | 2 +-
src/caffe/test/test_embed_layer.cpp | 3 +-
src/caffe/test/test_euclidean_loss_layer.cpp | 4 +-
src/caffe/test/test_filler.cpp | 2 -
src/caffe/test/test_filter_layer.cpp | 4 +-
src/caffe/test/test_flatten_layer.cpp | 3 +-
src/caffe/test/test_gradient_based_solver.cpp | 56 +-
src/caffe/test/test_hdf5_output_layer.cpp | 2 +-
src/caffe/test/test_hdf5data_layer.cpp | 5 +-
src/caffe/test/test_hinge_loss_layer.cpp | 4 +-
src/caffe/test/test_im2col_kernel.cu | 3 +-
src/caffe/test/test_im2col_layer.cpp | 3 +-
src/caffe/test/test_image_data_layer.cpp | 2 +-
src/caffe/test/test_infogain_loss_layer.cpp | 5 +-
src/caffe/test/test_inner_product_layer.cpp | 3 +-
src/caffe/test/test_lrn_layer.cpp | 204 ++++-
src/caffe/test/test_math_functions.cpp | 43 --
src/caffe/test/test_maxpool_dropout_layers.cpp | 4 +-
src/caffe/test/test_memory_data_layer.cpp | 2 +-
.../test/test_multinomial_logistic_loss_layer.cpp | 5 +-
src/caffe/test/test_mvn_layer.cpp | 4 +-
src/caffe/test/test_neuron_layer.cpp | 21 +-
src/caffe/test/test_pooling_layer.cpp | 7 +-
src/caffe/test/test_power_layer.cpp | 2 +-
src/caffe/test/test_random_number_generator.cpp | 1 -
src/caffe/test/test_reduction_layer.cpp | 3 +-
src/caffe/test/test_reshape_layer.cpp | 3 +-
.../test/test_sigmoid_cross_entropy_loss_layer.cpp | 4 +-
src/caffe/test/test_slice_layer.cpp | 3 +-
src/caffe/test/test_softmax_layer.cpp | 7 +-
src/caffe/test/test_softmax_with_loss_layer.cpp | 4 +-
src/caffe/test/test_solver.cpp | 1 +
src/caffe/test/test_solver_factory.cpp | 50 ++
src/caffe/test/test_split_layer.cpp | 3 +-
src/caffe/test/test_spp_layer.cpp | 9 +-
src/caffe/test/test_stochastic_pooling.cpp | 3 +-
src/caffe/test/test_syncedmem.cpp | 1 -
src/caffe/test/test_tanh_layer.cpp | 2 +-
src/caffe/test/test_threshold_layer.cpp | 2 +-
src/caffe/test/test_tile_layer.cpp | 3 +-
src/caffe/test/test_upgrade_proto.cpp | 64 +-
src/caffe/test/test_util_blas.cpp | 2 -
src/caffe/util/blocking_queue.cpp | 2 +-
src/caffe/util/db.cpp | 2 +
src/caffe/util/db_lmdb.cpp | 17 +-
src/caffe/util/im2col.cpp | 81 +-
src/caffe/util/im2col.cu | 78 +-
src/caffe/util/io.cpp | 2 +-
src/caffe/util/math_functions.cpp | 22 -
src/caffe/util/math_functions.cu | 47 --
src/caffe/util/upgrade_proto.cpp | 188 +++--
tools/caffe.cpp | 4 +-
tools/convert_imageset.cpp | 8 +-
tools/extra/parse_log.sh | 7 +-
tools/extra/plot_training_log.py.example | 2 +-
tools/extra/summarize.py | 140 ++++
tools/extract_features.cpp | 29 +-
tools/upgrade_solver_proto_text.cpp | 50 ++
328 files changed, 8989 insertions(+), 5486 deletions(-)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/caffe-contrib.git
More information about the debian-science-commits
mailing list