From c5774a790604dc4564efb43184626c18aa3a9421 Mon Sep 17 00:00:00 2001 From: Pavel Yakovlev Date: Mon, 12 Apr 2021 14:51:26 +0300 Subject: [PATCH 1/3] add scikit-learn-intelex info --- README.md | 4 ++-- bench.py | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 10ec2bc2d..31bf5eeb5 100755 --- a/README.md +++ b/README.md @@ -40,7 +40,7 @@ Create a suitable conda environment for each framework to test. Each item in the * [**scikit-learn**](sklearn_bench#how-to-create-conda-environment-for-benchmarking) ```bash -conda create -n bench -c intel python=3.7 scikit-learn daal4py pandas +conda create -n bench -c intel python=3.7 scikit-learn scikit-learn-intelex pandas ``` * [**daal4py**](daal4py_bench#how-to-create-conda-environment-for-benchmarking) @@ -67,7 +67,7 @@ Run `python runner.py --configs configs/config_example.json [--output-file resul runner options: * ``configs`` : configuration files paths -* ``no-intel-optimized`` : use no intel optimized version. Now avalible for scikit-learn benchmarks. Default is intel-optimized version. +* ``no-intel-optimized`` : using Scikit-learn without Intel(R) Extension for Scikit-learn*. Now avalible for scikit-learn benchmarks. Default starts with using Intel(R) Extension for Scikit-learn*. * ``output-file``: output file name for result benchmarks. Default is `result.json` * ``report``: create an Excel report based on benchmarks results. Need library `openpyxl`. * ``dummy-run`` : run configuration parser and datasets generation without benchmarks running. diff --git a/bench.py b/bench.py index 4504660e7..591db126c 100644 --- a/bench.py +++ b/bench.py @@ -197,10 +197,10 @@ def parse_args(parser, size=None, loop_types=(), if not params.no_intel_optimized: try: - from daal4py.sklearn import patch_sklearn + from sklearnex import patch_sklearn patch_sklearn() except ImportError: - print('Failed to import daal4py.sklearn.patch_sklearn.' + print('Failed to import sklearnex.patch_sklearn.' 'Use stock version scikit-learn', file=sys.stderr) params.device = 'None' else: From 6b9c891aacd4bd4a97595abb35f2f181460fde2e Mon Sep 17 00:00:00 2001 From: Pavel Yakovlev Date: Mon, 12 Apr 2021 14:59:22 +0300 Subject: [PATCH 2/3] fix CI --- azure-pipelines.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 4a59a3c9e..c054199b7 100755 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -6,7 +6,7 @@ jobs: - script: | conda update -y -q conda export FORCE_DAAL4PY_SKLEARN=yes - conda create -q -y -n bench -c conda-forge python=3.7 pandas scikit-learn daal4py + conda create -q -y -n bench -c conda-forge python=3.7 pandas scikit-learn scikit-learn-intelex displayName: Create Anaconda environment - script: | . /usr/share/miniconda/etc/profile.d/conda.sh From 203d5dd946eb71dc839f99ebb270aefe368e5746 Mon Sep 17 00:00:00 2001 From: Kirill Date: Tue, 13 Apr 2021 00:02:17 +0300 Subject: [PATCH 3/3] Update azure-pipelines.yml --- azure-pipelines.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index c054199b7..11cb5acf1 100755 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -37,7 +37,7 @@ jobs: - script: | . /usr/share/miniconda/etc/profile.d/conda.sh conda activate bench - python runner.py --configs configs/testing/daal4py.json + python runner.py --configs configs/testing/daal4py.json --no-intel-optimized displayName: Run bench - job: Linux_XGBoost_and_daal4py pool: @@ -50,7 +50,7 @@ jobs: - script: | . /usr/share/miniconda/etc/profile.d/conda.sh conda activate bench - python runner.py --configs configs/testing/daal4py_xgboost.json + python runner.py --configs configs/testing/daal4py_xgboost.json --no-intel-optimized displayName: Run bench - job: Pep8 pool: