[caffe] 190/249: Merge tag 'upstream/0.9999_rc2+git20150902+e8e660d3'
Zhou Mo
cdluminate-guest at moszumanska.debian.org
Tue Mar 8 14:51:40 UTC 2016
This is an automated email from the git hooks/post-receive script.
cdluminate-guest pushed a commit to branch debian/experimental
in repository caffe.
commit 9368d83d7128a3e8fdc6d7e7d1f2fc90a65c528f
Merge: 18e5729 a488509
Author: Zhou Mo <cdluminate at gmail.com>
Date: Wed Sep 2 13:30:46 2015 +0000
Merge tag 'upstream/0.9999_rc2+git20150902+e8e660d3'
Upstream version 0.9999~rc2+git20150902+e8e660d3
.gitignore | 2 +
CONTRIBUTING.md | 30 +
Makefile | 6 +-
cmake/Misc.cmake | 4 +-
cmake/Modules/FindOpenBLAS.cmake | 2 +
docs/tutorial/interfaces.md | 7 +
docs/tutorial/solver.md | 79 +-
examples/CMakeLists.txt | 2 +-
examples/cifar10/cifar10_full.prototxt | 10 +-
examples/cifar10/cifar10_full_solver.prototxt | 1 +
examples/cifar10/cifar10_full_solver_lr1.prototxt | 1 +
examples/cifar10/cifar10_full_solver_lr2.prototxt | 1 +
examples/cifar10/cifar10_quick.prototxt | 10 +-
examples/cifar10/cifar10_quick_solver.prototxt | 1 +
examples/cifar10/cifar10_quick_solver_lr1.prototxt | 1 +
examples/cifar10/train_full.sh | 4 +-
examples/cifar10/train_quick.sh | 2 +-
examples/cpp_classification/classification.cpp | 2 +
examples/imagenet/resume_training.sh | 2 +-
examples/mnist/convert_mnist_data.cpp | 2 +-
examples/mnist/lenet.prototxt | 10 +-
.../lenet_adadelta_solver.prototxt} | 17 +-
.../lenet_solver_adam.prototxt} | 19 +-
.../lenet_solver_rmsprop.prototxt} | 20 +-
.../mnist_autoencoder_solver_adadelta.prototxt | 19 +
examples/mnist/train_lenet_adam.sh | 3 +
examples/mnist/train_lenet_rmsprop.sh | 3 +
examples/mnist/train_mnist_autoencoder_adadelta.sh | 4 +
.../net_surgery/bvlc_caffenet_full_conv.prototxt | 10 +-
examples/net_surgery/conv.prototxt | 10 +-
examples/pycaffe/caffenet.py | 2 +-
examples/siamese/convert_mnist_siamese_data.cpp | 2 +-
examples/siamese/mnist_siamese.prototxt | 10 +-
include/caffe/blob.hpp | 4 +-
include/caffe/caffe.hpp | 1 +
include/caffe/common.hpp | 20 +-
include/caffe/common_layers.hpp | 67 ++
include/caffe/data_layers.hpp | 50 +-
include/caffe/data_reader.hpp | 82 ++
include/caffe/internal_thread.hpp | 19 +-
include/caffe/layer.hpp | 54 +-
include/caffe/layer_factory.hpp | 35 +-
include/caffe/loss_layers.hpp | 9 +-
include/caffe/net.hpp | 53 +-
include/caffe/parallel.hpp | 118 +++
include/caffe/python_layer.hpp | 35 +-
include/caffe/solver.hpp | 173 +++-
include/caffe/syncedmem.hpp | 42 +-
include/caffe/test/test_gradient_check_util.hpp | 11 +-
include/caffe/util/blocking_queue.hpp | 47 ++
include/caffe/util/gpu_util.cuh | 35 +
include/caffe/util/hdf5.hpp | 39 +
include/caffe/util/io.hpp | 18 -
include/caffe/util/signal_handler.h | 24 +
include/caffe/vision_layers.hpp | 10 +-
matlab/CMakeLists.txt | 4 +-
models/bvlc_alexnet/deploy.prototxt | 10 +-
models/bvlc_googlenet/deploy.prototxt | 10 +-
models/bvlc_reference_caffenet/deploy.prototxt | 10 +-
.../bvlc_reference_rcnn_ilsvrc13/deploy.prototxt | 10 +-
models/finetune_flickr_style/deploy.prototxt | 10 +-
python/CMakeLists.txt | 2 +-
python/caffe/__init__.py | 2 +-
python/caffe/_caffe.cpp | 29 +-
python/caffe/draw.py | 6 +-
python/caffe/net_spec.py | 38 +-
python/caffe/pycaffe.py | 10 +
python/caffe/test/test_layer_type_list.py | 10 +
python/caffe/test/test_net_spec.py | 15 +
python/caffe/test/test_python_layer.py | 76 ++
.../caffe/test/test_python_layer_with_param_str.py | 59 ++
scripts/download_model_binary.py | 2 +-
scripts/download_model_from_gist.sh | 6 +-
src/caffe/blob.cpp | 49 +-
src/caffe/common.cpp | 19 +-
src/caffe/data_reader.cpp | 119 +++
src/caffe/data_transformer.cpp | 4 +-
src/caffe/internal_thread.cpp | 58 +-
src/caffe/layer.cpp | 27 +
src/caffe/layers/accuracy_layer.cpp | 20 +
src/caffe/layers/base_data_layer.cpp | 94 ++-
src/caffe/layers/base_data_layer.cu | 17 +-
src/caffe/layers/concat_layer.cpp | 13 +-
src/caffe/layers/concat_layer.cu | 17 +-
src/caffe/layers/data_layer.cpp | 81 +-
src/caffe/layers/deconv_layer.cu | 3 +-
src/caffe/layers/embed_layer.cpp | 122 +++
src/caffe/layers/embed_layer.cu | 84 ++
src/caffe/layers/hdf5_data_layer.cpp | 2 +-
src/caffe/layers/hdf5_output_layer.cpp | 2 +-
src/caffe/layers/hdf5_output_layer.cu | 1 -
src/caffe/layers/image_data_layer.cpp | 31 +-
src/caffe/layers/inner_product_layer.cu | 19 +-
src/caffe/layers/mvn_layer.cpp | 15 +-
src/caffe/layers/mvn_layer.cu | 7 +-
src/caffe/layers/spp_layer.cpp | 36 +
src/caffe/layers/tile_layer.cpp | 62 ++
src/caffe/layers/tile_layer.cu | 67 ++
src/caffe/layers/window_data_layer.cpp | 20 +-
src/caffe/net.cpp | 468 ++++++++---
src/caffe/parallel.cpp | 441 +++++++++++
src/caffe/proto/caffe.proto | 86 +-
src/caffe/solver.cpp | 669 ++++++++++++++--
src/caffe/syncedmem.cpp | 46 +-
src/caffe/test/test_accuracy_layer.cpp | 107 +++
src/caffe/test/test_concat_layer.cpp | 9 +
src/caffe/test/test_data/generate_sample_data.py | 28 +-
src/caffe/test/test_data/solver_data.h5 | Bin 0 -> 11776 bytes
src/caffe/test/test_data/solver_data_list.txt | 1 +
src/caffe/test/test_embed_layer.cpp | 183 +++++
src/caffe/test/test_gradient_based_solver.cpp | 876 +++++++++++++++++++--
src/caffe/test/test_hdf5_output_layer.cpp | 1 +
src/caffe/test/test_inner_product_layer.cpp | 43 +-
src/caffe/test/test_internal_thread.cpp | 34 +-
src/caffe/test/test_layer_factory.cpp | 14 +-
src/caffe/test/test_mvn_layer.cpp | 13 +-
src/caffe/test/test_net.cpp | 29 +-
src/caffe/test/test_tile_layer.cpp | 162 ++++
src/caffe/test/test_upgrade_proto.cpp | 12 +
src/caffe/util/blocking_queue.cpp | 96 +++
src/caffe/util/hdf5.cpp | 160 ++++
src/caffe/util/insert_splits.cpp | 3 +-
src/caffe/util/io.cpp | 74 --
src/caffe/util/signal_handler.cpp | 115 +++
src/caffe/util/upgrade_proto.cpp | 20 +-
tools/caffe.cpp | 153 +++-
tools/convert_imageset.cpp | 6 +-
tools/extra/parse_log.py | 2 +-
128 files changed, 5568 insertions(+), 825 deletions(-)
--
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