[caffe] 02/07: Merge tag 'upstream/1.0.0_rc3+20160715-g42cd785'
Zhou Mo
cdluminate-guest at moszumanska.debian.org
Mon Aug 1 03:25:35 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.
commit 5e9605dfc057d06fe57c1f3b191b3e3ea914642c
Merge: 4056dc3 4322deb
Author: Zhou Mo <cdluminate at gmail.com>
Date: Mon Aug 1 02:17:52 2016 +0000
Merge tag 'upstream/1.0.0_rc3+20160715-g42cd785'
Upstream version 1.0.0~rc3+20160715-g42cd785
.travis.yml | 58 +-
CMakeLists.txt | 6 +-
Makefile | 23 +-
Makefile.config.example | 1 +
cmake/Modules/FindMKL.cmake | 2 +-
cmake/ProtoBuf.cmake | 2 +-
cmake/Targets.cmake | 19 +-
cmake/Utils.cmake | 5 +-
data/cifar10/get_cifar10.sh | 2 +-
data/ilsvrc12/get_ilsvrc_aux.sh | 2 +-
data/mnist/get_mnist.sh | 25 +-
docker/Makefile | 50 +
docker/README.md | 52 +
docker/standalone/cpu/Dockerfile | 43 +
docker/standalone/gpu/Dockerfile | 43 +
docker/templates/Dockerfile.template | 42 +
docs/installation.md | 35 +-
docs/multigpu.md | 2 +-
examples/00-classification.ipynb | 13031 +------------------
examples/01-learning-lenet.ipynb | 4680 +------
examples/02-brewing-logreg.ipynb | 5771 --------
examples/02-fine-tuning.ipynb | 1175 ++
examples/03-fine-tuning.ipynb | 947 --
examples/brewing-logreg.ipynb | 1164 ++
examples/cifar10/cifar10_full.prototxt | 11 +-
examples/cifar10/cifar10_quick.prototxt | 11 +-
examples/cifar10/convert_cifar_data.cpp | 2 +
examples/cifar10/create_cifar10.sh | 1 +
examples/cifar10/train_full.sh | 7 +-
examples/cifar10/train_full_sigmoid.sh | 3 +-
examples/cifar10/train_full_sigmoid_bn.sh | 3 +-
examples/cifar10/train_quick.sh | 5 +-
examples/cpp_classification/classification.cpp | 2 +-
examples/cpp_classification/readme.md | 2 +-
examples/finetune_flickr_style/readme.md | 10 +-
.../hdf5_classification/nonlinear_solver.prototxt | 15 -
examples/hdf5_classification/solver.prototxt | 15 -
examples/imagenet/create_imagenet.sh | 1 +
examples/imagenet/resume_training.sh | 4 +-
examples/imagenet/train_caffenet.sh | 3 +-
examples/images/cat gray.jpg | Bin 0 -> 92726 bytes
examples/mnist/convert_mnist_data.cpp | 89 +-
examples/mnist/create_mnist.sh | 1 +
examples/mnist/lenet.prototxt | 11 +-
examples/mnist/lenet_auto_solver.prototxt | 6 +-
examples/mnist/readme.md | 2 +-
examples/mnist/train_lenet.sh | 3 +-
examples/mnist/train_lenet_adam.sh | 3 +-
examples/mnist/train_lenet_consolidated.sh | 3 +-
examples/mnist/train_lenet_docker.sh | 119 +
examples/mnist/train_lenet_rmsprop.sh | 4 +-
examples/mnist/train_mnist_autoencoder.sh | 3 +-
examples/mnist/train_mnist_autoencoder_adadelta.sh | 3 +-
examples/mnist/train_mnist_autoencoder_adagrad.sh | 3 +-
examples/mnist/train_mnist_autoencoder_nesterov.sh | 3 +-
examples/net_surgery.ipynb | 56 +-
.../net_surgery/bvlc_caffenet_full_conv.prototxt | 15 +-
examples/net_surgery/conv.prototxt | 11 +-
examples/pascal-multilabel-with-datalayer.ipynb | 479 +
.../pycaffe/layers/pascal_multilabel_datalayers.py | 216 +
examples/pycaffe/tools.py | 121 +
examples/siamese/create_mnist_siamese.sh | 1 +
examples/siamese/mnist_siamese.prototxt | 13 +-
examples/siamese/train_mnist_siamese.sh | 3 +-
include/caffe/common.hpp | 5 +
include/caffe/layers/crop_layer.hpp | 76 +
include/caffe/layers/cudnn_relu_layer.hpp | 1 +
include/caffe/layers/cudnn_sigmoid_layer.hpp | 1 +
include/caffe/layers/cudnn_tanh_layer.hpp | 1 +
include/caffe/layers/inner_product_layer.hpp | 1 +
include/caffe/layers/input_layer.hpp | 44 +
include/caffe/layers/lstm_layer.hpp | 154 +
include/caffe/layers/parameter_layer.hpp | 45 +
include/caffe/layers/python_layer.hpp | 1 +
include/caffe/layers/recurrent_layer.hpp | 187 +
include/caffe/layers/rnn_layer.hpp | 47 +
include/caffe/net.hpp | 27 +-
include/caffe/parallel.hpp | 5 +-
include/caffe/util/cudnn.hpp | 24 +-
include/caffe/util/db_lmdb.hpp | 13 +-
include/caffe/util/upgrade_proto.hpp | 6 +
models/bvlc_alexnet/deploy.prototxt | 11 +-
models/bvlc_googlenet/deploy.prototxt | 11 +-
models/bvlc_reference_caffenet/deploy.prototxt | 11 +-
.../bvlc_reference_rcnn_ilsvrc13/deploy.prototxt | 11 +-
models/finetune_flickr_style/deploy.prototxt | 11 +-
python/CMakeLists.txt | 22 +-
python/caffe/__init__.py | 2 +-
python/caffe/_caffe.cpp | 100 +-
python/caffe/classifier.py | 1 +
python/caffe/coord_map.py | 185 +
python/caffe/detector.py | 2 +-
python/caffe/draw.py | 34 +-
python/caffe/io.py | 7 +-
python/caffe/net_spec.py | 8 +-
python/caffe/pycaffe.py | 94 +-
python/caffe/test/test_coord_map.py | 192 +
python/caffe/test/test_io.py | 15 +
python/caffe/test/test_net.py | 266 +-
python/caffe/test/test_python_layer.py | 26 +
python/draw_net.py | 15 +-
scripts/cpp_lint.py | 2 +-
scripts/download_model_binary.py | 2 +-
scripts/travis/build.sh | 13 +
scripts/travis/configure-cmake.sh | 32 +
scripts/travis/configure-make.sh | 36 +
scripts/travis/configure.sh | 11 +
scripts/travis/defaults.sh | 10 +
scripts/travis/install-deps.sh | 110 +
scripts/travis/install-python-deps.sh | 14 +
scripts/travis/setup-venv.sh | 18 +
scripts/travis/test.sh | 19 +
scripts/travis/travis_build_and_test.sh | 54 -
scripts/travis/travis_install.sh | 99 -
scripts/travis/travis_setup_makefile_config.sh | 31 -
src/caffe/blob.cpp | 4 +-
src/caffe/common.cpp | 42 +
src/caffe/layers/crop_layer.cpp | 143 +
src/caffe/layers/crop_layer.cu | 115 +
src/caffe/layers/cudnn_conv_layer.cu | 12 +-
src/caffe/layers/cudnn_relu_layer.cpp | 1 +
src/caffe/layers/cudnn_relu_layer.cu | 23 +-
src/caffe/layers/cudnn_sigmoid_layer.cpp | 2 +
src/caffe/layers/cudnn_sigmoid_layer.cu | 23 +-
src/caffe/layers/cudnn_tanh_layer.cpp | 1 +
src/caffe/layers/cudnn_tanh_layer.cu | 23 +-
src/caffe/layers/dropout_layer.cpp | 4 +-
src/caffe/layers/exp_layer.cpp | 3 +-
src/caffe/layers/image_data_layer.cpp | 11 +-
src/caffe/layers/inner_product_layer.cpp | 42 +-
src/caffe/layers/inner_product_layer.cu | 31 +-
src/caffe/layers/input_layer.cpp | 27 +
src/caffe/layers/lstm_layer.cpp | 244 +
src/caffe/layers/lstm_unit_layer.cpp | 131 +
src/caffe/layers/lstm_unit_layer.cu | 154 +
src/caffe/layers/memory_data_layer.cpp | 2 +-
src/caffe/layers/parameter_layer.cpp | 8 +
src/caffe/layers/recurrent_layer.cpp | 295 +
src/caffe/layers/recurrent_layer.cu | 44 +
src/caffe/layers/rnn_layer.cpp | 236 +
src/caffe/layers/window_data_layer.cpp | 3 +
src/caffe/net.cpp | 126 +-
src/caffe/parallel.cpp | 20 +-
src/caffe/proto/caffe.proto | 79 +-
src/caffe/solver.cpp | 8 +-
src/caffe/test/test_blob.cpp | 8 +
src/caffe/test/test_caffe_main.cpp | 4 +-
src/caffe/test/test_crop_layer.cpp | 283 +
src/caffe/test/test_data_transformer.cpp | 1 -
src/caffe/test/test_embed_layer.cpp | 2 +-
src/caffe/test/test_gradient_based_solver.cpp | 8 +-
src/caffe/test/test_image_data_layer.cpp | 44 +-
src/caffe/test/test_inner_product_layer.cpp | 240 +
src/caffe/test/test_lstm_layer.cpp | 288 +
src/caffe/test/test_net.cpp | 308 +-
src/caffe/test/test_neuron_layer.cpp | 20 +
src/caffe/test/test_rnn_layer.cpp | 217 +
src/caffe/test/test_split_layer.cpp | 61 -
src/caffe/util/db_lmdb.cpp | 73 +-
src/caffe/util/insert_splits.cpp | 21 +-
src/caffe/util/upgrade_proto.cpp | 64 +-
tools/caffe.cpp | 61 +-
tools/convert_imageset.cpp | 9 +-
tools/extra/parse_log.py | 10 +-
tools/extra/plot_training_log.py.example | 26 +-
tools/extract_features.cpp | 5 +-
tools/upgrade_net_proto_binary.cpp | 5 +-
tools/upgrade_net_proto_text.cpp | 8 +-
tools/upgrade_solver_proto_text.cpp | 3 +-
169 files changed, 9521 insertions(+), 24661 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