Hi jmw,

The difference between the 1.0.0~rc4 version and the 1.0.0 version
is 162 git commits. I went through these git commits, and
these commits are about:

  1 documentation update / fix
  2 code grooming
  3 bug fix
  4 add tests
  5 support cudnn v6  (does not affect this package)
  6 update docker scripts  (does not affect this package)

i.e. There is no major code / feature change from the 1.0.0~rc4 tag
 -> 1.0.0 tag.

I've read the freeze policy but still want to apply for an unblock.
This is a machine learning application which has no rdepends,
and the latest stable version 1.0.0 more favorable to users and it's
more convenient for upstream to support. Although the rc4 version
works fine too.

Apart from the upstream stable release, I will add one more patch
to the packaging directory, which was already approved and merged
by upstream:

https://github.com/BVLC/caffe/commit/91b09280f5233cafc62954c98ce8bc4c204e7475

The patch will change a ambiguous static library name, and hence
fixing the bug mentioned previously won't introduce more trouble.

The 1.0.0-2 version was already prepared in the git repo:

https://anonscm.debian.org/cgit/debian-science/packages/caffe.git/log/

If this change could be approved, I'll upload the 1.0.0-2 version
to unstable, and wait for it to migrate.

If not, can I upload 1.0.0~rc4-2 simply with the patch above
applied and the fix for the bug mentioned above?


Thank you :-)


FYI:
files changed

git diff 1.0.0-rc4 1.0 --stat | cat                       Thu 18 May
2017 03:49:46 PM UTC
 .gitignore                                      |   1 +
 CMakeLists.txt                                  |  42 +-
 CONTRIBUTORS.md                                 |   2 +-
 LICENSE                                         |   4 +-
 Makefile                                        |   8 +-
 Makefile.config.example                         |  14 +-
 README.md                                       |   6 +-
 cmake/ConfigGen.cmake                           |  67 +--
 cmake/Cuda.cmake                                |  14 +-
 cmake/Dependencies.cmake                        | 109 +++--
 cmake/External/glog.cmake                       |   1 +
 cmake/Modules/FindAtlas.cmake                   |   4 +-
 cmake/Modules/FindNCCL.cmake                    |  26 ++
 cmake/Modules/FindvecLib.cmake                  |   2 +-
 cmake/ProtoBuf.cmake                            |   4 +-
 cmake/Summary.cmake                             |   1 +
 cmake/Targets.cmake                             |   6 +-
 cmake/Templates/CaffeConfig.cmake.in            |  15 +-
 cmake/Templates/caffe_config.h.in               |  32 +-
 cmake/Uninstall.cmake.in                        |  26 ++
 docker/Makefile                                 |  50 ---
 docker/README.md                                |  69 ++-
 docker/{standalone => }/cpu/Dockerfile          |  13 +-
 docker/{standalone => }/gpu/Dockerfile          |  16 +-
 docker/templates/Dockerfile.template            |  42 --
 docs/_layouts/default.html                      |   2 +-
 docs/development.md                             |   4 +-
 docs/index.md                                   |  47 +-
 docs/install_apt.md                             |   6 +-
 docs/install_apt_debian.md                      | 161 +++++++
 docs/installation.md                            |   7 +-
 docs/model_zoo.md                               |  24 +-
 docs/multigpu.md                                |   4 +-
 docs/performance_hardware.md                    |  73 ---
 docs/tutorial/interfaces.md                     |   4 +-
 docs/tutorial/layers.md                         | 562 ++++--------------------
 docs/tutorial/layers/absval.md                  |  22 +
 docs/tutorial/layers/accuracy.md                |  20 +
 docs/tutorial/layers/argmax.md                  |  18 +
 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            |  23 +
 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                 |  30 ++
 docs/tutorial/layers/sigmoidcrossentropyloss.md |  13 +
 docs/tutorial/layers/silence.md                 |  17 +
 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                   |   2 +-
 examples/CMakeLists.txt                         |   5 +-
 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/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        |   8 +-
 include/caffe/layers/data_layer.hpp             |   9 +-
 include/caffe/layers/dummy_data_layer.hpp       |   2 -
 include/caffe/layers/hdf5_data_layer.hpp        |   8 +-
 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           |   8 +-
 include/caffe/layers/window_data_layer.hpp      |   3 +-
 include/caffe/net.hpp                           |  40 +-
 include/caffe/parallel.hpp                      |  96 ++--
 include/caffe/solver.hpp                        |  40 +-
 include/caffe/syncedmem.hpp                     |  26 +-
 include/caffe/test/test_caffe_main.hpp          |   3 +-
 include/caffe/util/cudnn.hpp                    |  10 +
 include/caffe/util/db_leveldb.hpp               |   5 +-
 include/caffe/util/hdf5.hpp                     |   4 +-
 include/caffe/util/math_functions.hpp           |  17 +-
 include/caffe/util/mkl_alternate.hpp            |  19 +-
 include/caffe/util/nccl.hpp                     |  37 ++
 matlab/+caffe/Net.m                             |   3 +
 matlab/+caffe/Solver.m                          |   3 +
 matlab/+caffe/private/caffe_.cpp                |  24 +
 matlab/demo/classification_demo.m               |   7 +-
 models/bvlc_alexnet/readme.md                   |   2 +-
 models/bvlc_googlenet/readme.md                 |   2 +-
 models/bvlc_googlenet/train_val.prototxt        |   2 +-
 models/bvlc_reference_caffenet/readme.md        |   2 +-
 models/bvlc_reference_rcnn_ilsvrc13/readme.md   |   2 +-
 python/CMakeLists.txt                           |   6 +-
 python/caffe/__init__.py                        |   4 +-
 python/caffe/_caffe.cpp                         | 153 ++++++-
 python/caffe/draw.py                            |   6 +-
 python/caffe/io.py                              |   2 +-
 python/caffe/net_spec.py                        |   4 +
 python/caffe/pycaffe.py                         |  17 +-
 python/caffe/test/test_draw.py                  |  37 ++
 python/caffe/test/test_nccl.py                  |  19 +
 python/caffe/test/test_net.py                   |  70 ++-
 python/caffe/test/test_net_spec.py              |   8 +
 python/train.py                                 | 100 +++++
 scripts/build_docs.sh                           |   3 +
 scripts/caffe                                   |  73 +++
 scripts/cpp_lint.py                             |  39 +-
 scripts/download_model_binary.py                |   5 +-
 scripts/split_caffe_proto.py                    |  35 ++
 scripts/travis/install-deps.sh                  |  12 +-
 scripts/travis/install-python-deps.sh           |   1 +
 src/caffe/CMakeLists.txt                        |  22 +-
 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_conv_layer.cpp            |   1 -
 src/caffe/layers/base_data_layer.cpp            |  44 +-
 src/caffe/layers/base_data_layer.cu             |  21 +-
 src/caffe/layers/batch_norm_layer.cpp           |   6 +-
 src/caffe/layers/batch_norm_layer.cu            |   8 +-
 src/caffe/layers/crop_layer.cpp                 |  40 +-
 src/caffe/layers/crop_layer.cu                  |  22 +-
 src/caffe/layers/cudnn_conv_layer.cpp           |   1 +
 src/caffe/layers/cudnn_relu_layer.cpp           |   1 +
 src/caffe/layers/data_layer.cpp                 |  82 ++--
 src/caffe/layers/eltwise_layer.cpp              |   4 +-
 src/caffe/layers/hdf5_data_layer.cpp            |  58 ++-
 src/caffe/layers/hdf5_data_layer.cu             |  22 +-
 src/caffe/layers/image_data_layer.cpp           |  13 +-
 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/layers/window_data_layer.cpp          |   8 +-
 src/caffe/net.cpp                               |  52 +--
 src/caffe/parallel.cpp                          | 514 ++++++++++------------
 src/caffe/proto/caffe.proto                     |  35 +-
 src/caffe/solver.cpp                            |  48 +-
 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_caffe_main.cpp              |   2 +-
 src/caffe/test/test_convolution_layer.cpp       |   2 +-
 src/caffe/test/test_data_layer.cpp              |  36 ++
 src/caffe/test/test_gradient_based_solver.cpp   |  48 +-
 src/caffe/test/test_hdf5_output_layer.cpp       |  13 +-
 src/caffe/test/test_hdf5data_layer.cpp          |  35 +-
 src/caffe/test/test_infogain_loss_layer.cpp     |  83 +++-
 src/caffe/test/test_neuron_layer.cpp            |  11 +-
 src/caffe/util/blocking_queue.cpp               |   5 -
 src/caffe/util/db_lmdb.cpp                      |   2 +-
 src/caffe/util/hdf5.cpp                         |  38 +-
 src/caffe/util/math_functions.cpp               |  10 +
 src/caffe/util/math_functions.cu                |  41 ++
 src/caffe/util/upgrade_proto.cpp                |   8 +-
 src/gtest/CMakeLists.txt                        |   3 +
 tools/CMakeLists.txt                            |   3 +-
 tools/caffe.cpp                                 |  11 +-
 tools/compute_image_mean.cpp                    |   8 +-
 tools/extra/extract_seconds.py                  |   8 +
 tools/extra/parse_log.py                        |   9 +-
 tools/extra/parse_log.sh                        |   2 +-
 tools/extra/plot_training_log.py.example        |  17 +-
 tools/extra/resize_and_crop_images.py           |   2 +-
 212 files changed, 3866 insertions(+), 2046 deletions(-)

Reply via email to