From e04ea82967c79275114253598fe9fe79595108d6 Mon Sep 17 00:00:00 2001 From: Lv Tao Date: Tue, 18 Sep 2018 13:47:40 +0800 Subject: [PATCH 1/3] fix doc --- docs/install/index.md | 31 +++++++++++++++++++++++++------ docs/install/windows_setup.md | 2 +- 2 files changed, 26 insertions(+), 7 deletions(-) diff --git a/docs/install/index.md b/docs/install/index.md index dd6f97c132db..28627bd4b90b 100644 --- a/docs/install/index.md +++ b/docs/install/index.md @@ -141,11 +141,16 @@ $ pip install mxnet --pre
-Most MXNet versions offer an experimental MKL pip package that will be much faster when running on Intel hardware. -Check the chart below for other options, refer to PyPI for other MXNet pip packages, or validate your MXNet installation. +MXNet offers MKL pip packages that will be much faster when running on Intel hardware. +Check the chart below for other options, refer to PyPI for other MXNet pip packages, or validate your MXNet installation. pip packages +**Notes:** +*mxnet-cu92mkl* means the package is built with CUDA/cuDNN and MKL-DNN enabled and the CUDA version is 9.2. + +MKL pip package is experimental in some old versions of MXNet. + @@ -252,12 +257,15 @@ $ pip install mxnet-cu92 --pre
-Most MXNet versions offer an experimental MKL pip package that will be much faster when running on Intel hardware. +MXNet offers MKL pip packages that will be much faster when running on Intel hardware. Check the chart below for other options, refer to PyPI for other MXNet pip packages, or validate your MXNet installation. pip packages **NOTES:** +*mxnet-cu92mkl* means the package is built with CUDA/cuDNN and MKL-DNN enabled and the CUDA version is 9.2. + +MKL pip package is experimental in some old versions of MXNet. CUDA should be installed first. Instructions can be found in the CUDA dependencies section of the MXNet Ubuntu installation guide. @@ -478,11 +486,15 @@ $ pip install mxnet --pre
-Most MXNet versions offer an experimental MKL pip package that will be much faster when running on Intel hardware. +MXNet offers MKL pip packages that will be much faster when running on Intel hardware. Check the chart below for other options, refer to PyPI for other MXNet pip packages, or validate your MXNet installation. pip packages +**NOTES:** +*mxnet-cu92mkl* means the package is built with CUDA/cuDNN and MKL-DNN enabled and the CUDA version is 9.2. + +MKL pip package is experimental in some old versions of MXNet. @@ -686,11 +698,15 @@ $ pip install mxnet --pre
-Most MXNet versions offer an experimental MKL pip package that will be much faster when running on Intel hardware. +MXNet offers MKL pip packages that will be much faster when running on Intel hardware. Check the chart below for other options, refer to PyPI for other MXNet pip packages, or validate your MXNet installation. pip packages +**NOTES:** +*mxnet-cu92mkl* means the package is built with CUDA/cuDNN and MKL-DNN enabled and the CUDA version is 9.2. + +MKL pip package is experimental in some old versions of MXNet. @@ -762,12 +778,15 @@ $ pip install mxnet-cu92 --pre
-Most MXNet versions offer an experimental MKL pip package that will be much faster when running on Intel hardware. +MXNet offers MKL pip packages that will be much faster when running on Intel hardware. Check the chart below for other options, refer to PyPI for other MXNet pip packages, or validate your MXNet installation. pip packages **NOTES:** +*mxnet-cu92mkl* means the package is built with CUDA/cuDNN and MKL-DNN enabled and the CUDA version is 9.2. + +MKL pip package is experimental in some old versions of MXNet. [Anaconda](https://www.anaconda.com/download/) is recommended. diff --git a/docs/install/windows_setup.md b/docs/install/windows_setup.md index 01cd46658a7b..1b5262fa47f0 100755 --- a/docs/install/windows_setup.md +++ b/docs/install/windows_setup.md @@ -117,7 +117,7 @@ We provide two primary options to build and install MXNet yourself using [Micros **NOTE:** Visual Studio 2017's compiler is `vc15`. This is not to be confused with Visual Studio 2015's compiler, `vc14`. -You also have the option to install MXNet with MKL or MKLDNN. In this case it is recommended that you refer to the [MKLDNN_README](https://github.com/apache/incubator-mxnet/blob/master/MKLDNN_README.md). +You also have the option to install MXNet with MKL or MKL-DNN. In this case it is recommended that you refer to the [MKLDNN_README](https://github.com/apache/incubator-mxnet/blob/master/MKLDNN_README.md). **Option 1: Build with Microsoft Visual Studio 2017 (VS2017)** From 9cb833c6b46bcb176e7027fb209e11e4aa4e4f58 Mon Sep 17 00:00:00 2001 From: Lv Tao Date: Tue, 18 Sep 2018 13:54:37 +0800 Subject: [PATCH 2/3] blank lines --- docs/install/index.md | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/docs/install/index.md b/docs/install/index.md index 28627bd4b90b..cd13fc777dc3 100644 --- a/docs/install/index.md +++ b/docs/install/index.md @@ -146,7 +146,8 @@ Check the chart below for other options, refer to -**Notes:** +**NOTES:** + *mxnet-cu92mkl* means the package is built with CUDA/cuDNN and MKL-DNN enabled and the CUDA version is 9.2. MKL pip package is experimental in some old versions of MXNet. @@ -263,6 +264,7 @@ Check the chart below for other options, refer to **NOTES:** + *mxnet-cu92mkl* means the package is built with CUDA/cuDNN and MKL-DNN enabled and the CUDA version is 9.2. MKL pip package is experimental in some old versions of MXNet. @@ -492,6 +494,7 @@ Check the chart below for other options, refer to **NOTES:** + *mxnet-cu92mkl* means the package is built with CUDA/cuDNN and MKL-DNN enabled and the CUDA version is 9.2. MKL pip package is experimental in some old versions of MXNet. @@ -704,6 +707,7 @@ Check the chart below for other options, refer to **NOTES:** + *mxnet-cu92mkl* means the package is built with CUDA/cuDNN and MKL-DNN enabled and the CUDA version is 9.2. MKL pip package is experimental in some old versions of MXNet. @@ -784,6 +788,7 @@ Check the chart below for other options, refer to **NOTES:** + *mxnet-cu92mkl* means the package is built with CUDA/cuDNN and MKL-DNN enabled and the CUDA version is 9.2. MKL pip package is experimental in some old versions of MXNet. From 4d88715429d6cc70f95e8e3aaaa4c04221825e3a Mon Sep 17 00:00:00 2001 From: Lv Tao Date: Wed, 19 Sep 2018 12:59:46 +0800 Subject: [PATCH 3/3] fix comment --- docs/install/index.md | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/docs/install/index.md b/docs/install/index.md index cd13fc777dc3..c2aa229de1d7 100644 --- a/docs/install/index.md +++ b/docs/install/index.md @@ -150,7 +150,7 @@ Check the chart below for other options, refer to CUDA dependencies section of the MXNet Ubuntu installation guide. @@ -497,7 +497,7 @@ Check the chart below for other options, refer to @@ -791,7 +791,7 @@ Check the chart below for other options, refer to