This is an automated email from the ASF dual-hosted git repository.
lausen pushed a commit to branch v1.7.x
in repository https://gitbox.apache.org/repos/asf/incubator-mxnet.git
The following commit(s) were added to refs/heads/v1.7.x by this push:
new a03b1fc [v1.7] Cherry-pick #17776 #17681 (#18464)
a03b1fc is described below
commit a03b1fc39e1aadb32a604d76b8bc0bb6850ea2a6
Author: Manu Seth <[email protected]>
AuthorDate: Tue Jun 9 15:13:05 2020 -0700
[v1.7] Cherry-pick #17776 #17681 (#18464)
* Fix CD (#17776)
* Fix cd/mxnet_lib/dynamic/Jenkins_pipeline.groovy
Fixes a regression in CD introduced by
https://github.com/apache/incubator-mxnet/pull/17645
* Fix whitespace
* Add NATIVE_ADDITIONAL.md
Fixes a regression in CD introduced by
https://github.com/apache/incubator-mxnet/pull/16899
* Update other $TYPE_ADDITIONAL.MD
* Fix cd/python/docker
Fixes regression introduced by
https://github.com/apache/incubator-mxnet/pull/15990
* [CD] update pypi description, setup.py (#17681)
* update pypi description, setup.py, use manylinux2010, use unified dist
link for nightly
* Use manylinux2014
Co-authored-by: Leonard Lausen <[email protected]>
* reverting .so path as per MAKE flow
Co-authored-by: Leonard Lausen <[email protected]>
Co-authored-by: Sheng Zha <[email protected]>
Co-authored-by: Leonard Lausen <[email protected]>
---
cd/mxnet_lib/mxnet_lib_pipeline.groovy | 2 +-
cd/python/docker/Dockerfile | 2 +-
cd/python/docker/Jenkins_pipeline.groovy | 9 ++--
cd/python/docker/python_images.sh | 37 ++++-------------
cd/python/docker/test_python_image.sh | 7 ++--
tools/pip/doc/CPU_ADDITIONAL.md | 20 +++++----
tools/pip/doc/CU100MKL_ADDITIONAL.md | 44 --------------------
tools/pip/doc/CU100_ADDITIONAL.md | 16 ++++----
tools/pip/doc/CU101MKL_ADDITIONAL.md | 44 --------------------
tools/pip/doc/CU101_ADDITIONAL.md | 16 ++++----
tools/pip/doc/CU102MKL_ADDITIONAL.md | 46 ---------------------
tools/pip/doc/CU102_ADDITIONAL.md | 17 ++++----
tools/pip/doc/CU75_ADDITIONAL.md | 10 +----
tools/pip/doc/CU80MKL_ADDITIONAL.md | 48 ----------------------
tools/pip/doc/CU80_ADDITIONAL.md | 12 +-----
tools/pip/doc/CU90MKL_ADDITIONAL.md | 46 ---------------------
tools/pip/doc/CU90_ADDITIONAL.md | 19 ++++-----
tools/pip/doc/CU92MKL_ADDITIONAL.md | 46 ---------------------
tools/pip/doc/CU92_ADDITIONAL.md | 17 ++++----
tools/pip/doc/MKL_ADDITIONAL.md | 42 -------------------
...{CU75MKL_ADDITIONAL.md => NATIVE_ADDITIONAL.md} | 27 +++++-------
tools/pip/doc/PYPI_README.md | 1 -
tools/pip/setup.py | 21 ++++++----
23 files changed, 92 insertions(+), 457 deletions(-)
diff --git a/cd/mxnet_lib/mxnet_lib_pipeline.groovy
b/cd/mxnet_lib/mxnet_lib_pipeline.groovy
index 24172e8..0310dd9 100644
--- a/cd/mxnet_lib/mxnet_lib_pipeline.groovy
+++ b/cd/mxnet_lib/mxnet_lib_pipeline.groovy
@@ -52,7 +52,7 @@ def get_pipeline(mxnet_variant, build_fn) {
}
}
}
-
+
parallel tests
}
diff --git a/cd/python/docker/Dockerfile b/cd/python/docker/Dockerfile
index dc70da1..ed97bdc 100644
--- a/cd/python/docker/Dockerfile
+++ b/cd/python/docker/Dockerfile
@@ -23,7 +23,7 @@
ARG BASE_IMAGE
FROM ${BASE_IMAGE}
-ARG PYTHON_CMD=python
+ARG PYTHON_CMD=python3
RUN apt-get update && \
apt-get install -y wget ${PYTHON_CMD}-dev gcc && \
wget https://bootstrap.pypa.io/get-pip.py && \
diff --git a/cd/python/docker/Jenkins_pipeline.groovy
b/cd/python/docker/Jenkins_pipeline.groovy
index 0d4925e..2911a65 100644
--- a/cd/python/docker/Jenkins_pipeline.groovy
+++ b/cd/python/docker/Jenkins_pipeline.groovy
@@ -50,24 +50,21 @@ def build(mxnet_variant) {
ci_utils.docker_run(environment, "cd_package_pypi ${mxnet_variant}",
nvidia_docker)
// build python docker images
- sh "./cd/python/docker/python_images.sh build ${mxnet_variant} py3"
- sh "./cd/python/docker/python_images.sh build ${mxnet_variant} py2"
+ sh "./cd/python/docker/python_images.sh build ${mxnet_variant}"
}
}
def test(mxnet_variant) {
ws("workspace/python_docker/${mxnet_variant}/${env.BUILD_NUMBER}") {
// test python docker images
- sh "./cd/python/docker/python_images.sh test ${mxnet_variant} py3"
- sh "./cd/python/docker/python_images.sh test ${mxnet_variant} py2"
+ sh "./cd/python/docker/python_images.sh test ${mxnet_variant}"
}
}
def push(mxnet_variant) {
ws("workspace/python_docker/${mxnet_variant}/${env.BUILD_NUMBER}") {
// push python docker images
- sh "./cd/python/docker/python_images.sh push ${mxnet_variant} py3"
- sh "./cd/python/docker/python_images.sh push ${mxnet_variant} py2"
+ sh "./cd/python/docker/python_images.sh push ${mxnet_variant}"
}
}
diff --git a/cd/python/docker/python_images.sh
b/cd/python/docker/python_images.sh
index 305676d..63d5326 100755
--- a/cd/python/docker/python_images.sh
+++ b/cd/python/docker/python_images.sh
@@ -23,30 +23,16 @@
set -xe
-usage="Usage: python_images.sh <build|test|publish> MXNET-VARIANT <py2|py3>"
+usage="Usage: python_images.sh <build|test|publish> MXNET-VARIANT"
command=${1:?$usage}
mxnet_variant=${2:?$usage}
-python_version=${3:?usage}
cd_utils='cd/utils'
ci_utils='ci/'
-case ${python_version} in
- py3)
- python_cmd="python3"
- ;;
- py2)
- python_cmd="python"
- ;;
- *)
- echo "Error: specify python version with either 'py2' or 'py3'"
- exit 1
- ;;
-esac
-
docker_tags=($(./${cd_utils}/docker_tag.sh ${mxnet_variant}))
-main_tag="${docker_tags[0]}_${python_version}"
+main_tag="${docker_tags[0]}_py3"
base_image=$(./${cd_utils}/mxnet_base_image.sh ${mxnet_variant})
repository="python"
image_name="${repository}:${main_tag}"
@@ -59,7 +45,7 @@ fi
build() {
# NOTE: Ensure the correct context root is passed in when building -
Dockerfile expects ./wheel_build
- docker build -t "${image_name}" --build-arg PYTHON_CMD=${python_cmd}
--build-arg BASE_IMAGE="${base_image}" --build-arg
MXNET_COMMIT_ID=${GIT_COMMIT} -f ${resources_path}/Dockerfile ./wheel_build
+ docker build -t "${image_name}" --build-arg --build-arg
BASE_IMAGE="${base_image}" --build-arg MXNET_COMMIT_ID=${GIT_COMMIT} -f
${resources_path}/Dockerfile ./wheel_build
}
test() {
@@ -68,10 +54,10 @@ test() {
runtime_param="--runtime=nvidia"
fi
local test_image_name="${image_name}_test"
-
+
# Ensure the correct context root is passed in when building -
Dockerfile.test expects ci directory
docker build -t "${test_image_name}" --build-arg USER_ID=`id -u`
--build-arg GROUP_ID=`id -g` --build-arg BASE_IMAGE="${image_name}" -f
${resources_path}/Dockerfile.test ./ci
- ./ci/safe_docker_run.py ${runtime_param} --cap-add "SYS_PTRACE" -u `id
-u`:`id -g` -v `pwd`:/work/mxnet "${test_image_name}"
${resources_path}/test_python_image.sh "${mxnet_variant}" "${python_cmd}"
+ ./ci/safe_docker_run.py ${runtime_param} --cap-add "SYS_PTRACE" -u `id
-u`:`id -g` -v `pwd`:/work/mxnet "${test_image_name}"
${resources_path}/test_python_image.sh "${mxnet_variant}"
}
push() {
@@ -90,23 +76,14 @@ push() {
# Iterate over remaining tags, if any
for ((i=1;i<${#docker_tags[@]};i++)); do
local docker_tag="${docker_tags[${i}]}"
- local
latest_image_name="${RELEASE_DOCKERHUB_REPOSITORY}/${repository}:${docker_tag}"
-
- # latest and latest gpu should only be pushed for py3
- if [[ ${docker_tag} == "latest" || ${docker_tag} == "latest_gpu" ]];
then
- if [[ ${python_version} == "py2" ]]; then
- continue
- fi
- else
- latest_image_name="${latest_image_name}_${python_version}"
- fi
+ local
latest_image_name="${RELEASE_DOCKERHUB_REPOSITORY}/${repository}:${docker_tag}_py3"
docker tag "${image_name}" "${latest_image_name}"
docker push "${latest_image_name}"
echo "Successfully pushed ${latest_image_name}. Pull it with:"
echo "docker pull ${latest_image_name}"
echo "For a complete list of tags see
https://hub.docker.com/u/${RELEASE_DOCKERHUB_REPOSITORY}/${repository}";
- done
+ done
}
case ${command} in
diff --git a/cd/python/docker/test_python_image.sh
b/cd/python/docker/test_python_image.sh
index f6095c9..0927893 100755
--- a/cd/python/docker/test_python_image.sh
+++ b/cd/python/docker/test_python_image.sh
@@ -25,7 +25,6 @@ set -ex
# Variant parameter should be passed in
mxnet_variant=${1:?"Missing mxnet variant"}
-python_cmd=${2:?"Missing python version (python or python3)"}
if [ -z "${MXNET_COMMIT_ID}" ]; then
echo "MXNET_COMMIT_ID environment variable is empty. Please rebuild the
image with MXNET_COMMIT_ID build-arg specified."
@@ -39,9 +38,9 @@ if [[ $mxnet_variant == cu* ]]; then
fi
if [[ $mxnet_variant == cpu ]]; then
- ${python_cmd} tests/python/mkl/test_mkldnn.py
+ python3 tests/python/mkl/test_mkldnn.py
fi
-${python_cmd} tests/python/train/test_conv.py ${test_conv_params}
-${python_cmd} example/image-classification/train_mnist.py ${mnist_params}
+python3 tests/python/train/test_conv.py ${test_conv_params}
+python3 example/image-classification/train_mnist.py ${mnist_params}
diff --git a/tools/pip/doc/CPU_ADDITIONAL.md b/tools/pip/doc/CPU_ADDITIONAL.md
index bbd747d..07a95d5 100644
--- a/tools/pip/doc/CPU_ADDITIONAL.md
+++ b/tools/pip/doc/CPU_ADDITIONAL.md
@@ -18,19 +18,14 @@
Prerequisites
-------------
This package supports Linux, Mac OSX, and Windows platforms. You may also want
to check:
-- [mxnet-cu101](https://pypi.python.org/pypi/mxnet-cu101mkl/) with CUDA-10.1
support.
-- [mxnet-cu101mkl](https://pypi.python.org/pypi/mxnet-cu101mkl/) with
CUDA-10.1 support and MKLDNN support.
-- [mxnet-cu100](https://pypi.python.org/pypi/mxnet-cu100mkl/) with CUDA-10.0
support.
-- [mxnet-cu100mkl](https://pypi.python.org/pypi/mxnet-cu100mkl/) with
CUDA-10.0 support and MKLDNN support.
+- [mxnet-cu102](https://pypi.python.org/pypi/mxnet-cu101/) with CUDA-10.2
support.
+- [mxnet-cu101](https://pypi.python.org/pypi/mxnet-cu101/) with CUDA-10.1
support.
+- [mxnet-cu100](https://pypi.python.org/pypi/mxnet-cu100/) with CUDA-10.0
support.
- [mxnet-cu92](https://pypi.python.org/pypi/mxnet-cu92/) with CUDA-9.2 support.
-- [mxnet-cu92mkl](https://pypi.python.org/pypi/mxnet-cu92mkl/) with CUDA-9.2
support and MKLDNN support.
- [mxnet-cu90](https://pypi.python.org/pypi/mxnet-cu90/) with CUDA-9.0 support.
-- [mxnet-cu90mkl](https://pypi.python.org/pypi/mxnet-cu90mkl/) with CUDA-9.0
support and MKLDNN support.
- [mxnet-cu80](https://pypi.python.org/pypi/mxnet-cu80/) with CUDA-8.0 support.
-- [mxnet-cu80mkl](https://pypi.python.org/pypi/mxnet-cu80mkl/) with CUDA-8.0
support and MKLDNN support.
- [mxnet-cu75](https://pypi.python.org/pypi/mxnet-cu75/) with CUDA-7.5 support.
-- [mxnet-cu75mkl](https://pypi.python.org/pypi/mxnet-cu75mkl/) with CUDA-7.5
support and MKLDNN support.
-- [mxnet-mkl](https://pypi.python.org/pypi/mxnet-mkl/) with MKLDNN support.
+- [mxnet-native](https://pypi.python.org/pypi/mxnet-native/) CPU variant
without MKLDNN.
To install for other platforms (e.g. Windows, Raspberry Pi/ARM) or other
versions, check [Installing
MXNet](https://mxnet.apache.org/versions/master/install/index.html) for
instructions on building from source.
@@ -40,3 +35,10 @@ To install, use:
```bash
pip install mxnet
```
+
+Nightly Builds
+--------------
+To install the latest nightly build, use:
+```bash
+pip install --pre mxnet -f https://dist.mxnet.io/python
+```
diff --git a/tools/pip/doc/CU100MKL_ADDITIONAL.md
b/tools/pip/doc/CU100MKL_ADDITIONAL.md
deleted file mode 100644
index 80690ea..0000000
--- a/tools/pip/doc/CU100MKL_ADDITIONAL.md
+++ /dev/null
@@ -1,44 +0,0 @@
-<!--- Licensed to the Apache Software Foundation (ASF) under one -->
-<!--- or more contributor license agreements. See the NOTICE file -->
-<!--- distributed with this work for additional information -->
-<!--- regarding copyright ownership. The ASF licenses this file -->
-<!--- to you under the Apache License, Version 2.0 (the -->
-<!--- "License"); you may not use this file except in compliance -->
-<!--- with the License. You may obtain a copy of the License at -->
-
-<!--- http://www.apache.org/licenses/LICENSE-2.0 -->
-
-<!--- Unless required by applicable law or agreed to in writing, -->
-<!--- software distributed under the License is distributed on an -->
-<!--- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -->
-<!--- KIND, either express or implied. See the License for the -->
-<!--- specific language governing permissions and limitations -->
-<!--- under the License. -->
-
-Prerequisites
--------------
-This package supports Linux and Windows platforms. You may also want to check:
-- [mxnet-cu101](https://pypi.python.org/pypi/mxnet-cu101mkl/) with CUDA-10.1
support.
-- [mxnet-cu101mkl](https://pypi.python.org/pypi/mxnet-cu101mkl/) with
CUDA-10.1 support and MKLDNN support.
-- [mxnet-cu100](https://pypi.python.org/pypi/mxnet-cu100/) with CUDA-10.0
support.
-- [mxnet-cu92](https://pypi.python.org/pypi/mxnet-cu92/) with CUDA-9.2 support.
-- [mxnet-cu92mkl](https://pypi.python.org/pypi/mxnet-cu92mkl/) with CUDA-9.2
support and MKLDNN support.
-- [mxnet-cu90](https://pypi.python.org/pypi/mxnet-cu90/) with CUDA-9.0 support.
-- [mxnet-cu90mkl](https://pypi.python.org/pypi/mxnet-cu90mkl/) with CUDA-9.0
support and MKLDNN support.
-- [mxnet-cu80](https://pypi.python.org/pypi/mxnet-cu80/) with CUDA-8.0 support.
-- [mxnet-cu80mkl](https://pypi.python.org/pypi/mxnet-cu80mkl/) with CUDA-8.0
support and MKLDNN support.
-- [mxnet-cu75](https://pypi.python.org/pypi/mxnet-cu75/) with CUDA-7.5 support.
-- [mxnet-cu75mkl](https://pypi.python.org/pypi/mxnet-cu75mkl/) with CUDA-7.5
support and MKLDNN support.
-- [mxnet-mkl](https://pypi.python.org/pypi/mxnet-mkl/) with MKLDNN support.
-- [mxnet](https://pypi.python.org/pypi/mxnet/).
-
-To download CUDA, check [CUDA
download](https://developer.nvidia.com/cuda-downloads). For more instructions,
check [CUDA Toolkit online
documentation](http://docs.nvidia.com/cuda/index.html).
-
-To install for other platforms (e.g. Windows, Raspberry Pi/ARM) or other
versions of CUDA, check [Installing
MXNet](https://mxnet.apache.org/versions/master/install/index.html) for
instructions on building from source.
-
-Installation
-------------
-To install:
-```bash
-pip install mxnet-cu100mkl
-```
diff --git a/tools/pip/doc/CU100_ADDITIONAL.md
b/tools/pip/doc/CU100_ADDITIONAL.md
index de5e620..2e607d7 100644
--- a/tools/pip/doc/CU100_ADDITIONAL.md
+++ b/tools/pip/doc/CU100_ADDITIONAL.md
@@ -18,18 +18,11 @@
Prerequisites
-------------
This package supports Linux and Windows platforms. You may also want to check:
-- [mxnet-cu101](https://pypi.python.org/pypi/mxnet-cu101mkl/) with CUDA-10.1
support.
-- [mxnet-cu101mkl](https://pypi.python.org/pypi/mxnet-cu101mkl/) with
CUDA-10.1 support and MKLDNN support.
-- [mxnet-cu100mkl](https://pypi.python.org/pypi/mxnet-cu100mkl/) with
CUDA-10.0 support and MKLDNN support.
+- [mxnet-cu102](https://pypi.python.org/pypi/mxnet-cu101/) with CUDA-10.2
support.
- [mxnet-cu92](https://pypi.python.org/pypi/mxnet-cu92/) with CUDA-9.2 support.
-- [mxnet-cu92mkl](https://pypi.python.org/pypi/mxnet-cu92mkl/) with CUDA-9.2
support and MKLDNN support.
- [mxnet-cu90](https://pypi.python.org/pypi/mxnet-cu90/) with CUDA-9.0 support.
-- [mxnet-cu90mkl](https://pypi.python.org/pypi/mxnet-cu90mkl/) with CUDA-9.0
support and MKLDNN support.
- [mxnet-cu80](https://pypi.python.org/pypi/mxnet-cu80/) with CUDA-8.0 support.
-- [mxnet-cu80mkl](https://pypi.python.org/pypi/mxnet-cu80mkl/) with CUDA-8.0
support and MKLDNN support.
- [mxnet-cu75](https://pypi.python.org/pypi/mxnet-cu75/) with CUDA-7.5 support.
-- [mxnet-cu75mkl](https://pypi.python.org/pypi/mxnet-cu75mkl/) with CUDA-7.5
support and MKLDNN support.
-- [mxnet-mkl](https://pypi.python.org/pypi/mxnet-mkl/) with MKLDNN support.
- [mxnet](https://pypi.python.org/pypi/mxnet/).
To download CUDA, check [CUDA
download](https://developer.nvidia.com/cuda-downloads). For more instructions,
check [CUDA Toolkit online
documentation](http://docs.nvidia.com/cuda/index.html).
@@ -42,3 +35,10 @@ To install:
```bash
pip install mxnet-cu100
```
+
+Nightly Builds
+--------------
+To install the latest nightly build, use:
+```bash
+pip install --pre mxnet-cu100 -f https://dist.mxnet.io/python
+```
diff --git a/tools/pip/doc/CU101MKL_ADDITIONAL.md
b/tools/pip/doc/CU101MKL_ADDITIONAL.md
deleted file mode 100644
index 028cc25..0000000
--- a/tools/pip/doc/CU101MKL_ADDITIONAL.md
+++ /dev/null
@@ -1,44 +0,0 @@
-<!--- Licensed to the Apache Software Foundation (ASF) under one -->
-<!--- or more contributor license agreements. See the NOTICE file -->
-<!--- distributed with this work for additional information -->
-<!--- regarding copyright ownership. The ASF licenses this file -->
-<!--- to you under the Apache License, Version 2.0 (the -->
-<!--- "License"); you may not use this file except in compliance -->
-<!--- with the License. You may obtain a copy of the License at -->
-
-<!--- http://www.apache.org/licenses/LICENSE-2.0 -->
-
-<!--- Unless required by applicable law or agreed to in writing, -->
-<!--- software distributed under the License is distributed on an -->
-<!--- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -->
-<!--- KIND, either express or implied. See the License for the -->
-<!--- specific language governing permissions and limitations -->
-<!--- under the License. -->
-
-Prerequisites
--------------
-This package supports Linux and Windows platforms. You may also want to check:
-- [mxnet-cu101](https://pypi.python.org/pypi/mxnet-cu101/) with CUDA-10.1
support.
-- [mxnet-cu100](https://pypi.python.org/pypi/mxnet-cu100/) with CUDA-10.0
support.
-- [mxnet-cu100mkl](https://pypi.python.org/pypi/mxnet-cu100mkl/) with
CUDA-10.0 support and MKLDNN support.
-- [mxnet-cu92](https://pypi.python.org/pypi/mxnet-cu92/) with CUDA-9.2 support.
-- [mxnet-cu92mkl](https://pypi.python.org/pypi/mxnet-cu92mkl/) with CUDA-9.2
support and MKLDNN support.
-- [mxnet-cu90](https://pypi.python.org/pypi/mxnet-cu90/) with CUDA-9.0 support.
-- [mxnet-cu90mkl](https://pypi.python.org/pypi/mxnet-cu90mkl/) with CUDA-9.0
support and MKLDNN support.
-- [mxnet-cu80](https://pypi.python.org/pypi/mxnet-cu80/) with CUDA-8.0 support.
-- [mxnet-cu80mkl](https://pypi.python.org/pypi/mxnet-cu80mkl/) with CUDA-8.0
support and MKLDNN support.
-- [mxnet-cu75](https://pypi.python.org/pypi/mxnet-cu75/) with CUDA-7.5 support.
-- [mxnet-cu75mkl](https://pypi.python.org/pypi/mxnet-cu75mkl/) with CUDA-7.5
support and MKLDNN support.
-- [mxnet-mkl](https://pypi.python.org/pypi/mxnet-mkl/) with MKLDNN support.
-- [mxnet](https://pypi.python.org/pypi/mxnet/).
-
-To download CUDA, check [CUDA
download](https://developer.nvidia.com/cuda-downloads). For more instructions,
check [CUDA Toolkit online
documentation](http://docs.nvidia.com/cuda/index.html).
-
-To install for other platforms (e.g. Windows, Raspberry Pi/ARM) or other
versions of CUDA, check [Installing
MXNet](https://mxnet.incubator.apache.org/versions/master/install/index.html)
for instructions on building from source.
-
-Installation
-------------
-To install:
-```bash
-pip install mxnet-cu101mkl
-```
diff --git a/tools/pip/doc/CU101_ADDITIONAL.md
b/tools/pip/doc/CU101_ADDITIONAL.md
index 7d9ae5b..278c399 100644
--- a/tools/pip/doc/CU101_ADDITIONAL.md
+++ b/tools/pip/doc/CU101_ADDITIONAL.md
@@ -18,18 +18,11 @@
Prerequisites
-------------
This package supports Linux and Windows platforms. You may also want to check:
-- [mxnet-cu101mkl](https://pypi.python.org/pypi/mxnet-cu101mkl/) with
CUDA-10.1 support and MKLDNN support.
-- [mxnet-cu100](https://pypi.python.org/pypi/mxnet-cu100mkl/) with CUDA-10.0
support.
-- [mxnet-cu100mkl](https://pypi.python.org/pypi/mxnet-cu100mkl/) with
CUDA-10.0 support and MKLDNN support.
+- [mxnet-cu102](https://pypi.python.org/pypi/mxnet-cu101/) with CUDA-10.2
support.
- [mxnet-cu92](https://pypi.python.org/pypi/mxnet-cu92/) with CUDA-9.2 support.
-- [mxnet-cu92mkl](https://pypi.python.org/pypi/mxnet-cu92mkl/) with CUDA-9.2
support and MKLDNN support.
- [mxnet-cu90](https://pypi.python.org/pypi/mxnet-cu90/) with CUDA-9.0 support.
-- [mxnet-cu90mkl](https://pypi.python.org/pypi/mxnet-cu90mkl/) with CUDA-9.0
support and MKLDNN support.
- [mxnet-cu80](https://pypi.python.org/pypi/mxnet-cu80/) with CUDA-8.0 support.
-- [mxnet-cu80mkl](https://pypi.python.org/pypi/mxnet-cu80mkl/) with CUDA-8.0
support and MKLDNN support.
- [mxnet-cu75](https://pypi.python.org/pypi/mxnet-cu75/) with CUDA-7.5 support.
-- [mxnet-cu75mkl](https://pypi.python.org/pypi/mxnet-cu75mkl/) with CUDA-7.5
support and MKLDNN support.
-- [mxnet-mkl](https://pypi.python.org/pypi/mxnet-mkl/) with MKLDNN support.
- [mxnet](https://pypi.python.org/pypi/mxnet/).
To download CUDA, check [CUDA
download](https://developer.nvidia.com/cuda-downloads). For more instructions,
check [CUDA Toolkit online
documentation](http://docs.nvidia.com/cuda/index.html).
@@ -42,3 +35,10 @@ To install:
```bash
pip install mxnet-cu101
```
+
+Nightly Builds
+--------------
+To install the latest nightly build, use:
+```bash
+pip install --pre mxnet-cu101 -f https://dist.mxnet.io/python
+```
diff --git a/tools/pip/doc/CU102MKL_ADDITIONAL.md
b/tools/pip/doc/CU102MKL_ADDITIONAL.md
deleted file mode 100644
index 07be16b..0000000
--- a/tools/pip/doc/CU102MKL_ADDITIONAL.md
+++ /dev/null
@@ -1,46 +0,0 @@
-<!--- Licensed to the Apache Software Foundation (ASF) under one -->
-<!--- or more contributor license agreements. See the NOTICE file -->
-<!--- distributed with this work for additional information -->
-<!--- regarding copyright ownership. The ASF licenses this file -->
-<!--- to you under the Apache License, Version 2.0 (the -->
-<!--- "License"); you may not use this file except in compliance -->
-<!--- with the License. You may obtain a copy of the License at -->
-
-<!--- http://www.apache.org/licenses/LICENSE-2.0 -->
-
-<!--- Unless required by applicable law or agreed to in writing, -->
-<!--- software distributed under the License is distributed on an -->
-<!--- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -->
-<!--- KIND, either express or implied. See the License for the -->
-<!--- specific language governing permissions and limitations -->
-<!--- under the License. -->
-
-Prerequisites
--------------
-This package supports Linux and Windows platforms. You may also want to check:
-- [mxnet-cu102](https://pypi.python.org/pypi/mxnet-cu102/) with CUDA-10.2
support.
-- [mxnet-cu101](https://pypi.python.org/pypi/mxnet-cu101/) with CUDA-10.1
support.
-- [mxnet-cu101mkl](https://pypi.python.org/pypi/mxnet-cu101mkl/) with
CUDA-10.1 and MKLDNN support.
-- [mxnet-cu100](https://pypi.python.org/pypi/mxnet-cu100/) with CUDA-10.0
support.
-- [mxnet-cu100mkl](https://pypi.python.org/pypi/mxnet-cu100mkl/) with
CUDA-10.0 support and MKLDNN support.
-- [mxnet-cu92](https://pypi.python.org/pypi/mxnet-cu92/) with CUDA-9.2 support.
-- [mxnet-cu92mkl](https://pypi.python.org/pypi/mxnet-cu92mkl/) with CUDA-9.2
support and MKLDNN support.
-- [mxnet-cu90](https://pypi.python.org/pypi/mxnet-cu90/) with CUDA-9.0 support.
-- [mxnet-cu90mkl](https://pypi.python.org/pypi/mxnet-cu90mkl/) with CUDA-9.0
support and MKLDNN support.
-- [mxnet-cu80](https://pypi.python.org/pypi/mxnet-cu80/) with CUDA-8.0 support.
-- [mxnet-cu80mkl](https://pypi.python.org/pypi/mxnet-cu80mkl/) with CUDA-8.0
support and MKLDNN support.
-- [mxnet-cu75](https://pypi.python.org/pypi/mxnet-cu75/) with CUDA-7.5 support.
-- [mxnet-cu75mkl](https://pypi.python.org/pypi/mxnet-cu75mkl/) with CUDA-7.5
support and MKLDNN support.
-- [mxnet-mkl](https://pypi.python.org/pypi/mxnet-mkl/) with MKLDNN support.
-- [mxnet](https://pypi.python.org/pypi/mxnet/).
-
-To download CUDA, check [CUDA
download](https://developer.nvidia.com/cuda-downloads). For more instructions,
check [CUDA Toolkit online
documentation](http://docs.nvidia.com/cuda/index.html).
-
-To install for other platforms (e.g. Windows, Raspberry Pi/ARM) or other
versions of CUDA, check [Installing
MXNet](https://mxnet.incubator.apache.org/versions/master/install/index.html)
for instructions on building from source.
-
-Installation
-------------
-To install:
-```bash
-pip install mxnet-cu102mkl
-```
diff --git a/tools/pip/doc/CU102_ADDITIONAL.md
b/tools/pip/doc/CU102_ADDITIONAL.md
index c9efd4b..8182969 100644
--- a/tools/pip/doc/CU102_ADDITIONAL.md
+++ b/tools/pip/doc/CU102_ADDITIONAL.md
@@ -18,20 +18,10 @@
Prerequisites
-------------
This package supports Linux and Windows platforms. You may also want to check:
-- [mxnet-cu102mkl](https://pypi.python.org/pypi/mxnet-cu102/) with CUDA-10.2
support and MKLDNN support.
-- [mxnet-cu101](https://pypi.python.org/pypi/mxnet-cu101/) with CUDA-10.1
support.
-- [mxnet-cu101mkl](https://pypi.python.org/pypi/mxnet-cu101mkl/) with
CUDA-10.1 support and MKLDNN support.
-- [mxnet-cu100](https://pypi.python.org/pypi/mxnet-cu100mkl/) with CUDA-10.0
support.
-- [mxnet-cu100mkl](https://pypi.python.org/pypi/mxnet-cu100mkl/) with
CUDA-10.0 support and MKLDNN support.
- [mxnet-cu92](https://pypi.python.org/pypi/mxnet-cu92/) with CUDA-9.2 support.
-- [mxnet-cu92mkl](https://pypi.python.org/pypi/mxnet-cu92mkl/) with CUDA-9.2
support and MKLDNN support.
- [mxnet-cu90](https://pypi.python.org/pypi/mxnet-cu90/) with CUDA-9.0 support.
-- [mxnet-cu90mkl](https://pypi.python.org/pypi/mxnet-cu90mkl/) with CUDA-9.0
support and MKLDNN support.
- [mxnet-cu80](https://pypi.python.org/pypi/mxnet-cu80/) with CUDA-8.0 support.
-- [mxnet-cu80mkl](https://pypi.python.org/pypi/mxnet-cu80mkl/) with CUDA-8.0
support and MKLDNN support.
- [mxnet-cu75](https://pypi.python.org/pypi/mxnet-cu75/) with CUDA-7.5 support.
-- [mxnet-cu75mkl](https://pypi.python.org/pypi/mxnet-cu75mkl/) with CUDA-7.5
support and MKLDNN support.
-- [mxnet-mkl](https://pypi.python.org/pypi/mxnet-mkl/) with MKLDNN support.
- [mxnet](https://pypi.python.org/pypi/mxnet/).
To download CUDA, check [CUDA
download](https://developer.nvidia.com/cuda-downloads). For more instructions,
check [CUDA Toolkit online
documentation](http://docs.nvidia.com/cuda/index.html).
@@ -44,3 +34,10 @@ To install:
```bash
pip install mxnet-cu102
```
+
+Nightly Builds
+--------------
+To install the latest nightly build, use:
+```bash
+pip install --pre mxnet-cu102 -f https://dist.mxnet.io/python
+```
diff --git a/tools/pip/doc/CU75_ADDITIONAL.md b/tools/pip/doc/CU75_ADDITIONAL.md
index 53665ce..ae382f9 100644
--- a/tools/pip/doc/CU75_ADDITIONAL.md
+++ b/tools/pip/doc/CU75_ADDITIONAL.md
@@ -20,18 +20,10 @@
Prerequisites
-------------
This package supports Linux only, up to 1.2.1. You may also want to check:
-- [mxnet-cu101](https://pypi.python.org/pypi/mxnet-cu101mkl/) with CUDA-10.1
support.
-- [mxnet-cu101mkl](https://pypi.python.org/pypi/mxnet-cu101mkl/) with
CUDA-10.1 support and MKLDNN support.
-- [mxnet-cu100](https://pypi.python.org/pypi/mxnet-cu100mkl/) with CUDA-10.0
support.
-- [mxnet-cu100mkl](https://pypi.python.org/pypi/mxnet-cu100mkl/) with
CUDA-10.0 support and MKLDNN support.
+- [mxnet-cu102](https://pypi.python.org/pypi/mxnet-cu101/) with CUDA-10.2
support.
- [mxnet-cu92](https://pypi.python.org/pypi/mxnet-cu92/) with CUDA-9.2 support.
-- [mxnet-cu92mkl](https://pypi.python.org/pypi/mxnet-cu92mkl/) with CUDA-9.2
support and MKLDNN support.
- [mxnet-cu90](https://pypi.python.org/pypi/mxnet-cu90/) with CUDA-9.0 support.
-- [mxnet-cu90mkl](https://pypi.python.org/pypi/mxnet-cu90mkl/) with CUDA-9.0
support and MKLDNN support.
- [mxnet-cu80](https://pypi.python.org/pypi/mxnet-cu80/) with CUDA-8.0 support.
-- [mxnet-cu80mkl](https://pypi.python.org/pypi/mxnet-cu80mkl/) with CUDA-8.0
support and MKLDNN support.
-- [mxnet-cu75mkl](https://pypi.python.org/pypi/mxnet-cu75mkl/) with CUDA-7.5
support and MKLDNN support.
-- [mxnet-mkl](https://pypi.python.org/pypi/mxnet-mkl/) with MKLDNN support.
- [mxnet](https://pypi.python.org/pypi/mxnet/).
To download CUDA, check [CUDA
download](https://developer.nvidia.com/cuda-downloads). For more instructions,
check [CUDA Toolkit online
documentation](http://docs.nvidia.com/cuda/index.html).
diff --git a/tools/pip/doc/CU80MKL_ADDITIONAL.md
b/tools/pip/doc/CU80MKL_ADDITIONAL.md
deleted file mode 100644
index e4f73f9..0000000
--- a/tools/pip/doc/CU80MKL_ADDITIONAL.md
+++ /dev/null
@@ -1,48 +0,0 @@
-<!--- Licensed to the Apache Software Foundation (ASF) under one -->
-<!--- or more contributor license agreements. See the NOTICE file -->
-<!--- distributed with this work for additional information -->
-<!--- regarding copyright ownership. The ASF licenses this file -->
-<!--- to you under the Apache License, Version 2.0 (the -->
-<!--- "License"); you may not use this file except in compliance -->
-<!--- with the License. You may obtain a copy of the License at -->
-
-<!--- http://www.apache.org/licenses/LICENSE-2.0 -->
-
-<!--- Unless required by applicable law or agreed to in writing, -->
-<!--- software distributed under the License is distributed on an -->
-<!--- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -->
-<!--- KIND, either express or implied. See the License for the -->
-<!--- specific language governing permissions and limitations -->
-<!--- under the License. -->
-
-**CUDA 8.0 package for MXNet is no longer maintained for new releases.**
-
-Prerequisites
--------------
-This package supports Linux and Windows platforms. You may also want to check:
-- [mxnet-cu102](https://pypi.python.org/pypi/mxnet-cu102/) with CUDA-10.2
support.
-- [mxnet-cu102mkl](https://pypi.python.org/pypi/mxnet-cu102mkl/) with
CUDA-10.2 support and MKLDNN support.
-- [mxnet-cu101](https://pypi.python.org/pypi/mxnet-cu101mkl/) with CUDA-10.1
support.
-- [mxnet-cu101mkl](https://pypi.python.org/pypi/mxnet-cu101mkl/) with
CUDA-10.1 support and MKLDNN support.
-- [mxnet-cu100](https://pypi.python.org/pypi/mxnet-cu100mkl/) with CUDA-10.0
support.
-- [mxnet-cu100mkl](https://pypi.python.org/pypi/mxnet-cu100mkl/) with
CUDA-10.0 support and MKLDNN support.
-- [mxnet-cu92](https://pypi.python.org/pypi/mxnet-cu92/) with CUDA-9.2 support.
-- [mxnet-cu92mkl](https://pypi.python.org/pypi/mxnet-cu92mkl/) with CUDA-9.2
support and MKLDNN support.
-- [mxnet-cu90](https://pypi.python.org/pypi/mxnet-cu90/) with CUDA-9.0 support.
-- [mxnet-cu90mkl](https://pypi.python.org/pypi/mxnet-cu90mkl/) with CUDA-9.0
support and MKLDNN support.
-- [mxnet-cu80](https://pypi.python.org/pypi/mxnet-cu80/) with CUDA-8.0 support.
-- [mxnet-cu75](https://pypi.python.org/pypi/mxnet-cu75/) with CUDA-7.5 support.
-- [mxnet-cu75mkl](https://pypi.python.org/pypi/mxnet-cu75mkl/) with CUDA-7.5
support and MKLDNN support.
-- [mxnet-mkl](https://pypi.python.org/pypi/mxnet-mkl/) with MKLDNN support.
-- [mxnet](https://pypi.python.org/pypi/mxnet/).
-
-To download CUDA, check [CUDA
download](https://developer.nvidia.com/cuda-downloads). For more instructions,
check [CUDA Toolkit online
documentation](http://docs.nvidia.com/cuda/index.html).
-
-To install for other platforms (e.g. Windows, Raspberry Pi/ARM) or other
versions of CUDA, check [Installing
MXNet](https://mxnet.apache.org/versions/master/install/index.html) for
instructions on building from source.
-
-Installation
-------------
-To install:
-```bash
-pip install mxnet-cu80mkl
-```
diff --git a/tools/pip/doc/CU80_ADDITIONAL.md b/tools/pip/doc/CU80_ADDITIONAL.md
index 23e5c2e..5ce06d7 100644
--- a/tools/pip/doc/CU80_ADDITIONAL.md
+++ b/tools/pip/doc/CU80_ADDITIONAL.md
@@ -20,20 +20,10 @@
Prerequisites
-------------
This package supports Linux and Windows platforms. You may also want to check:
-- [mxnet-cu102](https://pypi.python.org/pypi/mxnet-cu102/) with CUDA-10.2
support.
-- [mxnet-cu102mkl](https://pypi.python.org/pypi/mxnet-cu102mkl/) with
CUDA-10.2 support and MKLDNN support.
-- [mxnet-cu101](https://pypi.python.org/pypi/mxnet-cu101mkl/) with CUDA-10.1
support.
-- [mxnet-cu101mkl](https://pypi.python.org/pypi/mxnet-cu101mkl/) with
CUDA-10.1 support and MKLDNN support.
-- [mxnet-cu100](https://pypi.python.org/pypi/mxnet-cu100mkl/) with CUDA-10.0
support.
-- [mxnet-cu100mkl](https://pypi.python.org/pypi/mxnet-cu100mkl/) with
CUDA-10.0 support and MKLDNN support.
+- [mxnet-cu102](https://pypi.python.org/pypi/mxnet-cu101/) with CUDA-10.2
support.
- [mxnet-cu92](https://pypi.python.org/pypi/mxnet-cu92/) with CUDA-9.2 support.
-- [mxnet-cu92mkl](https://pypi.python.org/pypi/mxnet-cu92mkl/) with CUDA-9.2
support and MKLDNN support.
- [mxnet-cu90](https://pypi.python.org/pypi/mxnet-cu90/) with CUDA-9.0 support.
-- [mxnet-cu90mkl](https://pypi.python.org/pypi/mxnet-cu90mkl/) with CUDA-9.0
support and MKLDNN support.
-- [mxnet-cu80mkl](https://pypi.python.org/pypi/mxnet-cu80mkl/) with CUDA-8.0
support and MKLDNN support.
- [mxnet-cu75](https://pypi.python.org/pypi/mxnet-cu75/) with CUDA-7.5 support.
-- [mxnet-cu75mkl](https://pypi.python.org/pypi/mxnet-cu75mkl/) with CUDA-7.5
support and MKLDNN support.
-- [mxnet-mkl](https://pypi.python.org/pypi/mxnet-mkl/) with MKLDNN support.
- [mxnet](https://pypi.python.org/pypi/mxnet/).
To download CUDA, check [CUDA
download](https://developer.nvidia.com/cuda-downloads). For more instructions,
check [CUDA Toolkit online
documentation](http://docs.nvidia.com/cuda/index.html).
diff --git a/tools/pip/doc/CU90MKL_ADDITIONAL.md
b/tools/pip/doc/CU90MKL_ADDITIONAL.md
deleted file mode 100644
index 27cd5c3..0000000
--- a/tools/pip/doc/CU90MKL_ADDITIONAL.md
+++ /dev/null
@@ -1,46 +0,0 @@
-<!--- Licensed to the Apache Software Foundation (ASF) under one -->
-<!--- or more contributor license agreements. See the NOTICE file -->
-<!--- distributed with this work for additional information -->
-<!--- regarding copyright ownership. The ASF licenses this file -->
-<!--- to you under the Apache License, Version 2.0 (the -->
-<!--- "License"); you may not use this file except in compliance -->
-<!--- with the License. You may obtain a copy of the License at -->
-
-<!--- http://www.apache.org/licenses/LICENSE-2.0 -->
-
-<!--- Unless required by applicable law or agreed to in writing, -->
-<!--- software distributed under the License is distributed on an -->
-<!--- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -->
-<!--- KIND, either express or implied. See the License for the -->
-<!--- specific language governing permissions and limitations -->
-<!--- under the License. -->
-
-Prerequisites
--------------
-This package supports Linux and Windows platforms. You may want to check:
-- [mxnet-cu102](https://pypi.python.org/pypi/mxnet-cu102/) with CUDA-10.2
support.
-- [mxnet-cu102mkl](https://pypi.python.org/pypi/mxnet-cu102mkl/) with
CUDA-10.2 support and MKLDNN support.
-- [mxnet-cu101](https://pypi.python.org/pypi/mxnet-cu101mkl/) with CUDA-10.1
support.
-- [mxnet-cu101mkl](https://pypi.python.org/pypi/mxnet-cu101mkl/) with
CUDA-10.1 support and MKLDNN support.
-- [mxnet-cu100](https://pypi.python.org/pypi/mxnet-cu100mkl/) with CUDA-10.0
support.
-- [mxnet-cu100mkl](https://pypi.python.org/pypi/mxnet-cu100mkl/) with
CUDA-10.0 support and MKLDNN support.
-- [mxnet-cu92](https://pypi.python.org/pypi/mxnet-cu92/) with CUDA-9.2 support.
-- [mxnet-cu92mkl](https://pypi.python.org/pypi/mxnet-cu92mkl/) with CUDA-9.2
support and MKLDNN support.
-- [mxnet-cu90](https://pypi.python.org/pypi/mxnet-cu90/) with CUDA-9.0 support.
-- [mxnet-cu80](https://pypi.python.org/pypi/mxnet-cu80/) with CUDA-8.0 support.
-- [mxnet-cu80mkl](https://pypi.python.org/pypi/mxnet-cu80mkl/) with CUDA-8.0
support and MKLDNN support.
-- [mxnet-cu75](https://pypi.python.org/pypi/mxnet-cu75/) with CUDA-7.5 support.
-- [mxnet-cu75mkl](https://pypi.python.org/pypi/mxnet-cu75mkl/) with CUDA-7.5
support and MKLDNN support.
-- [mxnet-mkl](https://pypi.python.org/pypi/mxnet-mkl/) with MKLDNN support.
-- [mxnet](https://pypi.python.org/pypi/mxnet/).
-
-To download CUDA, check [CUDA
download](https://developer.nvidia.com/cuda-downloads). For more instructions,
check [CUDA Toolkit online
documentation](http://docs.nvidia.com/cuda/index.html).
-
-To install for other platforms (e.g. Windows, Raspberry Pi/ARM) or other
versions of CUDA, check [Installing
MXNet](https://mxnet.apache.org/versions/master/install/index.html) for
instructions on building from source.
-
-Installation
-------------
-To install:
-```bash
-pip install mxnet-cu90mkl
-```
diff --git a/tools/pip/doc/CU90_ADDITIONAL.md b/tools/pip/doc/CU90_ADDITIONAL.md
index 8fb007e..770914b 100644
--- a/tools/pip/doc/CU90_ADDITIONAL.md
+++ b/tools/pip/doc/CU90_ADDITIONAL.md
@@ -15,23 +15,15 @@
<!--- specific language governing permissions and limitations -->
<!--- under the License. -->
+**CUDA 9.0 package for MXNet is no longer maintained for new releases.**
+
Prerequisites
-------------
This package supports Linux and Windows platforms. You may also want to check:
- [mxnet-cu102](https://pypi.python.org/pypi/mxnet-cu102/) with CUDA-10.2
support.
-- [mxnet-cu102mkl](https://pypi.python.org/pypi/mxnet-cu102mkl/) with
CUDA-10.2 support and MKLDNN support.
-- [mxnet-cu101](https://pypi.python.org/pypi/mxnet-cu101mkl/) with CUDA-10.1
support.
-- [mxnet-cu101mkl](https://pypi.python.org/pypi/mxnet-cu101mkl/) with
CUDA-10.1 support and MKLDNN support.
-- [mxnet-cu100](https://pypi.python.org/pypi/mxnet-cu100mkl/) with CUDA-10.0
support.
-- [mxnet-cu100mkl](https://pypi.python.org/pypi/mxnet-cu100mkl/) with
CUDA-10.0 support and MKLDNN support.
- [mxnet-cu92](https://pypi.python.org/pypi/mxnet-cu92/) with CUDA-9.2 support.
-- [mxnet-cu92mkl](https://pypi.python.org/pypi/mxnet-cu92mkl/) with CUDA-9.2
support and MKLDNN support.
-- [mxnet-cu90mkl](https://pypi.python.org/pypi/mxnet-cu90mkl/) with CUDA-9.0
support and MKLDNN support.
- [mxnet-cu80](https://pypi.python.org/pypi/mxnet-cu80/) with CUDA-8.0 support.
-- [mxnet-cu80mkl](https://pypi.python.org/pypi/mxnet-cu80mkl/) with CUDA-8.0
support and MKLDNN support.
- [mxnet-cu75](https://pypi.python.org/pypi/mxnet-cu75/) with CUDA-7.5 support.
-- [mxnet-cu75mkl](https://pypi.python.org/pypi/mxnet-cu75mkl/) with CUDA-7.5
support and MKLDNN support.
-- [mxnet-mkl](https://pypi.python.org/pypi/mxnet-mkl/) with MKLDNN support.
- [mxnet](https://pypi.python.org/pypi/mxnet/).
To download CUDA, check [CUDA
download](https://developer.nvidia.com/cuda-downloads). For more instructions,
check [CUDA Toolkit online
documentation](http://docs.nvidia.com/cuda/index.html).
@@ -44,3 +36,10 @@ To install:
```bash
pip install mxnet-cu90
```
+
+Nightly Builds
+--------------
+To install the latest nightly build, use:
+```bash
+pip install --pre mxnet-cu90 -f https://dist.mxnet.io/python
+```
diff --git a/tools/pip/doc/CU92MKL_ADDITIONAL.md
b/tools/pip/doc/CU92MKL_ADDITIONAL.md
deleted file mode 100644
index 8401590..0000000
--- a/tools/pip/doc/CU92MKL_ADDITIONAL.md
+++ /dev/null
@@ -1,46 +0,0 @@
-<!--- Licensed to the Apache Software Foundation (ASF) under one -->
-<!--- or more contributor license agreements. See the NOTICE file -->
-<!--- distributed with this work for additional information -->
-<!--- regarding copyright ownership. The ASF licenses this file -->
-<!--- to you under the Apache License, Version 2.0 (the -->
-<!--- "License"); you may not use this file except in compliance -->
-<!--- with the License. You may obtain a copy of the License at -->
-
-<!--- http://www.apache.org/licenses/LICENSE-2.0 -->
-
-<!--- Unless required by applicable law or agreed to in writing, -->
-<!--- software distributed under the License is distributed on an -->
-<!--- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -->
-<!--- KIND, either express or implied. See the License for the -->
-<!--- specific language governing permissions and limitations -->
-<!--- under the License. -->
-
-Prerequisites
--------------
-This package supports Linux and Windows platforms. You may also want to check:
-- [mxnet-cu102](https://pypi.python.org/pypi/mxnet-cu102/) with CUDA-10.2
support.
-- [mxnet-cu102mkl](https://pypi.python.org/pypi/mxnet-cu102mkl/) with
CUDA-10.2 support and MKLDNN support.
-- [mxnet-cu101](https://pypi.python.org/pypi/mxnet-cu101mkl/) with CUDA-10.1
support.
-- [mxnet-cu101mkl](https://pypi.python.org/pypi/mxnet-cu101mkl/) with
CUDA-10.1 support and MKLDNN support.
-- [mxnet-cu100](https://pypi.python.org/pypi/mxnet-cu100mkl/) with CUDA-10.0
support.
-- [mxnet-cu100mkl](https://pypi.python.org/pypi/mxnet-cu100mkl/) with
CUDA-10.0 support and MKLDNN support.
-- [mxnet-cu92](https://pypi.python.org/pypi/mxnet-cu92/) with CUDA-9.2 support.
-- [mxnet-cu90](https://pypi.python.org/pypi/mxnet-cu90/) with CUDA-9.0 support.
-- [mxnet-cu90mkl](https://pypi.python.org/pypi/mxnet-cu90mkl/) with CUDA-9.0
support and MKLDNN support.
-- [mxnet-cu80](https://pypi.python.org/pypi/mxnet-cu80/) with CUDA-8.0 support.
-- [mxnet-cu80mkl](https://pypi.python.org/pypi/mxnet-cu80mkl/) with CUDA-8.0
support and MKLDNN support.
-- [mxnet-cu75](https://pypi.python.org/pypi/mxnet-cu75/) with CUDA-7.5 support.
-- [mxnet-cu75mkl](https://pypi.python.org/pypi/mxnet-cu75mkl/) with CUDA-7.5
support and MKLDNN support.
-- [mxnet-mkl](https://pypi.python.org/pypi/mxnet-mkl/) with MKLDNN support.
-- [mxnet](https://pypi.python.org/pypi/mxnet/).
-
-To download CUDA, check [CUDA
download](https://developer.nvidia.com/cuda-downloads). For more instructions,
check [CUDA Toolkit online
documentation](http://docs.nvidia.com/cuda/index.html).
-
-To install for other platforms (e.g. Windows, Raspberry Pi/ARM) or other
versions of CUDA, check [Installing
MXNet](https://mxnet.apache.org/versions/master/install/index.html) for
instructions on building from source.
-
-Installation
-------------
-To install:
-```bash
-pip install mxnet-cu92mkl
-```
diff --git a/tools/pip/doc/CU92_ADDITIONAL.md b/tools/pip/doc/CU92_ADDITIONAL.md
index 0485e30..7aec9a1 100644
--- a/tools/pip/doc/CU92_ADDITIONAL.md
+++ b/tools/pip/doc/CU92_ADDITIONAL.md
@@ -19,19 +19,9 @@ Prerequisites
-------------
This package supports Linux and Windows platforms. You may also want to check:
- [mxnet-cu102](https://pypi.python.org/pypi/mxnet-cu102/) with CUDA-10.2
support.
-- [mxnet-cu102mkl](https://pypi.python.org/pypi/mxnet-cu102mkl/) with
CUDA-10.2 support and MKLDNN support.
-- [mxnet-cu101](https://pypi.python.org/pypi/mxnet-cu101mkl/) with CUDA-10.1
support.
-- [mxnet-cu101mkl](https://pypi.python.org/pypi/mxnet-cu101mkl/) with
CUDA-10.1 support and MKLDNN support.
-- [mxnet-cu100](https://pypi.python.org/pypi/mxnet-cu100mkl/) with CUDA-10.0
support.
-- [mxnet-cu100mkl](https://pypi.python.org/pypi/mxnet-cu100mkl/) with
CUDA-10.0 support and MKLDNN support.
-- [mxnet-cu92mkl](https://pypi.python.org/pypi/mxnet-cu92mkl/) with CUDA-9.2
support and MKLDNN support.
- [mxnet-cu90](https://pypi.python.org/pypi/mxnet-cu90/) with CUDA-9.0 support.
-- [mxnet-cu90mkl](https://pypi.python.org/pypi/mxnet-cu90mkl/) with CUDA-9.0
support and MKLDNN support.
- [mxnet-cu80](https://pypi.python.org/pypi/mxnet-cu80/) with CUDA-8.0 support.
-- [mxnet-cu80mkl](https://pypi.python.org/pypi/mxnet-cu80mkl/) with CUDA-8.0
support and MKLDNN support.
- [mxnet-cu75](https://pypi.python.org/pypi/mxnet-cu75/) with CUDA-7.5 support.
-- [mxnet-cu75mkl](https://pypi.python.org/pypi/mxnet-cu75mkl/) with CUDA-7.5
support and MKLDNN support.
-- [mxnet-mkl](https://pypi.python.org/pypi/mxnet-mkl/) with MKLDNN support.
- [mxnet](https://pypi.python.org/pypi/mxnet/).
To download CUDA, check [CUDA
download](https://developer.nvidia.com/cuda-downloads). For more instructions,
check [CUDA Toolkit online
documentation](http://docs.nvidia.com/cuda/index.html).
@@ -44,3 +34,10 @@ To install:
```bash
pip install mxnet-cu92
```
+
+Nightly Builds
+--------------
+To install the latest nightly build, use:
+```bash
+pip install --pre mxnet-cu92 -f https://dist.mxnet.io/python
+```
diff --git a/tools/pip/doc/MKL_ADDITIONAL.md b/tools/pip/doc/MKL_ADDITIONAL.md
deleted file mode 100644
index d6236cf..0000000
--- a/tools/pip/doc/MKL_ADDITIONAL.md
+++ /dev/null
@@ -1,42 +0,0 @@
-<!--- Licensed to the Apache Software Foundation (ASF) under one -->
-<!--- or more contributor license agreements. See the NOTICE file -->
-<!--- distributed with this work for additional information -->
-<!--- regarding copyright ownership. The ASF licenses this file -->
-<!--- to you under the Apache License, Version 2.0 (the -->
-<!--- "License"); you may not use this file except in compliance -->
-<!--- with the License. You may obtain a copy of the License at -->
-
-<!--- http://www.apache.org/licenses/LICENSE-2.0 -->
-
-<!--- Unless required by applicable law or agreed to in writing, -->
-<!--- software distributed under the License is distributed on an -->
-<!--- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -->
-<!--- KIND, either express or implied. See the License for the -->
-<!--- specific language governing permissions and limitations -->
-<!--- under the License. -->
-
-Prerequisites
--------------
-This package supports Linux only. You may also want to check:
-- [mxnet-cu101](https://pypi.python.org/pypi/mxnet-cu101mkl/) with CUDA-10.1
support.
-- [mxnet-cu101mkl](https://pypi.python.org/pypi/mxnet-cu101mkl/) with
CUDA-10.1 support and MKLDNN support.
-- [mxnet-cu100](https://pypi.python.org/pypi/mxnet-cu100mkl/) with CUDA-10.0
support.
-- [mxnet-cu100mkl](https://pypi.python.org/pypi/mxnet-cu100mkl/) with
CUDA-10.0 support and MKLDNN support.
-- [mxnet-cu92](https://pypi.python.org/pypi/mxnet-cu92/) with CUDA-9.2 support.
-- [mxnet-cu92mkl](https://pypi.python.org/pypi/mxnet-cu92mkl/) with CUDA-9.2
support and MKLDNN support.
-- [mxnet-cu90](https://pypi.python.org/pypi/mxnet-cu90/) with CUDA-9.0 support.
-- [mxnet-cu90mkl](https://pypi.python.org/pypi/mxnet-cu90mkl/) with CUDA-9.0
support and MKLDNN support.
-- [mxnet-cu80](https://pypi.python.org/pypi/mxnet-cu80/) with CUDA-8.0 support.
-- [mxnet-cu80mkl](https://pypi.python.org/pypi/mxnet-cu80mkl/) with CUDA-8.0
support and MKLDNN support.
-- [mxnet-cu75](https://pypi.python.org/pypi/mxnet-cu75/) with CUDA-7.5 support.
-- [mxnet-cu75mkl](https://pypi.python.org/pypi/mxnet-cu75mkl/) with CUDA-7.5
support and MKLDNN support.
-- [mxnet](https://pypi.python.org/pypi/mxnet/).
-
-To install for other platforms (e.g. Windows, Raspberry Pi/ARM) or other
versions, check [Installing
MXNet](https://mxnet.apache.org/versions/master/install/index.html) for
instructions on building from source.
-
-Installation
-------------
-To install:
-```bash
-pip install mxnet-mkl
-```
diff --git a/tools/pip/doc/CU75MKL_ADDITIONAL.md
b/tools/pip/doc/NATIVE_ADDITIONAL.md
similarity index 54%
rename from tools/pip/doc/CU75MKL_ADDITIONAL.md
rename to tools/pip/doc/NATIVE_ADDITIONAL.md
index cb74a01..902464c 100644
--- a/tools/pip/doc/CU75MKL_ADDITIONAL.md
+++ b/tools/pip/doc/NATIVE_ADDITIONAL.md
@@ -15,24 +15,12 @@
<!--- specific language governing permissions and limitations -->
<!--- under the License. -->
-**CUDA 7.5 package for MXNet is no longer maintained for new releases.**
-
Prerequisites
-------------
-This package supports Linux only, up to 1.2.1. You may also want to check:
-- [mxnet-cu101](https://pypi.python.org/pypi/mxnet-cu101mkl/) with CUDA-10.1
support.
-- [mxnet-cu101mkl](https://pypi.python.org/pypi/mxnet-cu101mkl/) with
CUDA-10.1 support and MKLDNN support.
-- [mxnet-cu100](https://pypi.python.org/pypi/mxnet-cu100mkl/) with CUDA-10.0
support.
-- [mxnet-cu100mkl](https://pypi.python.org/pypi/mxnet-cu100mkl/) with
CUDA-10.0 support and MKLDNN support.
+This package supports Linux and Windows platforms. You may also want to check:
+- [mxnet-cu102](https://pypi.python.org/pypi/mxnet-cu101/) with CUDA-10.2
support.
- [mxnet-cu92](https://pypi.python.org/pypi/mxnet-cu92/) with CUDA-9.2 support.
-- [mxnet-cu92mkl](https://pypi.python.org/pypi/mxnet-cu92mkl/) with CUDA-9.2
support and MKLDNN support.
-- [mxnet-cu90](https://pypi.python.org/pypi/mxnet-cu90/) with CUDA-9.0 support.
-- [mxnet-cu90mkl](https://pypi.python.org/pypi/mxnet-cu90mkl/) with CUDA-9.0
support and MKLDNN support.
-- [mxnet-cu80](https://pypi.python.org/pypi/mxnet-cu80/) with CUDA-8.0 support.
-- [mxnet-cu80mkl](https://pypi.python.org/pypi/mxnet-cu80mkl/) with CUDA-8.0
support and MKLDNN support.
-- [mxnet-cu75](https://pypi.python.org/pypi/mxnet-cu75/) with CUDA-7.5 support.
-- [mxnet-mkl](https://pypi.python.org/pypi/mxnet-mkl/) with MKLDNN support.
-- [mxnet](https://pypi.python.org/pypi/mxnet/).
+- [mxnet](https://pypi.python.org/pypi/mxnet/) CPU build with MKLDNN.
To download CUDA, check [CUDA
download](https://developer.nvidia.com/cuda-downloads). For more instructions,
check [CUDA Toolkit online
documentation](http://docs.nvidia.com/cuda/index.html).
@@ -42,5 +30,12 @@ Installation
------------
To install:
```bash
-pip install mxnet-cu75mkl
+pip install mxnet-native
+```
+
+Nightly Builds
+--------------
+To install the latest nightly build, use:
+```bash
+pip install --pre mxnet-native -f https://dist.mxnet.io/python
```
diff --git a/tools/pip/doc/PYPI_README.md b/tools/pip/doc/PYPI_README.md
index 899ebc0..d323a55 100644
--- a/tools/pip/doc/PYPI_README.md
+++ b/tools/pip/doc/PYPI_README.md
@@ -22,4 +22,3 @@ It allows you to mix the flavours of deep learning programs
together to maximize
For feature requests on the PyPI package, suggestions, and issue reports,
create an issue by clicking
[here](https://github.com/apache/incubator-mxnet/issues/new).
-
diff --git a/tools/pip/setup.py b/tools/pip/setup.py
index a0b63cc..d010517 100644
--- a/tools/pip/setup.py
+++ b/tools/pip/setup.py
@@ -27,7 +27,7 @@ import platform
if platform.system() == 'Linux':
sys.argv.append('--universal')
- sys.argv.append('--plat-name=manylinux1_x86_64')
+ sys.argv.append('--plat-name=manylinux2014_x86_64')
from setuptools import setup, find_packages
from setuptools.dist import Distribution
@@ -110,11 +110,18 @@ variant = os.environ['mxnet_variant'].upper()
if variant != 'CPU':
package_name = 'mxnet_{0}'.format(variant.lower())
+def skip_markdown_comments(md):
+ lines = md.splitlines()
+ for i in range(len(lines)):
+ if lines[i].strip():
+ if not lines[i].startswith('<!--') or not lines[i].endswith('-->'):
+ return '\n'.join(lines[i:])
+
with open('doc/PYPI_README.md') as readme_file:
- long_description = readme_file.read()
+ long_description = skip_markdown_comments(readme_file.read())
with open('doc/{0}_ADDITIONAL.md'.format(variant)) as variant_doc:
- long_description = long_description + variant_doc.read()
+ long_description = long_description +
skip_markdown_comments(variant_doc.read())
# pypi only supports rst, so use pandoc to convert
import pypandoc
@@ -152,12 +159,12 @@ package_data = {'mxnet': [os.path.join('mxnet',
os.path.basename(LIB_PATH[0]))],
if variant.endswith('MKL'):
if platform.system() == 'Darwin':
shutil.copytree(os.path.join(CURRENT_DIR,
'mxnet-build/3rdparty/mkldnn/build/install/include'),
- os.path.join(CURRENT_DIR, 'mxnet/include/mkldnn'))
+ os.path.join(CURRENT_DIR, 'mxnet/include/mkldnn'))
if platform.system() == 'Linux':
libdir, mxdir = os.path.dirname(LIB_PATH[0]), os.path.join(CURRENT_DIR,
'mxnet')
if os.path.exists(os.path.join(libdir, 'libgfortran.so.3')):
shutil.copy(os.path.join(libdir, 'libgfortran.so.3'), mxdir)
- package_data['mxnet'].append('mxnet/libgfortran.so.4')
+ package_data['mxnet'].append('mxnet/libgfortran.so.3')
else:
shutil.copy(os.path.join(libdir, 'libgfortran.so.4'), mxdir)
package_data['mxnet'].append('mxnet/libgfortran.so.4')
@@ -199,10 +206,10 @@ setup(name=package_name,
'Programming Language :: Other', # R, Scala
'Programming Language :: Perl',
'Programming Language :: Python',
- 'Programming Language :: Python :: 2.7',
- 'Programming Language :: Python :: 3.4',
'Programming Language :: Python :: 3.5',
'Programming Language :: Python :: 3.6',
+ 'Programming Language :: Python :: 3.7',
+ 'Programming Language :: Python :: 3.8',
'Programming Language :: Python :: Implementation :: CPython',
'Topic :: Scientific/Engineering',
'Topic :: Scientific/Engineering :: Artificial Intelligence',
