From fd15c1eb6df07d2e219e96d95f8b43a0cf227d0d Mon Sep 17 00:00:00 2001 From: Leonard Lausen Date: Thu, 5 Mar 2020 05:38:30 +0000 Subject: [PATCH 1/5] Fix cd/mxnet_lib/dynamic/Jenkins_pipeline.groovy Fixes a regression in CD introduced by https://github.com/apache/incubator-mxnet/pull/17645 --- cd/mxnet_lib/dynamic/Jenkins_pipeline.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cd/mxnet_lib/dynamic/Jenkins_pipeline.groovy b/cd/mxnet_lib/dynamic/Jenkins_pipeline.groovy index 3cef8114c76c..52ad150fe6f9 100644 --- a/cd/mxnet_lib/dynamic/Jenkins_pipeline.groovy +++ b/cd/mxnet_lib/dynamic/Jenkins_pipeline.groovy @@ -24,7 +24,7 @@ // NOTE: the following variables are referenced in the mxnet_lib_pipeline jenkins file imported bellow // libmxnet location -libmxnet = 'lib/libmxnet.so' +libmxnet = 'build/libmxnet.so' // licenses licenses = 'licenses/*' From 1592540cee292411b1a842e118dd6ee42735d04d Mon Sep 17 00:00:00 2001 From: Leonard Lausen Date: Thu, 5 Mar 2020 05:40:33 +0000 Subject: [PATCH 2/5] Fix whitespace --- cd/mxnet_lib/mxnet_lib_pipeline.groovy | 2 +- cd/python/docker/python_images.sh | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/cd/mxnet_lib/mxnet_lib_pipeline.groovy b/cd/mxnet_lib/mxnet_lib_pipeline.groovy index 24172e843067..0310dd991651 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/python_images.sh b/cd/python/docker/python_images.sh index 305676d2c40a..bb78ed07317d 100755 --- a/cd/python/docker/python_images.sh +++ b/cd/python/docker/python_images.sh @@ -68,7 +68,7 @@ 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}" @@ -106,7 +106,7 @@ push() { 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 From ce86a3538e727d3460c988eb32c34c512c80d8ba Mon Sep 17 00:00:00 2001 From: Leonard Lausen Date: Thu, 5 Mar 2020 05:50:20 +0000 Subject: [PATCH 3/5] Add NATIVE_ADDITIONAL.md --- tools/pip/doc/NATIVE_ADDITIONAL.md | 34 ++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100644 tools/pip/doc/NATIVE_ADDITIONAL.md diff --git a/tools/pip/doc/NATIVE_ADDITIONAL.md b/tools/pip/doc/NATIVE_ADDITIONAL.md new file mode 100644 index 000000000000..a2e48b0692b7 --- /dev/null +++ b/tools/pip/doc/NATIVE_ADDITIONAL.md @@ -0,0 +1,34 @@ + + + + + + + + + + + + + + + + + +Prerequisites +------------- +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](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). + +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-native +``` From 2ff81392b81afc892e5240ae9b6511c9be7d4241 Mon Sep 17 00:00:00 2001 From: Leonard Lausen Date: Thu, 5 Mar 2020 05:50:34 +0000 Subject: [PATCH 4/5] Update other $TYPE_ADDITIONAL.MD --- tools/pip/doc/CPU_ADDITIONAL.md | 13 +++----- tools/pip/doc/CU100MKL_ADDITIONAL.md | 44 ------------------------- tools/pip/doc/CU100_ADDITIONAL.md | 9 +----- tools/pip/doc/CU101MKL_ADDITIONAL.md | 44 ------------------------- tools/pip/doc/CU101_ADDITIONAL.md | 9 +----- tools/pip/doc/CU102MKL_ADDITIONAL.md | 46 -------------------------- tools/pip/doc/CU102_ADDITIONAL.md | 10 ------ tools/pip/doc/CU75MKL_ADDITIONAL.md | 46 -------------------------- 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 | 10 ------ tools/pip/doc/CU92MKL_ADDITIONAL.md | 46 -------------------------- tools/pip/doc/CU92_ADDITIONAL.md | 10 ------ tools/pip/doc/MKL_ADDITIONAL.md | 42 ------------------------ 16 files changed, 8 insertions(+), 437 deletions(-) delete mode 100644 tools/pip/doc/CU100MKL_ADDITIONAL.md delete mode 100644 tools/pip/doc/CU101MKL_ADDITIONAL.md delete mode 100644 tools/pip/doc/CU102MKL_ADDITIONAL.md delete mode 100644 tools/pip/doc/CU75MKL_ADDITIONAL.md delete mode 100644 tools/pip/doc/CU80MKL_ADDITIONAL.md delete mode 100644 tools/pip/doc/CU90MKL_ADDITIONAL.md delete mode 100644 tools/pip/doc/CU92MKL_ADDITIONAL.md delete mode 100644 tools/pip/doc/MKL_ADDITIONAL.md diff --git a/tools/pip/doc/CPU_ADDITIONAL.md b/tools/pip/doc/CPU_ADDITIONAL.md index bbd747dbf557..ef958889fc70 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. diff --git a/tools/pip/doc/CU100MKL_ADDITIONAL.md b/tools/pip/doc/CU100MKL_ADDITIONAL.md deleted file mode 100644 index 80690ea8b964..000000000000 --- a/tools/pip/doc/CU100MKL_ADDITIONAL.md +++ /dev/null @@ -1,44 +0,0 @@ - - - - - - - - - - - - - - - - - -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 de5e62051cc3..36455eaef3de 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). diff --git a/tools/pip/doc/CU101MKL_ADDITIONAL.md b/tools/pip/doc/CU101MKL_ADDITIONAL.md deleted file mode 100644 index 028cc2556425..000000000000 --- a/tools/pip/doc/CU101MKL_ADDITIONAL.md +++ /dev/null @@ -1,44 +0,0 @@ - - - - - - - - - - - - - - - - - -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 7d9ae5bcfc12..36ea4d3b5be8 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). diff --git a/tools/pip/doc/CU102MKL_ADDITIONAL.md b/tools/pip/doc/CU102MKL_ADDITIONAL.md deleted file mode 100644 index 07be16b2f462..000000000000 --- a/tools/pip/doc/CU102MKL_ADDITIONAL.md +++ /dev/null @@ -1,46 +0,0 @@ - - - - - - - - - - - - - - - - - -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 c9efd4b64118..ffb034a15f01 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). diff --git a/tools/pip/doc/CU75MKL_ADDITIONAL.md b/tools/pip/doc/CU75MKL_ADDITIONAL.md deleted file mode 100644 index cb74a01f11d3..000000000000 --- a/tools/pip/doc/CU75MKL_ADDITIONAL.md +++ /dev/null @@ -1,46 +0,0 @@ - - - - - - - - - - - - - - - - - -**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. -- [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/). - -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, 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-cu75mkl -``` diff --git a/tools/pip/doc/CU75_ADDITIONAL.md b/tools/pip/doc/CU75_ADDITIONAL.md index 53665ce33d42..ae382f96ba35 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 e4f73f94850f..000000000000 --- a/tools/pip/doc/CU80MKL_ADDITIONAL.md +++ /dev/null @@ -1,48 +0,0 @@ - - - - - - - - - - - - - - - - - -**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 23e5c2ea56d0..5ce06d764e42 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 27cd5c3d8619..000000000000 --- a/tools/pip/doc/CU90MKL_ADDITIONAL.md +++ /dev/null @@ -1,46 +0,0 @@ - - - - - - - - - - - - - - - - - -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 8fb007eac867..356a84003586 100644 --- a/tools/pip/doc/CU90_ADDITIONAL.md +++ b/tools/pip/doc/CU90_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-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). diff --git a/tools/pip/doc/CU92MKL_ADDITIONAL.md b/tools/pip/doc/CU92MKL_ADDITIONAL.md deleted file mode 100644 index 840159053db7..000000000000 --- a/tools/pip/doc/CU92MKL_ADDITIONAL.md +++ /dev/null @@ -1,46 +0,0 @@ - - - - - - - - - - - - - - - - - -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 0485e3075c6f..15c221123fba 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). diff --git a/tools/pip/doc/MKL_ADDITIONAL.md b/tools/pip/doc/MKL_ADDITIONAL.md deleted file mode 100644 index d6236cf71ce7..000000000000 --- a/tools/pip/doc/MKL_ADDITIONAL.md +++ /dev/null @@ -1,42 +0,0 @@ - - - - - - - - - - - - - - - - - -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 -``` From 3c0edc24719ce214478f7349a3d2532662316361 Mon Sep 17 00:00:00 2001 From: Leonard Lausen Date: Thu, 5 Mar 2020 05:55:16 +0000 Subject: [PATCH 5/5] Fix cd/python/docker Fixes regression introduced by https://github.com/apache/incubator-mxnet/pull/15990 --- cd/python/docker/Dockerfile | 2 +- cd/python/docker/Jenkins_pipeline.groovy | 9 +++---- cd/python/docker/python_images.sh | 33 ++++-------------------- cd/python/docker/test_python_image.sh | 7 +++-- 4 files changed, 12 insertions(+), 39 deletions(-) diff --git a/cd/python/docker/Dockerfile b/cd/python/docker/Dockerfile index dc70da188793..ed97bdc8316a 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 0d4925e00576..2911a6571288 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 bb78ed07317d..63d5326bc992 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 MXNET-VARIANT " +usage="Usage: python_images.sh 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() { @@ -71,7 +57,7 @@ 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,16 +76,7 @@ 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}" diff --git a/cd/python/docker/test_python_image.sh b/cd/python/docker/test_python_image.sh index f6095c9b34fb..092789300802 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}