You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mxnet.apache.org by zh...@apache.org on 2018/03/21 23:24:38 UTC
[incubator-mxnet] 01/01: Merge branch 'master' into nlp_toolkit
This is an automated email from the ASF dual-hosted git repository.
zhasheng pushed a commit to branch nlp_toolkit
in repository https://gitbox.apache.org/repos/asf/incubator-mxnet.git
commit b73f15777d1c905fce79ab7013071e65410ba409
Merge: cf4689b 13e9691
Author: Sheng Zha <zh...@amazon.com>
AuthorDate: Wed Mar 21 16:23:17 2018 -0700
Merge branch 'master' into nlp_toolkit
.github/PULL_REQUEST_TEMPLATE.md | 4 +-
CONTRIBUTORS.md | 2 +
Jenkinsfile | 5 +-
Makefile | 24 +-
ci/docker/Dockerfile.build.centos7_gpu | 2 +-
ci/docker/Dockerfile.build.ubuntu_build_cuda | 6 +-
ci/docker/Dockerfile.build.ubuntu_cpu | 2 -
ci/docker/Dockerfile.build.ubuntu_gpu | 4 +-
ci/docker/install/ubuntu_core.sh | 4 +-
ci/docker/install/ubuntu_nvidia.sh | 5 +-
ci/docker/install/ubuntu_python.sh | 4 +-
ci/docker/runtime_functions.sh | 2 +-
docs/api/python/image/image.md | 2 +-
docs/api/python/ndarray/random.md | 2 +
docs/api/python/symbol/random.md | 2 +
docs/build_version_doc/build_doc.sh | 8 +-
docs/faq/env_var.md | 16 +-
docs/faq/perf.md | 6 +-
docs/mxdoc.py | 4 +-
docs/tutorials/python/linear-regression.md | 6 +-
docs/tutorials/sparse/row_sparse.md | 12 +-
python/mxnet/gluon/block.py | 5 +-
python/mxnet/gluon/data/dataloader.py | 119 ++++--
python/mxnet/gluon/nn/basic_layers.py | 6 +-
python/mxnet/gluon/rnn/rnn_layer.py | 2 +-
python/mxnet/kvstore.py | 4 +-
python/mxnet/model.py | 2 +-
python/mxnet/module/bucketing_module.py | 15 +-
python/mxnet/ndarray/ndarray.py | 2 +-
python/mxnet/ndarray/random.py | 34 +-
python/mxnet/profiler.py | 19 +-
python/mxnet/symbol/random.py | 33 +-
python/mxnet/symbol/register.py | 2 +-
python/mxnet/symbol/symbol.py | 1 +
python/mxnet/torch.py | 20 +-
.../core/src/main/scala/ml/dmlc/mxnet/IO.scala | 4 +
.../src/test/scala/ml/dmlc/mxnet/ModuleSuite.scala | 31 +-
scala-package/examples/pom.xml | 6 +
scala-package/infer/pom.xml | 84 ++++
.../scala/ml/dmlc/mxnet/infer/Classifier.scala | 170 ++++++++
.../scala/ml/dmlc/mxnet/infer/MXNetHandler.scala | 104 +++++
.../main/scala/ml/dmlc/mxnet/infer/Predictor.scala | 198 ++++++++++
.../main/scala/ml/dmlc/mxnet/infer/package.scala | 22 ++
.../infer/src/test/resources/log4j.properties | 17 +-
.../ml/dmlc/mxnet/infer/ClassifierSuite.scala | 205 ++++++++++
.../scala/ml/dmlc/mxnet/infer/PredictorSuite.scala | 114 ++++++
scala-package/pom.xml | 1 +
src/io/image_iter_common.h | 8 +
src/io/iter_image_recordio_2.cc | 33 +-
src/operator/contrib/multi_proposal.cc | 430 ++++++++++++++++++++-
src/operator/contrib/multi_proposal.cu | 10 +-
src/operator/contrib/proposal.cc | 15 +-
src/operator/contrib/proposal.cu | 7 +-
src/operator/correlation-inl.h | 58 ++-
src/operator/correlation.cc | 13 +-
src/operator/correlation.cu | 8 +-
src/operator/l2_normalization-inl.h | 135 ++++---
src/operator/l2_normalization.cc | 13 +-
src/operator/l2_normalization.cu | 8 +-
src/operator/nn/depthwise_convolution-inl.h | 85 +---
src/operator/nn/depthwise_convolution_tf.cuh | 90 +++++
src/operator/random/shuffle_op.cc | 134 +++++++
src/operator/random/shuffle_op.cu | 106 +++++
src/storage/cpu_shared_storage_manager.h | 1 +
tests/ci_build/deploy/aws | 29 --
tests/ci_build/deploy/ci_deploy_doc.sh | 7 +-
tests/python/gpu/test_operator_gpu.py | 88 +++++
tests/python/unittest/test_metric_perf.py | 124 ++++++
tests/python/unittest/test_module.py | 6 +-
tests/python/unittest/test_operator.py | 208 ++++++++--
tests/python/unittest/test_random.py | 77 ++++
71 files changed, 2624 insertions(+), 411 deletions(-)
--
To stop receiving notification emails like this one, please contact
zhasheng@apache.org.