Update requirements (#124)

* Update reqs

* Fix 'daal4py not found' warning

Author: Alexsandruss

azure-pipelines.yml

@@ -12,6 +12,7 @@ jobs:
         inputs:
           versionSpec: "$(python.version)"
       - script: |
+          pip install -r requirements-common.txt
           pip install -r sklearn_bench/requirements.txt
           python runner.py --configs configs/testing/sklearn.json
         displayName: Run bench
@@ -24,6 +25,7 @@ jobs:
         inputs:
           versionSpec: "$(python.version)"
       - script: |
+          pip install -r requirements-common.txt
           pip install -r xgboost_bench/requirements.txt
           python runner.py --configs configs/testing/xgboost.json --no-intel-optimized
         displayName: Run bench
@@ -36,6 +38,7 @@ jobs:
         inputs:
           versionSpec: "$(python.version)"
       - script: |
+          pip install -r requirements-common.txt
           pip install -r daal4py_bench/requirements.txt
           python runner.py --configs configs/testing/daal4py.json --no-intel-optimized
         displayName: Run bench

bench.py

@@ -250,25 +250,16 @@ def size_str(shape):
     return 'x'.join(str(d) for d in shape)
 
 
-def set_daal_num_threads(num_threads):
-    try:
-        import daal4py
-        if num_threads:
-            daal4py.daalinit(nthreads=num_threads)
-    except ImportError:
-        logging.info('@ Package "daal4py" was not found. Number of threads '
-                     'is being ignored')
-
-
 def prepare_daal_threads(num_threads=-1):
     try:
-        if num_threads > 0:
-            set_daal_num_threads(num_threads)
         import daal4py
+        if num_threads > 0:
+            daal4py.daalinit(nthreads=num_threads)
         num_threads = daal4py.num_threads()
     except ImportError:
+        logging.warning('@ Package "daal4py" was not found. Number of threads '
+                        'is being ignored')
         num_threads = 1
-
     return num_threads
 
 

daal4py_bench/requirements.txt

@@ -1,6 +1,2 @@
-scikit-learn < 1.1 # TODO: remove after scikit-learn-intelex release with fix
-pandas
-daal4py
-openpyxl
-tqdm
-requests
+daal4py==2023.0.0
+dpcpp-cpp-rt==2023.0.0

requirements-common.txt

@@ -0,0 +1,5 @@
+scikit-learn==1.2.0
+pandas==1.5.2
+openpyxl
+tqdm
+requests

sklearn_bench/requirements.txt

@@ -1,6 +1,2 @@
-scikit-learn < 1.1 # TODO: remove after scikit-learn-intelex release with fix
-pandas
-scikit-learn-intelex
-openpyxl
-tqdm
-requests
+scikit-learn-intelex==2023.0.0
+dpcpp-cpp-rt==2023.0.0

xgboost_bench/requirements.txt

@@ -1,6 +1 @@
-scikit-learn
-pandas
-xgboost
-openpyxl
-tqdm
-requests
+xgboost==1.7.2