You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mxnet.apache.org by lx...@apache.org on 2017/07/07 15:59:02 UTC

[49/50] [abbrv] incubator-mxnet-test git commit: Merge from base

Merge from base


Project: http://git-wip-us.apache.org/repos/asf/incubator-mxnet-test/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-mxnet-test/commit/cd9aa797
Tree: http://git-wip-us.apache.org/repos/asf/incubator-mxnet-test/tree/cd9aa797
Diff: http://git-wip-us.apache.org/repos/asf/incubator-mxnet-test/diff/cd9aa797

Branch: refs/heads/master
Commit: cd9aa79736bec1202f055ee79b8f8a409157abfe
Parents: e44be31 202de02
Author: Nguyen <ly...@amazon.com>
Authored: Fri Jul 7 08:01:13 2017 -0700
Committer: Nguyen <ly...@amazon.com>
Committed: Fri Jul 7 08:01:13 2017 -0700

----------------------------------------------------------------------
 CMakeLists.txt                                  |   7 +-
 CONTRIBUTORS.md                                 |   3 +
 Jenkinsfile                                     |  72 ++-
 Makefile                                        |  18 +-
 R-package/DESCRIPTION                           |   8 +-
 R-package/R/executor.R                          |   6 +-
 R-package/R/initializer.R                       |  16 +-
 R-package/R/lstm.R                              |  29 +-
 R-package/R/mlp.R                               |   6 +-
 R-package/R/model.R                             |  38 +-
 R-package/R/rnn_model.R                         |  26 +-
 R-package/R/symbol.R                            |  67 ++-
 R-package/R/util.R                              |  17 -
 R-package/README.md                             |   9 +-
 R-package/src/export.cc                         |   2 +-
 R-package/src/ndarray.cc                        |  10 +-
 R-package/src/symbol.cc                         |   8 +
 R-package/src/symbol.h                          |   6 +
 R-package/tests/testthat/get_data.R             |  39 ++
 R-package/tests/testthat/test_io.R              |  86 ++++
 R-package/tests/testthat/test_model.R           | 162 ++++---
 R-package/tests/testthat/test_ndarray.R         | 107 ++++-
 R-package/tests/testthat/test_symbol.R          |  91 +++-
 .../vignettes/fiveMinutesNeuralNetwork.Rmd      |  53 ++-
 README.md                                       |   2 +-
 docs/_static/mxnet-theme/index.html             |  68 +--
 docs/_static/mxnet-theme/navbar.html            |   2 +-
 docs/_static/mxnet.css                          | 107 ++++-
 docs/community/mxnet_channels.md                |   2 +-
 docs/get_started/install.md                     |  68 ++-
 docs/get_started/osx_setup.md                   |  11 +-
 docs/get_started/windows_setup.md               |  94 +++-
 docs/how_to/env_var.md                          | 111 +++--
 docs/how_to/index.md                            |   9 +
 docs/tutorials/nlp/rnn.md                       |   8 +-
 example/image-classification/common/fit.py      |   3 +-
 .../predict-cpp/CMakeLists.txt                  |  23 +-
 example/image-classification/symbol_alexnet.R   |   8 +-
 .../symbols/alexnet_fp16.py                     |  48 +-
 .../symbols/inception-v4.py                     | 191 ++++++++
 example/image-classification/symbols/lenet.py   |  18 +-
 .../symbols/resnet-v1-fp16.py                   |  34 +-
 .../image-classification/symbols/resnet-v1.py   |   4 +-
 example/image-classification/symbols/resnet.py  |   4 +-
 .../image-classification/symbols/resnet_fp16.py |   4 +-
 example/image-classification/symbols/resnext.py |   4 +-
 example/image-classification/train_mnist.py     |   5 +-
 example/rcnn/rcnn/core/module.py                |   4 +-
 example/rcnn/rcnn/io/rcnn.py                    |   9 +-
 example/rnn/lstm_bucketing.py                   |   3 +
 example/ssd/README.md                           |  35 +-
 example/ssd/config/config.py                    |   3 +-
 example/ssd/dataset/imdb.py                     |  32 +-
 example/ssd/dataset/mscoco.py                   | 115 +++++
 example/ssd/dataset/names/mscoco.names          |  80 ++++
 example/ssd/dataset/names/pascal_voc.names      |  20 +
 example/ssd/dataset/pascal_voc.py               |  10 +-
 example/ssd/dataset/pycocotools/README.md       |   2 +
 example/ssd/dataset/pycocotools/__init__.py     |   1 +
 example/ssd/dataset/pycocotools/coco.py         | 435 +++++++++++++++++++
 example/ssd/demo.py                             |  66 ++-
 example/ssd/deploy.py                           |  25 +-
 example/ssd/evaluate.py                         |  23 +-
 example/ssd/evaluate/evaluate_net.py            |   6 +-
 example/ssd/symbol/README.md                    |  49 +++
 example/ssd/symbol/common.py                    | 100 ++++-
 example/ssd/symbol/inceptionv3.py               | 168 +++++++
 example/ssd/symbol/legacy_vgg16_ssd_300.py      | 191 ++++++++
 example/ssd/symbol/legacy_vgg16_ssd_512.py      | 194 +++++++++
 example/ssd/symbol/resnet.py                    | 169 +++++++
 example/ssd/symbol/symbol_builder.py            | 166 +++++++
 example/ssd/symbol/symbol_factory.py            | 122 ++++++
 example/ssd/symbol/symbol_vgg16_ssd_300.py      | 189 --------
 example/ssd/symbol/symbol_vgg16_ssd_512.py      | 194 ---------
 example/ssd/symbol/vgg16_reduced.py             |  86 ++++
 example/ssd/tools/prepare_coco.sh               |   4 +
 example/ssd/tools/prepare_dataset.py            |  30 ++
 example/ssd/tools/visualize_net.py              |  17 +-
 example/ssd/train.py                            |  14 +-
 example/ssd/train/train_net.py                  | Bin 9900 -> 9651 bytes
 include/mxnet/c_api.h                           |  72 ++-
 include/mxnet/kvstore.h                         |  27 ++
 mshadow                                         |   2 +-
 nnvm                                            |   2 +-
 perl-package/AI-MXNet/Changes                   |   3 +
 perl-package/AI-MXNet/MANIFEST                  |   1 +
 perl-package/AI-MXNet/META.json                 |   4 +-
 perl-package/AI-MXNet/META.yml                  |   4 +-
 perl-package/AI-MXNet/Makefile.PL               |   6 +-
 perl-package/AI-MXNet/README                    |   2 +-
 perl-package/AI-MXNet/lib/AI/MXNet.pm           |   4 +-
 perl-package/AI-MXNet/lib/AI/MXNet/Base.pm      |   4 +-
 perl-package/AI-MXNet/lib/AI/MXNet/CachedOp.pm  |  80 +++-
 .../AI-MXNet/lib/AI/MXNet/Executor/Group.pm     |   8 +-
 .../AI-MXNet/lib/AI/MXNet/Initializer.pm        |  43 +-
 perl-package/AI-MXNet/lib/AI/MXNet/KVStore.pm   |  18 +-
 perl-package/AI-MXNet/lib/AI/MXNet/Module.pm    |  88 +++-
 .../AI-MXNet/lib/AI/MXNet/Module/Base.pm        |  23 +-
 .../AI-MXNet/lib/AI/MXNet/Module/Bucketing.pm   |  15 +-
 perl-package/AI-MXNet/lib/AI/MXNet/NDArray.pm   |  34 +-
 .../AI-MXNet/lib/AI/MXNet/NDArray/Base.pm       |  38 --
 perl-package/AI-MXNet/lib/AI/MXNet/Optimizer.pm | 298 +++++++++++--
 perl-package/AI-MXNet/lib/AI/MXNet/RNN/Cell.pm  |   5 +-
 perl-package/AI-MXNet/lib/AI/MXNet/RNN/IO.pm    |  14 +-
 perl-package/AI-MXNet/lib/AI/MXNet/Symbol.pm    |  31 +-
 .../AI-MXNet/lib/AI/MXNet/Symbol/Base.pm        |  14 -
 perl-package/AI-MXNet/lib/AI/MXNet/TestUtils.pm |  16 +-
 perl-package/AI-MXNet/t/test_module.t           | 165 ++++++-
 perl-package/AI-MXNet/t/test_ndarray.t          |  31 +-
 perl-package/AI-MXNet/t/test_optimizers.t       | 161 +++++--
 perl-package/AI-MXNet/t/test_symbol.t           |  22 +-
 perl-package/AI-MXNetCAPI/Changes               |   3 +
 perl-package/AI-MXNetCAPI/META.json             |   2 +-
 perl-package/AI-MXNetCAPI/META.yml              |   2 +-
 perl-package/AI-MXNetCAPI/README                |   2 +-
 perl-package/AI-MXNetCAPI/lib/AI/MXNetCAPI.pm   |   2 +-
 perl-package/AI-MXNetCAPI/mxnet.i               |  95 ++--
 perl-package/AI-MXNetCAPI/mxnet_typemaps.i      |   3 +-
 prepare_mkl.sh                                  |   6 +-
 python/mxnet/_ctypes/common.py                  |  30 --
 python/mxnet/_ctypes/ndarray.py                 |  74 ++--
 python/mxnet/_ctypes/symbol.py                  |  16 -
 python/mxnet/base.py                            |   2 +-
 python/mxnet/cython/base.pyi                    |  70 +--
 python/mxnet/cython/ndarray.pyx                 | 100 +++--
 python/mxnet/cython/symbol.pyx                  |  16 -
 python/mxnet/executor_manager.py                |   4 +-
 python/mxnet/kvstore.py                         |  68 ++-
 python/mxnet/metric.py                          |   4 +-
 python/mxnet/model.py                           |  24 +-
 python/mxnet/module/base_module.py              |  41 +-
 python/mxnet/module/bucketing_module.py         |  17 +-
 python/mxnet/module/executor_group.py           |  12 +-
 python/mxnet/module/module.py                   |  60 ++-
 python/mxnet/module/python_module.py            |   6 +-
 python/mxnet/module/sequential_module.py        |   8 +-
 python/mxnet/ndarray.py                         |   8 +-
 python/mxnet/optimizer.py                       | 171 +++++++-
 python/mxnet/rnn/rnn_cell.py                    | 350 +++++++++++++++
 python/mxnet/symbol.py                          |  49 ++-
 python/mxnet/test_utils.py                      |   2 +-
 .../src/main/scala/ml/dmlc/mxnet/KVStore.scala  |  30 +-
 .../src/main/scala/ml/dmlc/mxnet/LibInfo.scala  |  14 +
 .../src/main/scala/ml/dmlc/mxnet/Model.scala    |  22 +-
 .../scala/ml/dmlc/mxnet/module/Module.scala     |   4 +-
 .../test/scala/ml/dmlc/mxnet/KVStoreSuite.scala |  40 +-
 .../main/native/ml_dmlc_mxnet_native_c_api.cc   |  77 +++-
 setup-utils/install-mxnet-ubuntu-r.sh           |   6 +-
 src/c_api/c_api.cc                              |  47 ++
 src/c_api/c_api_ndarray.cc                      | 185 +++++---
 src/c_api/c_api_symbolic.cc                     |  16 -
 src/common/lazy_alloc_array.h                   |  98 ++++-
 src/engine/thread_pool.h                        |  63 +++
 src/engine/threaded_engine_perdevice.cc         |  98 +++--
 src/executor/graph_executor.cc                  |   2 +-
 src/initialize.cc                               |   2 +-
 src/io/image_det_aug_default.cc                 |   6 +-
 src/kvstore/kvstore.cc                          |   1 -
 src/kvstore/kvstore_local.h                     |  46 ++
 .../contrib/ctc_include/detail/cpu_ctc.h        |   4 +
 .../contrib/ctc_include/detail/gpu_ctc.h        |   4 +
 src/operator/contrib/ctc_loss.cc                |   4 +-
 src/operator/contrib/ctc_loss.cu                |   2 +-
 .../contrib/deformable_convolution-inl.h        |   6 +-
 src/operator/deconvolution-inl.h                |  14 +-
 src/operator/elemwise_op_common.h               |  37 +-
 src/operator/mkl/mkl_relu-inl.h                 |  18 +-
 src/operator/mshadow_op.h                       |  76 +++-
 src/operator/optimizer_op-inl.h                 | 104 +++++
 src/operator/optimizer_op.cc                    |  34 ++
 src/operator/optimizer_op.cu                    |   6 +
 src/operator/tensor/elemwise_binary_op_basic.cc |   2 +-
 src/operator/tensor/elemwise_sum.cc             |   2 +-
 src/operator/tensor/elemwise_unary_op.cc        |  36 +-
 src/operator/tensor/matrix_op.cc                |  18 +-
 src/operator/tensor/sort_op-inl.cuh             |   4 +-
 src/storage/storage.cc                          |  33 +-
 tests/CMakeLists.txt                            |   1 -
 tests/ci_build/Dockerfile.caffe_gpu             |   3 +-
 tests/ci_build/Dockerfile.cpu                   |   2 +
 tests/ci_build/Dockerfile.gpu                   |   2 +
 tests/ci_build/Dockerfile.mklml_gpu             |   2 +-
 tests/ci_build/install/ubuntu_install_r.sh      |  10 +
 tests/python/unittest/common.py                 |  10 +
 tests/python/unittest/test_kvstore.py           | 133 +++---
 tests/python/unittest/test_module.py            | 195 ++++++++-
 tests/python/unittest/test_ndarray.py           |  10 +-
 tests/python/unittest/test_operator.py          |   8 +-
 tests/python/unittest/test_optimizer.py         | 118 +++--
 tests/python/unittest/test_rnn.py               |  47 ++
 tests/python/unittest/test_symbol.py            |  13 -
 tools/caffe_converter/.gitignore                |   1 +
 tools/caffe_converter/caffe_proto_utils.py      | 187 ++++++++
 tools/caffe_converter/compare_layers.py         | 347 +++++++++++++++
 tools/caffe_converter/convert_caffe_modelzoo.py |   4 +-
 tools/caffe_converter/convert_model.py          |  29 +-
 tools/caffe_converter/convert_symbol.py         |  15 +-
 tools/caffe_converter/test_converter.py         |  45 +-
 tools/im2rec.py                                 |  16 +-
 199 files changed, 7265 insertions(+), 1852 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-mxnet-test/blob/cd9aa797/Jenkinsfile
----------------------------------------------------------------------