[caffe] 02/06: Merge tag 'upstream/1.0.0_rc4'
Zhou Mo
cdluminate-guest at moszumanska.debian.org
Sat Jan 21 03:11:52 UTC 2017
This is an automated email from the git hooks/post-receive script.
cdluminate-guest pushed a commit to branch master
in repository caffe.
commit bf3c0321ce1f54e5457316fc2147aefc72518d38
Merge: 2865256 7b68184
Author: Zhou Mo <cdluminate at gmail.com>
Date: Sat Jan 21 02:20:20 2017 +0000
Merge tag 'upstream/1.0.0_rc4'
Upstream version 1.0.0~rc4
.gitignore | 1 +
CMakeLists.txt | 1 +
LICENSE | 4 +-
Makefile | 6 +
Makefile.config.example | 6 +-
cmake/ConfigGen.cmake | 2 +-
cmake/Cuda.cmake | 8 +-
cmake/Dependencies.cmake | 15 +-
cmake/External/glog.cmake | 1 +
cmake/Modules/FindNCCL.cmake | 26 ++
cmake/Summary.cmake | 1 +
cmake/Targets.cmake | 6 +-
docs/install_apt.md | 4 +-
docs/install_apt_debian.md | 155 +++++++
docs/installation.md | 1 +
docs/tutorial/layers.md | 562 ++++--------------------
docs/tutorial/layers/absval.md | 22 +
docs/tutorial/layers/accuracy.md | 21 +
docs/tutorial/layers/argmax.md | 19 +
docs/tutorial/layers/batchnorm.md | 20 +
docs/tutorial/layers/batchreindex.md | 16 +
docs/tutorial/layers/bias.md | 19 +
docs/tutorial/layers/bnll.md | 25 ++
docs/tutorial/layers/concat.md | 40 ++
docs/tutorial/layers/contrastiveloss.md | 20 +
docs/tutorial/layers/convolution.md | 63 +++
docs/tutorial/layers/crop.md | 20 +
docs/tutorial/layers/data.md | 29 ++
docs/tutorial/layers/deconvolution.md | 22 +
docs/tutorial/layers/dropout.md | 20 +
docs/tutorial/layers/dummydata.md | 20 +
docs/tutorial/layers/eltwise.md | 20 +
docs/tutorial/layers/elu.md | 25 ++
docs/tutorial/layers/embed.md | 20 +
docs/tutorial/layers/euclideanloss.md | 16 +
docs/tutorial/layers/exp.md | 24 +
docs/tutorial/layers/filter.md | 15 +
docs/tutorial/layers/flatten.md | 21 +
docs/tutorial/layers/hdf5data.md | 20 +
docs/tutorial/layers/hdf5output.md | 25 ++
docs/tutorial/layers/hingeloss.md | 19 +
docs/tutorial/layers/im2col.md | 16 +
docs/tutorial/layers/imagedata.md | 27 ++
docs/tutorial/layers/infogainloss.md | 24 +
docs/tutorial/layers/innerproduct.md | 59 +++
docs/tutorial/layers/input.md | 19 +
docs/tutorial/layers/log.md | 20 +
docs/tutorial/layers/lrn.md | 28 ++
docs/tutorial/layers/lstm.md | 21 +
docs/tutorial/layers/memorydata.md | 25 ++
docs/tutorial/layers/multinomiallogisticloss.md | 19 +
docs/tutorial/layers/mvn.md | 20 +
docs/tutorial/layers/parameter.md | 21 +
docs/tutorial/layers/pooling.md | 47 ++
docs/tutorial/layers/power.md | 46 ++
docs/tutorial/layers/prelu.md | 20 +
docs/tutorial/layers/python.md | 27 ++
docs/tutorial/layers/recurrent.md | 20 +
docs/tutorial/layers/reduction.md | 20 +
docs/tutorial/layers/relu.md | 32 ++
docs/tutorial/layers/reshape.md | 51 +++
docs/tutorial/layers/rnn.md | 19 +
docs/tutorial/layers/scale.md | 20 +
docs/tutorial/layers/sigmoid.md | 20 +
docs/tutorial/layers/sigmoidcrossentropyloss.md | 13 +
docs/tutorial/layers/silence.md | 23 +
docs/tutorial/layers/slice.md | 42 ++
docs/tutorial/layers/softmax.md | 24 +
docs/tutorial/layers/softmaxwithloss.md | 33 ++
docs/tutorial/layers/split.md | 17 +
docs/tutorial/layers/spp.md | 20 +
docs/tutorial/layers/tanh.md | 18 +
docs/tutorial/layers/threshold.md | 18 +
docs/tutorial/layers/tile.md | 20 +
docs/tutorial/layers/windowdata.md | 19 +
examples/02-fine-tuning.ipynb | 4 +-
examples/CMakeLists.txt | 2 +-
include/caffe/blob.hpp | 1 +
include/caffe/common.hpp | 14 +-
include/caffe/data_reader.hpp | 82 ----
include/caffe/internal_thread.hpp | 4 +-
include/caffe/layer.hpp | 43 +-
include/caffe/layers/base_data_layer.hpp | 6 +-
include/caffe/layers/data_layer.hpp | 7 +-
include/caffe/layers/hdf5_data_layer.hpp | 6 +-
include/caffe/layers/python_layer.hpp | 4 +-
include/caffe/net.hpp | 40 +-
include/caffe/parallel.hpp | 96 ++--
include/caffe/solver.hpp | 40 +-
include/caffe/syncedmem.hpp | 26 +-
include/caffe/util/db_leveldb.hpp | 5 +-
include/caffe/util/math_functions.hpp | 5 +
include/caffe/util/nccl.hpp | 37 ++
models/bvlc_googlenet/train_val.prototxt | 2 +-
python/caffe/__init__.py | 4 +-
python/caffe/_caffe.cpp | 113 ++++-
python/caffe/pycaffe.py | 2 +-
python/caffe/test/test_net.py | 18 +-
python/train.py | 100 +++++
scripts/build_docs.sh | 3 +
scripts/download_model_binary.py | 5 +-
scripts/split_caffe_proto.py | 35 ++
src/caffe/blob.cpp | 18 +
src/caffe/common.cpp | 5 +-
src/caffe/data_reader.cpp | 119 -----
src/caffe/data_transformer.cpp | 2 +-
src/caffe/internal_thread.cpp | 10 +-
src/caffe/layer.cpp | 20 -
src/caffe/layers/base_data_layer.cpp | 44 +-
src/caffe/layers/base_data_layer.cu | 21 +-
src/caffe/layers/crop_layer.cpp | 40 +-
src/caffe/layers/crop_layer.cu | 22 +-
src/caffe/layers/data_layer.cpp | 82 ++--
src/caffe/layers/hdf5_data_layer.cpp | 55 ++-
src/caffe/layers/hdf5_data_layer.cu | 22 +-
src/caffe/layers/image_data_layer.cpp | 13 +-
src/caffe/layers/window_data_layer.cpp | 8 +-
src/caffe/net.cpp | 47 +-
src/caffe/parallel.cpp | 514 ++++++++++------------
src/caffe/proto/caffe.proto | 9 +-
src/caffe/solver.cpp | 44 +-
src/caffe/solvers/adagrad_solver.cpp | 1 -
src/caffe/solvers/nesterov_solver.cpp | 1 -
src/caffe/solvers/sgd_solver.cpp | 4 +-
src/caffe/syncedmem.cpp | 59 ++-
src/caffe/test/test_data_layer.cpp | 36 ++
src/caffe/test/test_gradient_based_solver.cpp | 34 +-
src/caffe/test/test_hdf5data_layer.cpp | 30 ++
src/caffe/test/test_inner_product_layer.cpp | 10 +-
src/caffe/util/blocking_queue.cpp | 5 -
src/caffe/util/db_lmdb.cpp | 2 +-
src/caffe/util/hdf5.cpp | 4 +-
src/caffe/util/math_functions.cu | 20 +
src/caffe/util/upgrade_proto.cpp | 8 +-
tools/caffe.cpp | 11 +-
tools/extra/extract_seconds.py | 8 +
tools/extra/parse_log.py | 7 +
137 files changed, 2856 insertions(+), 1431 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