FORCE_DAAL4PY_SKLEARN update

Author: Alexsandruss

README.md

@@ -10,6 +10,7 @@ See benchmark results [here](https://intelpython.github.io/scikit-learn_bench).
 
 * [Prerequisites](#prerequisites)
 * [How to create conda environment for benchmarking](#how-to-create-conda-environment-for-benchmarking)
+* [How to enable daal4py patching for scikit-learn benchmarks](#how-to-enable-daal4py-patching-for-scikit-learn-benchmarks)
 * [Running Python benchmarks with runner script](#running-python-benchmarks-with-runner-script)
 * [Supported algorithms](#supported-algorithms)
 * [Algorithms parameters](#algorithms-parameters)
@@ -30,6 +31,8 @@ Create a suitable conda environment for each framework to test. Each item in the
 * [**cuml**](https://github.com/PivovarA/scikit-learn_bench/blob/master/cuml/README.md#how-to-create-conda-environment-for-benchmarking)
 * [**xgboost**](https://github.com/PivovarA/scikit-learn_bench/tree/master/xgboost/README.md#how-to-create-conda-environment-for-benchmarking)
 
+## How to enable daal4py patching for scikit-learn benchmarks
+Set specific environment variable `export FORCE_DAAL4PY_SKLEARN=YES`
 
 ## Running Python benchmarks with runner script
 

cuml/bench.py

@@ -12,11 +12,10 @@
 import sys
 
 
-if 'FORCE_DAAL4PY_SKLEARN' in os.environ.keys():
+if os.environ.get('FORCE_DAAL4PY_SKLEARN', False) in ['y', 'yes', 'Y', 'YES', 'Yes']:
     try:
         from daal4py.sklearn import patch_sklearn
-        if os.environ['FORCE_DAAL4PY_SKLEARN'] == 'YES':
-            patch_sklearn()
+        patch_sklearn()
     except ImportError:
         print('Failed to import daal4py.sklearn.patch_sklearn '
               'while FORCE_DAAL4PY_SKLEARN is set', file=sys.stderr)

daal4py/bench.py

@@ -12,11 +12,10 @@
 import sys
 
 
-if 'FORCE_DAAL4PY_SKLEARN' in os.environ.keys():
+if os.environ.get('FORCE_DAAL4PY_SKLEARN', False) in ['y', 'yes', 'Y', 'YES', 'Yes']:
     try:
         from daal4py.sklearn import patch_sklearn
-        if os.environ['FORCE_DAAL4PY_SKLEARN'] == 'YES':
-            patch_sklearn()
+        patch_sklearn()
     except ImportError:
         print('Failed to import daal4py.sklearn.patch_sklearn '
               'while FORCE_DAAL4PY_SKLEARN is set', file=sys.stderr)

sklearn/bench.py

@@ -12,11 +12,10 @@
 import sys
 
 
-if 'FORCE_DAAL4PY_SKLEARN' in os.environ.keys():
+if os.environ.get('FORCE_DAAL4PY_SKLEARN', False) in ['y', 'yes', 'Y', 'YES', 'Yes']:
     try:
         from daal4py.sklearn import patch_sklearn
-        if os.environ['FORCE_DAAL4PY_SKLEARN'] == 'YES':
-            patch_sklearn()
+        patch_sklearn()
     except ImportError:
         print('Failed to import daal4py.sklearn.patch_sklearn '
               'while FORCE_DAAL4PY_SKLEARN is set', file=sys.stderr)

xgboost/bench.py

@@ -12,11 +12,10 @@
 import sys
 
 
-if 'FORCE_DAAL4PY_SKLEARN' in os.environ.keys():
+if os.environ.get('FORCE_DAAL4PY_SKLEARN', False) in ['y', 'yes', 'Y', 'YES', 'Yes']:
     try:
         from daal4py.sklearn import patch_sklearn
-        if os.environ['FORCE_DAAL4PY_SKLEARN'] == 'YES':
-            patch_sklearn()
+        patch_sklearn()
     except ImportError:
         print('Failed to import daal4py.sklearn.patch_sklearn '
               'while FORCE_DAAL4PY_SKLEARN is set', file=sys.stderr)