You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mxnet.apache.org by ta...@apache.org on 2019/09/06 14:51:29 UTC
[incubator-mxnet] 01/01: Merge remote-tracking branch
'origin/master' into mkldnn-v1.0
This is an automated email from the ASF dual-hosted git repository.
taolv pushed a commit to branch mkldnn-v1.0
in repository https://gitbox.apache.org/repos/asf/incubator-mxnet.git
commit 5c5a619afaf69d607fbd254a585584b87f5b1dd8
Merge: 03b734b 7f57e8e
Author: Tao Lv <ta...@intel.com>
AuthorDate: Sat Sep 7 07:40:24 2019 +0800
Merge remote-tracking branch 'origin/master' into mkldnn-v1.0
Conflicts:
ci/jenkins/Jenkins_steps.groovy
3rdparty/mshadow/mshadow/cuda/tensor_gpu-inl.cuh | 26 +-
3rdparty/mshadow/mshadow/extension/slice.h | 4 +-
3rdparty/mshadow/mshadow/tensor.h | 4 +-
3rdparty/mshadow/mshadow/tensor_cpu-inl.h | 11 +-
3rdparty/mshadow/mshadow/tensor_gpu-inl.h | 4 +-
3rdparty/ps-lite | 2 +-
CMakeLists.txt | 4 +-
CONTRIBUTORS.md | 1 +
KEYS | 58 +
Makefile | 39 +-
README.md | 1 +
benchmark/opperf/utils/benchmark_utils.py | 2 +-
benchmark/opperf/utils/common_utils.py | 17 +-
benchmark/opperf/utils/profiler_utils.py | 29 +-
cd/Jenkinsfile_cd_pipeline | 62 +
cd/Jenkinsfile_release_job | 99 +
cd/Jenkinsfile_utils.groovy | 101 +
cd/README.md | 181 ++
cd/mxnet_lib/mxnet_lib_pipeline.groovy | 168 ++
cd/mxnet_lib/static/Jenkins_pipeline.groovy | 59 +
cd/utils/artifact_repository.md | 105 +
cd/utils/artifact_repository.py | 619 +++++
cd/utils/requirements.txt | 2 +
cd/utils/test_artifact_repository.py | 530 +++++
ci/Jenkinsfile_utils.groovy | 7 +-
ci/build_windows.py | 165 +-
ci/docker/Dockerfile.build.ubuntu_gpu_cu101 | 1 +
ci/docker/install/ubuntu_python.sh | 2 +-
ci/docker/runtime_functions.sh | 107 +-
ci/jenkins/Jenkins_steps.groovy | 139 +-
ci/jenkins/Jenkinsfile_clang | 4 +-
.../{Jenkinsfile_clang => Jenkinsfile_tools} | 14 +-
cmake/cmake_options.yml | 1 -
contrib/clojure-package/README.md | 8 +-
.../examples/profiler/test/core_test.clj | 3 +-
.../profiler/test/profile-matmul-20iter.json.ref | 271 ---
contrib/clojure-package/integration-tests.sh | 2 +-
contrib/clojure-package/project.clj | 4 +-
docs/api/python/contrib/onnx.md | 2 +-
docs/conf.py | 2 +-
docs/cpp_docs/Doxyfile | 2370 +++++++++++++++++++
.../integration-tests.sh => docs/cpp_docs/Makefile | 20 +-
docs/install/build_from_source.md | 2 +-
docs/python_docs/README.md | 24 +
docs/python_docs/_static/apache_incubator_logo.png | Bin 0 -> 16552 bytes
docs/python_docs/_static/google_analytics.js | 26 +
docs/python_docs/_static/minima-social-icons.svg | 33 +
docs/python_docs/_static/mxnet-icon.png | Bin 0 -> 2741 bytes
docs/python_docs/_static/mxnet.css | 199 ++
docs/python_docs/_static/mxnet_logo.png | Bin 0 -> 22390 bytes
.../python_docs/environment.yml | 36 +-
docs/python_docs/python/.gitignore | 20 +
docs/python_docs/python/Makefile | 57 +
docs/python_docs/python/Makefile_sphinx | 216 ++
docs/python_docs/python/README.md | 130 ++
docs/python_docs/python/api/advanced/index.rst | 74 +
.../python/api/advanced/mxnet.engine.rst | 34 +
.../python/api/advanced/mxnet.executor.rst | 34 +
.../python/api/advanced/mxnet.executor_manager.rst | 38 +
.../python/api/advanced/mxnet.kvstore_server.rst | 36 +
docs/python_docs/python/api/advanced/mxnet.rtc.rst | 36 +
.../python/api/advanced/mxnet.test_utils.rst | 91 +
.../python_docs/python/api/advanced/mxnet.util.rst | 31 +
.../python_docs/python/api/gluon-related/index.rst | 111 +
.../python/api/gluon-related/mxnet.autograd.rst | 38 +
.../python/api/gluon-related/mxnet.context.rst | 33 +
.../python/api/gluon-related/mxnet.image.rst | 99 +
.../python/api/gluon-related/mxnet.initializer.rst | 58 +
.../python/api/gluon-related/mxnet.io.rst | 52 +
.../api/gluon-related/mxnet.kvstore.KVStore.rst | 61 +
.../api/gluon-related/mxnet.kvstore.create.rst | 23 +
.../python/api/gluon-related/mxnet.kvstore.rst | 27 +
.../api/gluon-related/mxnet.lr_scheduler.rst | 31 +
.../python/api/gluon-related/mxnet.metric.rst | 57 +
.../python/api/gluon-related/mxnet.optimizer.rst | 55 +
.../python/api/gluon-related/mxnet.profiler.rst | 54 +
.../python/api/gluon-related/mxnet.random.rst | 26 +
.../python/api/gluon-related/mxnet.recordio.rst | 43 +
docs/python_docs/python/api/gluon/index.rst | 156 ++
.../python/api/gluon/mxnet.gluon.Constant.rst | 23 +
.../python/api/gluon/mxnet.gluon.HybridBlock.rst | 40 +
.../python/api/gluon/mxnet.gluon.ParameterDict.rst | 79 +
.../python/api/gluon/mxnet.gluon.SymbolBlock.rst | 28 +
.../python/api/gluon/mxnet.gluon.Trainer.rst | 51 +
.../python/api/gluon/mxnet.gluon.contrib.rst | 173 ++
.../python/api/gluon/mxnet.gluon.data.rst | 50 +
.../python/api/gluon/mxnet.gluon.data.vision.rst | 58 +
.../python/api/gluon/mxnet.gluon.loss.rst | 40 +
.../python/api/gluon/mxnet.gluon.model_zoo.rst | 167 ++
.../python/api/gluon/mxnet.gluon.nn.Block.rst | 86 +
.../api/gluon/mxnet.gluon.nn.HybridBlock.rst | 66 +
.../api/gluon/mxnet.gluon.nn.SymbolBlock.rst | 67 +
.../python/api/gluon/mxnet.gluon.parameter.rst | 68 +
.../python/api/gluon/mxnet.gluon.utils.rst | 31 +
docs/python_docs/python/api/gluon/nn.rst | 156 ++
docs/python_docs/python/api/gluon/rnn.rst | 68 +
docs/python_docs/python/api/index.rst | 77 +
docs/python_docs/python/api/ndarray/index.rst | 124 +
.../python/api/ndarray/mxnet.ndarray.NDArray.rst | 310 +++
.../ndarray/mxnet.ndarray.sparse.CSRNDArray.rst | 203 ++
.../mxnet.ndarray.sparse.RowSparseNDArray.rst | 183 ++
docs/python_docs/python/api/ndarray/routines.rst | 461 ++++
.../python/api/ndarray/sparse_routines.rst | 200 ++
.../python/api/symbol-related/index.rst | 53 +
.../python/api/symbol-related/mxnet.callback.rst | 45 +
.../python/api/symbol-related/mxnet.model.rst | 45 +
.../python/api/symbol-related/mxnet.module.rst | 35 +
.../python/api/symbol-related/mxnet.monitor.rst | 35 +
.../api/symbol-related/mxnet.visualization.rst | 35 +
docs/python_docs/python/api/symbol/index.rst | 65 +
.../python/api/symbol/mxnet.symbol.Symbol.rst | 335 +++
.../python/api/symbol/mxnet.symbol.linalg.rst | 49 +
docs/python_docs/python/index.rst | 52 +
docs/{ => python_docs/python/scripts}/conf.py | 94 +-
docs/python_docs/python/scripts/md2ipynb.py | 47 +
docs/python_docs/python/scripts/process_rst.py | 86 +
.../python/tutorials/deploy/export/export.rst | 21 +
.../python/tutorials/deploy/export/index.rst | 42 +
docs/python_docs/python/tutorials/deploy/index.rst | 123 +
.../python/tutorials/deploy/inference/cpp.rst | 21 +
.../python/tutorials/deploy/inference/index.rst | 57 +
.../python/tutorials/deploy/inference/scala.rst | 21 +
.../python/tutorials/deploy/run-on-aws/ami.png | Bin 0 -> 124310 bytes
.../python/tutorials/deploy/run-on-aws/aws.png | Bin 0 -> 178726 bytes
.../python/tutorials/deploy/run-on-aws/cloud.rst | 106 +
.../python/tutorials/deploy/run-on-aws/connect.png | Bin 0 -> 85927 bytes
.../python/tutorials/deploy/run-on-aws/disk.png | Bin 0 -> 165192 bytes
.../python/tutorials/deploy/run-on-aws/ec2.png | Bin 0 -> 283254 bytes
.../python/tutorials/deploy/run-on-aws/index.rst | 55 +
.../python/tutorials/deploy/run-on-aws/keypair.png | Bin 0 -> 193217 bytes
.../tutorials/deploy/run-on-aws/launching.png | Bin 0 -> 62956 bytes
.../python/tutorials/deploy/run-on-aws/limits.png | Bin 0 -> 79889 bytes
.../tutorials/deploy/run-on-aws/login_screen.png | Bin 0 -> 474538 bytes
.../python/tutorials/deploy/run-on-aws/mxnet.png | Bin 0 -> 32270 bytes
.../python/tutorials/deploy/run-on-aws/os.png | Bin 0 -> 210080 bytes
.../python/tutorials/deploy/run-on-aws/p2x.png | Bin 0 -> 77498 bytes
.../tutorials/deploy/run-on-aws/sagemaker.png | Bin 0 -> 117671 bytes
.../python/tutorials/deploy/run-on-aws/ssh.png | Bin 0 -> 376297 bytes
.../python/tutorials/deploy/run-on-aws/use_ec2.rst | 74 +
.../tutorials/deploy/run-on-aws/use_sagemaker.rst | 91 +
.../python/tutorials/extend/custom_layer.md | 266 +++
.../python/tutorials/extend/customop.md | 236 ++
docs/python_docs/python/tutorials/extend/index.rst | 55 +
.../getting-started/crash-course/1-ndarray.md | 127 ++
.../tutorials/getting-started/crash-course/2-nn.md | 142 ++
.../getting-started/crash-course/3-autograd.md | 99 +
.../getting-started/crash-course/4-train.md | 176 ++
.../getting-started/crash-course/5-predict.md | 161 ++
.../getting-started/crash-course/6-use_gpus.md | 146 ++
.../getting-started/crash-course/index.rst | 52 +
.../python/tutorials/getting-started/index.rst | 48 +
.../tutorials/getting-started/to-mxnet/index.rst | 44 +
.../tutorials/getting-started/to-mxnet/pytorch.md | 463 ++++
docs/python_docs/python/tutorials/index.rst | 175 ++
.../python/tutorials/packages/autograd/autograd.md | 272 +++
.../packages/gluon/activations/activations.md | 276 +++
.../packages/gluon/activations/images/elu.png | Bin 0 -> 10707 bytes
.../gluon/activations/images/leakyrelu.png | Bin 0 -> 10769 bytes
.../packages/gluon/activations/images/prelu.png | Bin 0 -> 10202 bytes
.../packages/gluon/activations/images/relu.png | Bin 0 -> 9581 bytes
.../packages/gluon/activations/images/selu.png | Bin 0 -> 11342 bytes
.../packages/gluon/activations/images/sigmoid.png | Bin 0 -> 12763 bytes
.../packages/gluon/activations/images/softrelu.png | Bin 0 -> 11210 bytes
.../packages/gluon/activations/images/softsign.png | Bin 0 -> 15627 bytes
.../packages/gluon/activations/images/swish.png | Bin 0 -> 11634 bytes
.../packages/gluon/activations/images/tanh.png | Bin 0 -> 13530 bytes
.../python/tutorials/packages/gluon/blocks.svg | 514 +++++
.../tutorials/packages/gluon/custom-layer.md | 127 ++
.../packages/gluon/custom-loss/custom-loss.md | 232 ++
.../gluon/custom-loss/images/contrastive_loss.jpeg | Bin 0 -> 32367 bytes
.../gluon/custom-loss/images/inuktitut_1.png | Bin 0 -> 2031 bytes
.../gluon/custom-loss/images/inuktitut_2.png | Bin 0 -> 2217 bytes
.../packages/gluon/custom_layer_beginners.md | 247 ++
.../python/tutorials/packages/gluon/customop.md | 227 ++
.../python/tutorials/packages/gluon/data.md | 141 ++
.../tutorials/packages/gluon/fit_api_tutorial.md | 269 +++
.../python/tutorials/packages/gluon/hybridize.md | 306 +++
.../tutorials/packages/gluon/image-augmentation.md | 150 ++
.../tutorials/packages/gluon/image/index.rst | 105 +
.../python/tutorials/packages/gluon/image/mnist.md | 350 +++
.../packages/gluon/image/pretrained_models.md | 245 ++
.../python/tutorials/packages/gluon/index.rst | 276 +++
.../python/tutorials/packages/gluon/init.md | 322 +++
.../tutorials/packages/gluon/loss/ctc_loss.png | Bin 0 -> 14513 bytes
.../tutorials/packages/gluon/loss/kl_divergence.md | 138 ++
.../python/tutorials/packages/gluon/loss/loss.md | 308 +++
.../tutorials/packages/gluon/loss/triplet_loss.png | Bin 0 -> 13670 bytes
.../python/tutorials/packages/gluon/naming.md | 209 ++
.../python/tutorials/packages/gluon/nn.md | 313 +++
.../packages/gluon/normalization/imgs/NCHW_BN.png | Bin 0 -> 45584 bytes
.../packages/gluon/normalization/imgs/NCHW_IN.png | Bin 0 -> 46218 bytes
.../packages/gluon/normalization/imgs/NCHW_LN.png | Bin 0 -> 45487 bytes
.../packages/gluon/normalization/imgs/NTC_BN.png | Bin 0 -> 37519 bytes
.../packages/gluon/normalization/imgs/NTC_IN.png | Bin 0 -> 38694 bytes
.../packages/gluon/normalization/imgs/NTC_LN.png | Bin 0 -> 38531 bytes
.../normalization/imgs/data_normalization.jpeg | Bin 0 -> 58978 bytes
.../packages/gluon/normalization/normalization.md | 274 +++
.../python/tutorials/packages/gluon/parameters.md | 243 ++
.../python/tutorials/packages/gluon/text/gnmt.rst | 489 ++++
.../python/tutorials/packages/gluon/text/index.rst | 116 +
.../tutorials/packages/gluon/text/transformer.rst | 607 +++++
.../python/tutorials/packages/gluon/trainer.md | 168 ++
.../python/tutorials/packages/index.rst | 140 ++
.../python/tutorials/packages/kvstore/index.rst | 44 +
.../python/tutorials/packages/module/index.rst | 52 +
.../tutorials/packages/ndarray/01-ndarray-intro.md | 176 ++
.../packages/ndarray/02-ndarray-operations.md | 260 +++
.../packages/ndarray/03-ndarray-contexts.md | 89 +
.../python/tutorials/packages/ndarray/index.rst | 88 +
.../python/tutorials/packages/onnx/index.rst | 51 +
.../optimizer/images/momentum_sgd_animation.gif | Bin 0 -> 45436 bytes
.../images/nesterov_momentum_animation.gif | Bin 0 -> 38179 bytes
.../packages/optimizer/images/sgd_animation.gif | Bin 0 -> 44001 bytes
.../tutorials/packages/optimizer/optimizer.md | 429 ++++
.../python/tutorials/packages/symbol/index.rst | 41 +
.../python/tutorials/packages/viz/index.rst | 38 +
.../tutorials/performance/backend/MKLDNN_README.md | 291 +++
.../python/tutorials/performance/backend/index.rst | 52 +
.../tutorials/performance/backend/mkl-dnn.rst | 33 +
.../performance/backend/mkldnn_quantization.md | 258 +++
.../tutorials/performance/backend/profiler.md | 333 +++
.../python/tutorials/performance/backend/tvm.rst | 21 +
.../tutorials/performance/compression/index.rst | 59 +
.../tutorials/performance/compression/int8.rst | 21 +
.../python/tutorials/performance/index.rst | 130 ++
docs/python_docs/themes/.babelrc | 3 +
docs/python_docs/themes/.circleci/config.yml | 37 +
docs/python_docs/themes/.gitignore | 13 +
docs/python_docs/themes/.sassrc | 5 +
docs/python_docs/themes/mx-theme/LICENSE | 21 +
docs/python_docs/themes/mx-theme/MANIFEST.in | 1 +
docs/python_docs/themes/mx-theme/README.md | 65 +
.../themes/mx-theme/mxtheme/__init__.py | 13 +
docs/python_docs/themes/mx-theme/mxtheme/card.py | 42 +
.../themes/mx-theme/mxtheme/drawer.html | 17 +
.../themes/mx-theme/mxtheme/footer.html | 46 +
.../themes/mx-theme/mxtheme/header.html | 45 +
.../themes/mx-theme/mxtheme/header_search.html | 17 +
.../themes/mx-theme/mxtheme/header_sourcelink.html | 18 +
.../themes/mx-theme/mxtheme/header_top.html | 25 +
.../themes/mx-theme/mxtheme/layout.html | 52 +
.../themes/mx-theme/mxtheme/localtoc.html | 8 +
.../themes/mx-theme/mxtheme/relations.html | 20 +
.../themes/mx-theme/mxtheme/search.html | 56 +
.../mxtheme/static/font/Roboto/Roboto-Regular.eot | Bin 0 -> 56856 bytes
.../mxtheme/static/font/Roboto/Roboto-Regular.ttf | Bin 0 -> 126072 bytes
.../mxtheme/static/font/Roboto/Roboto-Regular.woff | Bin 0 -> 65388 bytes
.../static/font/Roboto/Roboto-Regular.woff2 | Bin 0 -> 49248 bytes
.../mx-theme/mxtheme/static/fontawesome/all.css | 5 +
.../themes/mx-theme/mxtheme/static/fonts.css | 390 ++++
.../iconfont/MaterialIcons-Regular.eot | Bin 0 -> 143258 bytes
.../iconfont/MaterialIcons-Regular.svg | 2373 ++++++++++++++++++++
.../iconfont/MaterialIcons-Regular.ttf | Bin 0 -> 128180 bytes
.../iconfont/MaterialIcons-Regular.woff | Bin 0 -> 57620 bytes
.../iconfont/MaterialIcons-Regular.woff2 | Bin 0 -> 44300 bytes
.../material.blue-deep_orange.min.css | 8 +
.../mxtheme/static/sphinx_materialdesign_theme.css | 2 +
.../static/sphinx_materialdesign_theme.css.map | 1 +
.../mxtheme/static/sphinx_materialdesign_theme.js | 705 ++++++
.../static/sphinx_materialdesign_theme.js.map | 1 +
.../python_docs/themes/mx-theme/mxtheme/theme.conf | 20 +
docs/python_docs/themes/mx-theme/setup.py | 19 +
.../themes/mx-theme/src/js/adjust-height.js | 63 +
.../themes/mx-theme/src/js/scrollspy.js | 111 +
.../mx-theme/src/js/sphinx_materialdesign_theme.js | 174 ++
.../themes/mx-theme/src/scss/_root.scss | 115 +
.../themes/mx-theme/src/scss/_variables.scss | 42 +
.../src/scss/admonitions/_admonitions.scss | 101 +
.../mx-theme/src/scss/blockquote/_blockquote.scss | 18 +
.../themes/mx-theme/src/scss/card/_card.scss | 48 +
.../themes/mx-theme/src/scss/code/_code.scss | 134 ++
.../src/scss/downloadlink/_downloadlink.scss | 14 +
.../themes/mx-theme/src/scss/drawer/_drawer.scss | 55 +
.../mx-theme/src/scss/fonts/_material-icons.scss | 29 +
.../themes/mx-theme/src/scss/footer/_footer.scss | 173 ++
.../themes/mx-theme/src/scss/grid/_simplegrid.scss | 207 ++
.../themes/mx-theme/src/scss/header/_header.scss | 182 ++
.../mx-theme/src/scss/headerings/_headerings.scss | 92 +
.../themes/mx-theme/src/scss/layout/_layout.scss | 85 +
.../themes/mx-theme/src/scss/lists/_lists.scss | 19 +
.../themes/mx-theme/src/scss/search/_search.scss | 33 +
.../src/scss/sphinx_materialdesign_theme.scss | 28 +
.../themes/mx-theme/src/scss/tables/_tables.scss | 30 +
.../themes/mx-theme/src/scss/toc/_globaltoc.scss | 78 +
.../themes/mx-theme/src/scss/toc/_localtoc.scss | 40 +
.../themes/mx-theme/src/scss/toc/_toctree.scss | 38 +
docs/static_site/.gitignore | 3 +
docs/static_site/.nojekyll | 1 +
.../static_site/Makefile | 20 +-
docs/static_site/README.md | 42 +
docs/static_site/src/.gitignore | 1 +
docs/static_site/src/.htaccess | 24 +
docs/static_site/src/.nojekyll | 0
docs/static_site/src/404.html | 24 +
docs/static_site/src/Gemfile | 52 +
docs/static_site/src/Gemfile.lock | 84 +
docs/static_site/src/_config.yml | 62 +
docs/static_site/src/_config_beta.yml | 60 +
docs/static_site/src/_config_prod.yml | 59 +
.../static_site/src/_includes/disqus_comments.html | 20 +
docs/static_site/src/_includes/footer.html | 51 +
.../src/_includes/get_started/cloud/cpu.md | 8 +
.../src/_includes/get_started/cloud/gpu.md | 32 +
.../_includes/get_started/devices/nvidia-jetson.md | 4 +
.../_includes/get_started/devices/raspberry_pi.md | 254 +++
.../src/_includes/get_started/get_started.html | 474 ++++
.../src/_includes/get_started/gpu_snippet.md | 11 +
.../src/_includes/get_started/linux/clojure/cpu.md | 15 +
.../src/_includes/get_started/linux/clojure/gpu.md | 15 +
.../src/_includes/get_started/linux/cpp/cpp.md | 4 +
.../src/_includes/get_started/linux/java/cpu.md | 17 +
.../src/_includes/get_started/linux/java/gpu.md | 17 +
.../get_started/linux/julia/build-from-source.md | 2 +
.../src/_includes/get_started/linux/julia/pkg.md | 10 +
.../src/_includes/get_started/linux/perl/perl.md | 1 +
.../linux/python/cpu/build-from-source.md | 1 +
.../get_started/linux/python/cpu/docker.md | 43 +
.../_includes/get_started/linux/python/cpu/pip.md | 121 +
.../linux/python/gpu/build-from-source.md | 1 +
.../get_started/linux/python/gpu/docker.md | 48 +
.../_includes/get_started/linux/python/gpu/pip.md | 74 +
.../src/_includes/get_started/linux/r/cpu.md | 9 +
.../src/_includes/get_started/linux/r/gpu.md | 16 +
.../src/_includes/get_started/linux/scala/cpu.md | 14 +
.../src/_includes/get_started/linux/scala/gpu.md | 16 +
.../src/_includes/get_started/macos/clojure/cpu.md | 17 +
.../src/_includes/get_started/macos/clojure/gpu.md | 1 +
.../src/_includes/get_started/macos/cpp/cpp.md | 3 +
.../src/_includes/get_started/macos/java/cpu.md | 16 +
.../src/_includes/get_started/macos/java/gpu.md | 1 +
.../get_started/macos/julia/build-from-source.md | 1 +
.../src/_includes/get_started/macos/julia/pkg.md | 10 +
.../src/_includes/get_started/macos/perl/perl.md | 1 +
.../macos/python/cpu/build-from-source.md | 2 +
.../get_started/macos/python/cpu/docker.md | 35 +
.../_includes/get_started/macos/python/cpu/pip.md | 73 +
.../macos/python/gpu/build-from-source.md | 2 +
.../get_started/macos/python/gpu/pip_docker.md | 1 +
.../src/_includes/get_started/macos/r/cpu.md | 28 +
.../src/_includes/get_started/macos/r/gpu.md | 1 +
.../src/_includes/get_started/macos/scala/cpu.md | 14 +
.../src/_includes/get_started/macos/scala/gpu.md | 1 +
.../src/_includes/get_started/pip_snippet.md | 14 +
.../get_started/windows/clojure/clojure.md | 1 +
.../src/_includes/get_started/windows/cpp/cpp.md | 3 +
.../src/_includes/get_started/windows/java/java.md | 1 +
.../get_started/windows/julia/build-from-source.md | 1 +
.../src/_includes/get_started/windows/julia/pkg.md | 10 +
.../src/_includes/get_started/windows/perl/perl.md | 1 +
.../windows/python/cpu/build-from-source.md | 1 +
.../get_started/windows/python/cpu/docker.md | 34 +
.../get_started/windows/python/cpu/pip.md | 73 +
.../windows/python/gpu/build-from-source.md | 1 +
.../get_started/windows/python/gpu/pip.md | 74 +
.../src/_includes/get_started/windows/r/cpu.md | 15 +
.../src/_includes/get_started/windows/r/gpu.md | 16 +
.../_includes/get_started/windows/scala/scala.md | 1 +
.../src/_includes/google-analytics.html | 12 +
docs/static_site/src/_includes/head.html | 18 +
docs/static_site/src/_includes/header.html | 49 +
docs/static_site/src/_includes/icon-github.html | 1 +
docs/static_site/src/_includes/icon-github.svg | 1 +
docs/static_site/src/_includes/icon-twitter.html | 1 +
docs/static_site/src/_includes/icon-twitter.svg | 1 +
docs/static_site/src/_includes/social.html | 14 +
docs/static_site/src/_layouts/default.html | 18 +
docs/static_site/src/_layouts/home.html | 177 ++
docs/static_site/src/_layouts/page.html | 25 +
docs/static_site/src/_layouts/page_api.html | 52 +
docs/static_site/src/_layouts/page_category.html | 18 +
.../src/_layouts/page_landing_tutorials.html | 13 +
docs/static_site/src/_layouts/post.html | 29 +
.../static_site/src/_plugins/markdowner.rb | 28 +-
docs/static_site/src/_sass/minima.scss | 64 +
docs/static_site/src/_sass/minima/_base.scss | 278 +++
docs/static_site/src/_sass/minima/_blog.scss | 41 +
docs/static_site/src/_sass/minima/_docs.scss | 79 +
docs/static_site/src/_sass/minima/_ecosystem.scss | 9 +
docs/static_site/src/_sass/minima/_features.scss | 23 +
.../src/_sass/minima/_getting_started.scss | 178 ++
docs/static_site/src/_sass/minima/_home.scss | 181 ++
docs/static_site/src/_sass/minima/_layout.scss | 350 +++
.../src/_sass/minima/_syntax-highlighting.scss | 322 +++
docs/static_site/src/_sass/minima/colorful.scss | 370 +++
docs/static_site/src/_sass/minima/simple-grid.scss | 207 ++
docs/static_site/src/assets/img/Github.svg | 1 +
docs/static_site/src/assets/img/R_logo.svg | 14 +
docs/static_site/src/assets/img/algorithm.svg | 1 +
docs/static_site/src/assets/img/algorithmv1.svg | 1 +
.../src/assets/img/apache_incubator_logo.png | Bin 0 -> 16552 bytes
docs/static_site/src/assets/img/api.svg | 1 +
.../src/assets/img/artificial-intelligence.svg | 20 +
docs/static_site/src/assets/img/book.svg | 1 +
docs/static_site/src/assets/img/bottom-min.jpg | Bin 0 -> 952968 bytes
docs/static_site/src/assets/img/chip.svg | 1 +
docs/static_site/src/assets/img/circuit.svg | 66 +
docs/static_site/src/assets/img/clipboard.svg | 47 +
docs/static_site/src/assets/img/clojure_logo.svg | 50 +
docs/static_site/src/assets/img/coach_logo.png | Bin 0 -> 41911 bytes
docs/static_site/src/assets/img/compass.svg | 47 +
docs/static_site/src/assets/img/cpp_logo.svg | 25 +
docs/static_site/src/assets/img/front.jpg | Bin 0 -> 280416 bytes
docs/static_site/src/assets/img/horovod.png | Bin 0 -> 50211 bytes
docs/static_site/src/assets/img/java_logo.svg | 13 +
docs/static_site/src/assets/img/julia_logo.svg | 10 +
docs/static_site/src/assets/img/keras.png | Bin 0 -> 13784 bytes
docs/static_site/src/assets/img/line-graph.svg | 107 +
docs/static_site/src/assets/img/logos.png | Bin 0 -> 493103 bytes
docs/static_site/src/assets/img/mxfusion.png | Bin 0 -> 21013 bytes
.../assets/img/mxnet-background-compressed.jpeg | Bin 0 -> 86747 bytes
docs/static_site/src/assets/img/mxnet_logo.png | Bin 0 -> 22390 bytes
docs/static_site/src/assets/img/mxnet_m.png | Bin 0 -> 3463 bytes
docs/static_site/src/assets/img/octocat.png | Bin 0 -> 32590 bytes
docs/static_site/src/assets/img/perl_logo.svg | 1 +
docs/static_site/src/assets/img/programming.svg | 55 +
docs/static_site/src/assets/img/programmingv1.svg | 109 +
docs/static_site/src/assets/img/python_logo.svg | 269 +++
docs/static_site/src/assets/img/scala_logo.svg | 1 +
docs/static_site/src/assets/img/search.svg | 1 +
.../static_site/src/assets/img/slack-logo-icon.svg | 33 +
docs/static_site/src/assets/img/tensorly_logo.png | Bin 0 -> 100093 bytes
docs/static_site/src/assets/img/textbook.svg | 1 +
docs/static_site/src/assets/img/tvm.png | Bin 0 -> 4808 bytes
docs/static_site/src/assets/img/video-tutorial.svg | 2 +
docs/static_site/src/assets/img/visual.svg | 1 +
docs/static_site/src/assets/img/xfer.png | Bin 0 -> 8932 bytes
docs/static_site/src/assets/js/clipboard.js | 818 +++++++
docs/static_site/src/assets/js/copycode.js | 97 +
docs/static_site/src/assets/js/options.js | 120 +
docs/static_site/src/assets/main.scss | 8 +
.../static_site/src/assets/minima-social-icons.svg | 33 +
docs/static_site/src/index.html | 54 +
docs/static_site/src/pages/api/api.html | 191 ++
.../pages/api/architecture/exception_handling.md | 130 ++
.../pages/api/architecture/note_data_loading.md | 267 +++
.../src/pages/api/architecture/note_engine.md | 391 ++++
.../src/pages/api/architecture/note_memory.md | 351 +++
.../src/pages/api/architecture/overview.md | 874 +++++++
.../src/pages/api/architecture/program_model.md | 629 ++++++
.../src/pages/api/clojure/docs/tutorials/index.md | 23 +
.../pages/api/clojure/docs/tutorials/kvstore.md | 109 +
.../src/pages/api/clojure/docs/tutorials/module.md | 259 +++
.../pages/api/clojure/docs/tutorials/ndarray.md | 143 ++
.../src/pages/api/clojure/docs/tutorials/symbol.md | 156 ++
.../clojure/docs/tutorials/symbol_in_pictures.md | 101 +
docs/static_site/src/pages/api/clojure/index.md | 47 +
.../src/pages/api/cpp/docs/tutorials/basics.md | 222 ++
.../src/pages/api/cpp/docs/tutorials/index.md | 22 +
.../docs/tutorials/mxnet_cpp_inference_tutorial.md | 293 +++
.../pages/api/cpp/docs/tutorials/subgraphAPI.md | 175 ++
docs/static_site/src/pages/api/cpp/index.md | 61 +
.../src/pages/api/faq/add_op_in_backend.md | 692 ++++++
docs/static_site/src/pages/api/faq/caffe.md | 208 ++
docs/static_site/src/pages/api/faq/cloud.md | 208 ++
.../src/pages/api/faq/distributed_training.md | 332 +++
docs/static_site/src/pages/api/faq/env_var.md | 354 +++
docs/static_site/src/pages/api/faq/float16.md | 256 +++
.../src/pages/api/faq/gradient_compression.md | 132 ++
.../src/pages/api/faq/model_parallel_lstm.md | 90 +
docs/static_site/src/pages/api/faq/new_op.md | 400 ++++
docs/static_site/src/pages/api/faq/nnpack.md | 162 ++
docs/static_site/src/pages/api/faq/perf.md | 315 +++
docs/static_site/src/pages/api/faq/recordio.md | 109 +
.../src/pages/api/faq/s3_integration.md | 125 ++
docs/static_site/src/pages/api/faq/security.md | 49 +
docs/static_site/src/pages/api/faq/smart_device.md | 120 +
.../src/pages/api/faq/visualize_graph.md | 88 +
docs/static_site/src/pages/api/faq/why_mxnet.md | 207 ++
.../src/pages/api/java/docs/tutorials/index.md | 22 +
.../java/docs/tutorials/mxnet_java_on_intellij.md | 188 ++
.../pages/api/java/docs/tutorials/ssd_inference.md | 210 ++
docs/static_site/src/pages/api/java/index.md | 41 +
docs/static_site/src/pages/api/julia/index.md | 39 +
.../src/pages/api/perl/docs/tutorials/index.md | 23 +
.../src/pages/api/perl/docs/tutorials/io.md | 136 ++
.../src/pages/api/perl/docs/tutorials/kvstore.md | 134 ++
.../src/pages/api/perl/docs/tutorials/module.md | 70 +
.../src/pages/api/perl/docs/tutorials/ndarray.md | 66 +
.../src/pages/api/perl/docs/tutorials/symbol.md | 151 ++
docs/static_site/src/pages/api/perl/index.md | 91 +
docs/static_site/src/pages/api/python/index.md | 44 +
.../api/r/docs/tutorials/callback_function.md | 278 +++
.../pages/api/r/docs/tutorials/char_rnn_model.md | 317 +++
.../classify_real_image_with_pretrained_model.md | 208 ++
.../pages/api/r/docs/tutorials/custom_iterator.md | 227 ++
.../api/r/docs/tutorials/custom_loss_function.md | 231 ++
.../docs/tutorials/five_minutes_neural_network.md | 341 +++
.../src/pages/api/r/docs/tutorials/index.md | 23 +
.../api/r/docs/tutorials/mnist_competition.md | 363 +++
.../pages/api/r/docs/tutorials/multi_dim_lstm.md | 327 +++
.../src/pages/api/r/docs/tutorials/ndarray.md | 231 ++
.../src/pages/api/r/docs/tutorials/symbol.md | 154 ++
docs/static_site/src/pages/api/r/index.md | 52 +
.../pages/api/scala/docs/tutorials/char_lstm.md | 533 +++++
.../src/pages/api/scala/docs/tutorials/index.md | 22 +
.../src/pages/api/scala/docs/tutorials/infer.md | 66 +
.../src/pages/api/scala/docs/tutorials/io.md | 189 ++
.../src/pages/api/scala/docs/tutorials/kvstore.md | 129 ++
.../src/pages/api/scala/docs/tutorials/mnist.md | 141 ++
.../src/pages/api/scala/docs/tutorials/model.md | 142 ++
.../src/pages/api/scala/docs/tutorials/module.md | 162 ++
.../docs/tutorials/mxnet_scala_on_intellij.md | 456 ++++
.../src/pages/api/scala/docs/tutorials/ndarray.md | 181 ++
.../src/pages/api/scala/docs/tutorials/symbol.md | 155 ++
.../api/scala/docs/tutorials/symbol_in_pictures.md | 100 +
docs/static_site/src/pages/api/scala/index.md | 59 +
docs/static_site/src/pages/blog.html | 38 +
docs/static_site/src/pages/community/contribute.md | 192 ++
docs/static_site/src/pages/ecosystem.html | 133 ++
docs/static_site/src/pages/features.html | 106 +
.../src/pages/get_started}/build_from_source.md | 10 +-
.../src/pages/get_started/c_plus_plus.md | 55 +
.../src/pages/get_started/centos_setup.md | 115 +
docs/static_site/src/pages/get_started/download.md | 83 +
docs/static_site/src/pages/get_started/index.html | 33 +
.../src/pages/get_started/java_setup.md | 135 ++
.../src/pages/get_started/jetson_setup.md | 243 ++
.../static_site/src/pages/get_started/osx_setup.md | 275 +++
.../src/pages/get_started/scala_setup.md | 165 ++
.../src/pages/get_started/ubuntu_setup.md | 561 +++++
.../src/pages/get_started/validate_mxnet.md | 226 ++
.../src/pages/get_started/windows_setup.md | 490 ++++
docs/tutorials/amp/amp_tutorial.md | 2 +-
example/quantization/README.md | 23 +-
example/quantization/imagenet_gen_qsym.py | 17 +-
example/quantization/imagenet_gen_qsym_mkldnn.py | 6 +-
example/rnn/bucketing/README.md | 6 +
example/rnn/bucketing/cudnn_rnn_bucketing.py | 19 +-
example/ssd/quantization.py | 11 +-
include/mxnet/c_api.h | 455 ++--
include/mxnet/c_api_test.h | 4 +-
include/mxnet/c_predict_api.h | 64 +-
include/mxnet/imperative.h | 2 +-
include/mxnet/op_attr_types.h | 30 +
include/mxnet/tuple.h | 10 +
python/mxnet/_numpy_op_doc.py | 51 +
python/mxnet/contrib/amp/amp.py | 64 +
.../mxnet/contrib/onnx/mx2onnx/_op_translations.py | 33 +
python/mxnet/contrib/onnx/mx2onnx/export_model.py | 2 +-
.../mxnet/contrib/onnx/onnx2mx/_import_helper.py | 5 +-
.../mxnet/contrib/onnx/onnx2mx/_op_translations.py | 8 +
python/mxnet/contrib/quantization.py | 285 +--
python/mxnet/contrib/text/embedding.py | 29 +-
python/mxnet/gluon/data/dataloader.py | 34 +-
python/mxnet/gluon/data/vision/datasets.py | 12 +-
python/mxnet/gluon/data/vision/transforms.py | 25 +
python/mxnet/gluon/loss.py | 78 +-
python/mxnet/gluon/model_zoo/vision/resnet.py | 19 +-
python/mxnet/gluon/nn/activations.py | 7 +-
python/mxnet/gluon/nn/basic_layers.py | 27 +-
python/mxnet/gluon/nn/conv_layers.py | 54 +-
python/mxnet/gluon/rnn/rnn_layer.py | 31 +-
python/mxnet/gluon/utils.py | 29 +-
python/mxnet/image/detection.py | 17 +-
python/mxnet/image/image.py | 42 +-
python/mxnet/initializer.py | 15 +-
python/mxnet/metric.py | 6 +-
python/mxnet/model.py | 33 +-
python/mxnet/module/bucketing_module.py | 170 +-
python/mxnet/module/module.py | 2 +-
python/mxnet/ndarray/ndarray.py | 433 +++-
python/mxnet/ndarray/numpy/_op.py | 464 +++-
python/mxnet/ndarray/numpy/random.py | 170 +-
python/mxnet/numpy/multiarray.py | 844 ++++++-
python/mxnet/numpy/random.py | 127 +-
python/mxnet/numpy_extension/__init__.py | 1 +
python/mxnet/numpy_extension/random.py | 74 +
python/mxnet/profiler.py | 11 +-
python/mxnet/symbol/numpy/_symbol.py | 374 ++-
python/mxnet/symbol/numpy/random.py | 116 +-
python/mxnet/symbol/symbol.py | 58 +
python/mxnet/test_utils.py | 12 +-
.../assembly/src/main/assembly/assembly.xml | 1 +
.../apache/mxnet/util/NativeLibraryLoader.scala | 1 +
src/c_api/c_api.cc | 170 +-
src/c_api/c_api_common.h | 8 +-
src/c_api/c_api_executor.cc | 128 +-
src/c_api/c_api_ndarray.cc | 22 +-
src/c_api/c_api_symbolic.cc | 249 +-
src/c_api/c_api_test.cc | 4 +-
src/c_api/c_predict_api.cc | 86 +-
src/common/tensor_inspector.h | 1 -
src/common/utils.h | 10 +
src/executor/graph_executor.cc | 15 +-
src/imperative/imperative.cc | 2 +-
src/ndarray/ndarray.cc | 1 +
src/ndarray/ndarray_function.cc | 2 +-
src/operator/contrib/rroi_align-inl.h | 67 +
src/operator/contrib/rroi_align.cc | 326 +++
src/operator/contrib/tvmop/ufunc.cc | 2 +-
src/operator/mshadow_op.h | 2 +-
src/operator/nn/mkldnn/mkldnn_batch_norm-inl.h | 13 +-
.../mkldnn/mkldnn_flatten-inl.h} | 38 +-
src/operator/nn/mkldnn/mkldnn_flatten.cc | 10 +-
src/operator/numpy/np_broadcast_reduce_op.h | 228 +-
src/operator/numpy/np_broadcast_reduce_op_index.cc | 61 +
...op_value.cu => np_broadcast_reduce_op_index.cu} | 24 +-
src/operator/numpy/np_broadcast_reduce_op_value.cc | 208 ++
src/operator/numpy/np_broadcast_reduce_op_value.cu | 24 +
src/operator/numpy/np_cumsum-inl.h | 188 ++
src/operator/numpy/np_cumsum.cc | 94 +
...p_broadcast_reduce_op_value.cu => np_cumsum.cu} | 27 +-
src/operator/numpy/np_elemwise_broadcast_op.cc | 74 -
src/operator/numpy/np_elemwise_broadcast_op.cu | 12 -
src/operator/numpy/random/np_multinomial_op.cc | 61 +
.../np_multinomial_op.cu} | 26 +-
src/operator/numpy/random/np_multinomial_op.h | 193 ++
src/operator/optimizer_op-inl.h | 279 +--
.../calibrate-inl.h} | 38 +-
src/operator/quantization/calibrate.cc | 215 ++
.../quantization/mkldnn/mkldnn_quantize_v2-inl.h | 6 +-
.../mkldnn/mkldnn_quantized_batch_norm.cc | 2 +-
.../mkldnn/mkldnn_quantized_elemwise_add.cc | 4 +-
.../mkldnn/mkldnn_quantized_flatten.cc | 61 +
src/operator/quantization/quantization_utils.h | 4 +-
src/operator/quantization/quantize_graph_pass.cc | 315 ++-
src/operator/quantization/quantize_v2.cc | 3 +
src/operator/quantization/quantized_batch_norm.cc | 3 +
src/operator/quantization/quantized_conv.cc | 3 +
.../quantization/quantized_fully_connected.cc | 3 +
src/operator/quantization/requantize.cc | 3 +
src/operator/random/sample_op.cc | 1 +
src/operator/rnn-inl.h | 79 +-
src/operator/rnn.cc | 14 +-
src/operator/sequence_last-inl.h | 24 +-
src/operator/sequence_reverse-inl.h | 14 +-
src/operator/softmax_output-inl.h | 18 +-
src/operator/subgraph/build_subgraph.cc | 47 +-
src/operator/subgraph/mkldnn/mkldnn_conv.cc | 3 +
src/operator/subgraph/mkldnn/mkldnn_fc.cc | 3 +
src/operator/subgraph/subgraph_property.h | 6 +
src/operator/tensor/broadcast_reduce-inl.h | 4 +-
src/operator/tensor/elemwise_binary_broadcast_op.h | 4 +
.../elemwise_binary_broadcast_op_extended.cc | 2 +
.../tensor/elemwise_binary_scalar_op_extended.cc | 6 +-
src/operator/tensor/indexing_op.cc | 17 +-
src/operator/tensor/indexing_op.cu | 18 +-
src/operator/tensor/indexing_op.h | 45 +-
src/operator/tensor/init_op.cc | 1 +
src/operator/tensor/matrix_op-inl.h | 43 +-
src/operator/tensor/matrix_op.cc | 8 +-
src/profiler/aggregate_stats.cc | 3 +
src/profiler/aggregate_stats.h | 2 +-
.../nightly/apache_rat_license_check/rat-excludes | 29 +-
tests/nightly/test_large_array.py | 75 +-
tests/nightly/test_large_vector.py | 696 +++++-
tests/python-pytest/onnx/test_cases.py | 3 +-
tests/python/gpu/test_contrib_amp.py | 38 +
tests/python/mkl/test_subgraph.py | 9 +-
tests/python/quantization/test_quantization.py | 55 +-
tests/python/train/test_bucketing.py | 50 +-
tests/python/unittest/test_metric.py | 7 +
tests/python/unittest/test_module.py | 71 +
tests/python/unittest/test_ndarray.py | 113 +-
tests/python/unittest/test_numpy_gluon.py | 113 +
tests/python/unittest/test_numpy_ndarray.py | 348 ++-
tests/python/unittest/test_numpy_op.py | 575 ++++-
tests/python/unittest/test_operator.py | 279 ++-
tests/python/unittest/test_profiler.py | 100 +-
tests/python/unittest/test_sparse_operator.py | 4 +-
tests/python/unittest/test_subgraph_op.py | 126 ++
tests/python/unittest/test_symbol.py | 16 +
tests/python/unittest/test_tvm_op.py | 1 -
tools/diagnose.py | 53 +-
tools/license_header.py | 7 +
665 files changed, 61745 insertions(+), 2640 deletions(-)
diff --cc Makefile
index 1822d9c,fcef885..cb828bb
--- a/Makefile
+++ b/Makefile
@@@ -686,10 -700,16 +691,14 @@@ rpkg
cp src/io/image_recordio.h R-package/src
cp -rf lib/libmxnet.so R-package/inst/libs
- if [ -e "lib/libmkldnn.so.0" ]; then \
- cp -rf lib/libmkldnn.so.0 R-package/inst/libs; \
- cp -rf lib/libiomp5.so R-package/inst/libs; \
- cp -rf lib/libmklml_intel.so R-package/inst/libs; \
+ if [ -e "lib/libmkldnn.so.1" ]; then \
+ cp -rf lib/libmkldnn.so.1 R-package/inst/libs; \
fi
+ if [ -e "lib/libtvm_runtime.so" ]; then \
+ cp -rf lib/libtvm_runtime.so R-package/inst/libs; \
+ fi
+
mkdir -p R-package/inst/include
cp -rl include/* R-package/inst/include
Rscript -e "if(!require(devtools)){install.packages('devtools', repo = 'https://cloud.r-project.org/')}"
diff --cc ci/docker/runtime_functions.sh
index 75a4f80,689d525..4501896
--- a/ci/docker/runtime_functions.sh
+++ b/ci/docker/runtime_functions.sh
@@@ -571,11 -564,10 +564,11 @@@ build_ubuntu_cpu_mkldnn_mkl()
make \
DEV=1 \
- ENABLE_TESTCOVERAGE=1 \
USE_CPP_PACKAGE=1 \
+ USE_TVM_OP=1 \
USE_BLAS=mkl \
USE_SIGNAL_HANDLER=1 \
+ USE_INTEL_PATH=/opt/intel/ \
-j$(nproc)
}
diff --cc ci/jenkins/Jenkins_steps.groovy
index 6f94d33,eda1d34..23f2eed
--- a/ci/jenkins/Jenkins_steps.groovy
+++ b/ci/jenkins/Jenkins_steps.groovy
@@@ -30,15 -30,15 +30,15 @@@ mx_lib_cython = 'lib/libmxnet.so, lib/l
mx_pip = 'build/*.whl'
// mxnet cmake libraries, in cmake builds we do not produce a libnvvm static library by default.
- mx_cmake_lib = 'build/libmxnet.so, build/libmxnet.a, build/3rdparty/dmlc-core/libdmlc.a, build/tests/mxnet_unit_tests, build/3rdparty/openmp/runtime/src/libomp.so'
- mx_cmake_lib_cython = 'build/libmxnet.so, build/libmxnet.a, build/3rdparty/dmlc-core/libdmlc.a, build/tests/mxnet_unit_tests, build/3rdparty/openmp/runtime/src/libomp.so, python/mxnet/_cy2/*.so, python/mxnet/_cy3/*.so'
+ mx_cmake_lib = 'build/libmxnet.so, build/libmxnet.a, build/3rdparty/tvm/libtvm_runtime.so, build/libtvmop.so, build/3rdparty/dmlc-core/libdmlc.a, build/tests/mxnet_unit_tests, build/3rdparty/openmp/runtime/src/libomp.so'
+ mx_cmake_lib_cython = 'build/libmxnet.so, build/libmxnet.a, build/3rdparty/tvm/libtvm_runtime.so, build/libtvmop.so, build/3rdparty/dmlc-core/libdmlc.a, build/tests/mxnet_unit_tests, build/3rdparty/openmp/runtime/src/libomp.so, python/mxnet/_cy2/*.so, python/mxnet/_cy3/*.so'
// mxnet cmake libraries, in cmake builds we do not produce a libnvvm static library by default.
- mx_cmake_lib_debug = 'build/libmxnet.so, build/libmxnet.a, build/libsample_lib.so, build/3rdparty/dmlc-core/libdmlc.a, build/tests/mxnet_unit_tests'
- mx_cmake_mkldnn_lib = 'build/libmxnet.so, build/libmxnet.a, build/3rdparty/dmlc-core/libdmlc.a, build/tests/mxnet_unit_tests, build/3rdparty/openmp/runtime/src/libomp.so, build/3rdparty/mkldnn/src/libmkldnn.so.1'
- mx_mkldnn_lib = 'lib/libmxnet.so, lib/libmxnet.a, libsample_lib.so, lib/libmkldnn.so.1, 3rdparty/dmlc-core/libdmlc.a, 3rdparty/tvm/nnvm/lib/libnnvm.a'
- mx_tensorrt_lib = 'build/libmxnet.so, lib/libnvonnxparser_runtime.so.0, lib/libnvonnxparser.so.0, lib/libonnx_proto.so, lib/libonnx.so'
- mx_lib_cpp_examples = 'lib/libmxnet.so, lib/libmxnet.a, libsample_lib.so, 3rdparty/dmlc-core/libdmlc.a, 3rdparty/tvm/nnvm/lib/libnnvm.a, 3rdparty/ps-lite/build/libps.a, deps/lib/libprotobuf-lite.a, deps/lib/libzmq.a, build/cpp-package/example/*, python/mxnet/_cy2/*.so, python/mxnet/_cy3/*.so'
- mx_lib_cpp_examples_cpu = 'build/libmxnet.so, build/cpp-package/example/*'
+ mx_cmake_lib_debug = 'build/libmxnet.so, build/libmxnet.a, build/3rdparty/tvm/libtvm_runtime.so, build/libtvmop.so, build/libsample_lib.so, build/3rdparty/dmlc-core/libdmlc.a, build/tests/mxnet_unit_tests'
-mx_cmake_mkldnn_lib = 'build/libmxnet.so, build/libmxnet.a, build/3rdparty/tvm/libtvm_runtime.so, build/libtvmop.so, build/3rdparty/dmlc-core/libdmlc.a, build/tests/mxnet_unit_tests, build/3rdparty/openmp/runtime/src/libomp.so, build/3rdparty/mkldnn/src/libmkldnn.so.0'
-mx_mkldnn_lib = 'lib/libmxnet.so, lib/libmxnet.a, lib/libtvm_runtime.so, lib/libtvmop.so, libsample_lib.so, lib/libiomp5.so, lib/libmkldnn.so.0, lib/libmklml_intel.so, 3rdparty/dmlc-core/libdmlc.a, 3rdparty/tvm/nnvm/lib/libnnvm.a'
++mx_cmake_mkldnn_lib = 'build/libmxnet.so, build/libmxnet.a, build/3rdparty/tvm/libtvm_runtime.so, build/libtvmop.so, build/3rdparty/dmlc-core/libdmlc.a, build/tests/mxnet_unit_tests, build/3rdparty/openmp/runtime/src/libomp.so, build/3rdparty/mkldnn/src/libmkldnn.so.1'
++mx_mkldnn_lib = 'lib/libmxnet.so, lib/libmxnet.a, lib/libtvm_runtime.so, lib/libtvmop.so, libsample_lib.so, lib/libmkldnn.so.1, 3rdparty/dmlc-core/libdmlc.a, 3rdparty/tvm/nnvm/lib/libnnvm.a'
+ mx_tensorrt_lib = 'build/libmxnet.so, build/3rdparty/tvm/libtvm_runtime.so, build/libtvmop.so, lib/libnvonnxparser_runtime.so.0, lib/libnvonnxparser.so.0, lib/libonnx_proto.so, lib/libonnx.so'
+ mx_lib_cpp_examples = 'lib/libmxnet.so, lib/libmxnet.a, lib/libtvm_runtime.so, lib/libtvmop.so, libsample_lib.so, 3rdparty/dmlc-core/libdmlc.a, 3rdparty/tvm/nnvm/lib/libnnvm.a, 3rdparty/ps-lite/build/libps.a, deps/lib/libprotobuf-lite.a, deps/lib/libzmq.a, build/cpp-package/example/*, python/mxnet/_cy2/*.so, python/mxnet/_cy3/*.so'
+ mx_lib_cpp_examples_cpu = 'build/libmxnet.so, build/3rdparty/tvm/libtvm_runtime.so, build/libtvmop.so, build/cpp-package/example/*'
// Python unittest for CPU
// Python 2
diff --cc scala-package/assembly/src/main/assembly/assembly.xml
index c1244fe,bcc5408..060a97b
--- a/scala-package/assembly/src/main/assembly/assembly.xml
+++ b/scala-package/assembly/src/main/assembly/assembly.xml
@@@ -54,10 -54,15 +54,11 @@@
<directory>${MXNET_DIR}/lib</directory>
<includes>
<include>libmxnet.so</include>
+ <include>libtvm_runtime.so</include>
<include>libgfortran.so.3</include>
<include>libquadmath.so.0</include>
- <include>libiomp5.so</include>
- <include>libiomp5.dylib</include>
- <include>libmklml_intel.so</include>
- <include>libmklml.dylib</include>
- <include>libmkldnn.so.0</include>
- <include>libmkldnn.0.dylib</include>
+ <include>libmkldnn.so.1</include>
+ <include>libmkldnn.1.dylib</include>
</includes>
<outputDirectory>lib/native</outputDirectory>
</fileSet>
diff --cc scala-package/core/src/main/scala/org/apache/mxnet/util/NativeLibraryLoader.scala
index 103b5f0,9609ba2..49e5d68
--- a/scala-package/core/src/main/scala/org/apache/mxnet/util/NativeLibraryLoader.scala
+++ b/scala-package/core/src/main/scala/org/apache/mxnet/util/NativeLibraryLoader.scala
@@@ -86,10 -86,15 +86,11 @@@ private[mxnet] object NativeLibraryLoad
logger.debug(s"Attempting to load $loadLibname")
val libFileInJar = libPathInJar + loadLibname
saveLibraryToTemp("libmxnet.so", "/lib/native/libmxnet.so", true)
+ saveLibraryToTemp("libtvm_runtime.so", "/lib/native/libtvm_runtime.so", false)
saveLibraryToTemp("libgfortran.so.3", "/lib/native/libgfortran.so.3", false)
saveLibraryToTemp("libquadmath.so.0", "/lib/native/libquadmath.so.0", false)
- saveLibraryToTemp("libiomp5.so", "/lib/native/libiomp5.so", false)
- saveLibraryToTemp("libiomp5.dylib", "/lib/native/libiomp5.dylib", false)
- saveLibraryToTemp("libmklml_intel.so", "/lib/native/libmklml_intel.so", false)
- saveLibraryToTemp("libmklml.dylib", "/lib/native/libmklml.dylib", false)
- saveLibraryToTemp("libmkldnn.so.0", "/lib/native/libmkldnn.so.0", false)
- saveLibraryToTemp("libmkldnn.0.dylib", "/lib/native/libmkldnn.0.dylib", false)
+ saveLibraryToTemp("libmkldnn.so.1", "/lib/native/libmkldnn.so.1", false)
+ saveLibraryToTemp("libmkldnn.1.dylib", "/lib/native/libmkldnn.1.dylib", false)
val tempfile: File = saveLibraryToTemp(libname, libFileInJar, true)
loadLibraryFromFile(libname, tempfile)