From 215b37eb9daf8919fe582d374c0907a5e9cd6c42 Mon Sep 17 00:00:00 2001 From: Olivier Grisel Date: Fri, 22 Nov 2019 16:15:58 +0100 Subject: [PATCH 1/5] Mention intel conda channel in third-party distributions --- doc/install.rst | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/doc/install.rst b/doc/install.rst index d45e9f3367ff1..0aa6e3a9b6734 100644 --- a/doc/install.rst +++ b/doc/install.rst @@ -230,6 +230,25 @@ library for Windows, Mac OSX and Linux. Anaconda offers scikit-learn as part of its free distribution. +Intel conda channel +------------------- + +Intel maintains a dedicated conda channel that ships scikit-learn:: + + $ conda install -c scikit-learn + +This version of scikit-learn comes with alternative solvers for some common +estimators. Those solvers come from the DAAL C++ library and are optimized for +multi-core CPUs. + +Note that those solvers are not enabled by default, please refer to the +[daal4py](https://intelpython.github.io/daal4py/sklearn.html) documentation for +more details. + +Compatibility with the standard scikit-learn solvers is checked via automated +continuous integration as reported on https://github.com/IntelPython/daal4py. + + WinPython for Windows ----------------------- From 65838fcaff1193b14d833808cef6e961afc2233b Mon Sep 17 00:00:00 2001 From: Olivier Grisel Date: Fri, 22 Nov 2019 16:45:43 +0100 Subject: [PATCH 2/5] Update doc/install.rst MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-Authored-By: Jérémie du Boisberranger <34657725+jeremiedbb@users.noreply.github.com> --- doc/install.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/install.rst b/doc/install.rst index 0aa6e3a9b6734..166d10ba68ed7 100644 --- a/doc/install.rst +++ b/doc/install.rst @@ -235,7 +235,7 @@ Intel conda channel Intel maintains a dedicated conda channel that ships scikit-learn:: - $ conda install -c scikit-learn + $ conda install -c intel scikit-learn This version of scikit-learn comes with alternative solvers for some common estimators. Those solvers come from the DAAL C++ library and are optimized for From eddf91d86916059c5f5eb7e07c543c68d04a56f6 Mon Sep 17 00:00:00 2001 From: Olivier Grisel Date: Fri, 22 Nov 2019 16:53:35 +0100 Subject: [PATCH 3/5] More explicit paragraph on automated testing. --- doc/install.rst | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/doc/install.rst b/doc/install.rst index 166d10ba68ed7..055b9d3d13a74 100644 --- a/doc/install.rst +++ b/doc/install.rst @@ -245,8 +245,9 @@ Note that those solvers are not enabled by default, please refer to the [daal4py](https://intelpython.github.io/daal4py/sklearn.html) documentation for more details. -Compatibility with the standard scikit-learn solvers is checked via automated -continuous integration as reported on https://github.com/IntelPython/daal4py. +Compatibility with the standard scikit-learn solvers is checked by running the +full scikit-learn test suite via automated continuous integration as reported +on https://github.com/IntelPython/daal4py. WinPython for Windows From b5e3bde35f8d28853ddcb24321604fdcee7eca44 Mon Sep 17 00:00:00 2001 From: Olivier Grisel Date: Mon, 2 Dec 2019 13:21:01 +0100 Subject: [PATCH 4/5] Fix broken link --- doc/install.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/install.rst b/doc/install.rst index 055b9d3d13a74..c6ffbd153d317 100644 --- a/doc/install.rst +++ b/doc/install.rst @@ -242,8 +242,8 @@ estimators. Those solvers come from the DAAL C++ library and are optimized for multi-core CPUs. Note that those solvers are not enabled by default, please refer to the -[daal4py](https://intelpython.github.io/daal4py/sklearn.html) documentation for -more details. +`daal4py `_ documentation +for more details. Compatibility with the standard scikit-learn solvers is checked by running the full scikit-learn test suite via automated continuous integration as reported From 4106aa0e4d93c935655f6dc4d5e7e02956b74a07 Mon Sep 17 00:00:00 2001 From: Olivier Grisel Date: Mon, 2 Dec 2019 16:39:12 +0100 Subject: [PATCH 5/5] Be more specific w.r.t. Intel CPUs --- doc/install.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/install.rst b/doc/install.rst index c6ffbd153d317..1e6ed734e1085 100644 --- a/doc/install.rst +++ b/doc/install.rst @@ -239,7 +239,7 @@ Intel maintains a dedicated conda channel that ships scikit-learn:: This version of scikit-learn comes with alternative solvers for some common estimators. Those solvers come from the DAAL C++ library and are optimized for -multi-core CPUs. +multi-core Intel CPUs. Note that those solvers are not enabled by default, please refer to the `daal4py `_ documentation