Numpy versions change; in-function imports removal; load_boston removal (#1041)

Author: Alexsandruss

daal4py/sklearn/_utils.py

@@ -16,6 +16,8 @@
 
 import numpy as np
 import sys
+import os
+import warnings
 
 from daal4py import _get__daal_link_version__ as dv
 from sklearn import __version__ as sklearn_version
@@ -25,10 +27,21 @@
     from distutils.version import LooseVersion as Version
 import logging
 
+try:
+    from pandas import DataFrame
+    from pandas.core.dtypes.cast import find_common_type
+    pandas_is_imported = True
+except (ImportError, ModuleNotFoundError):
+    pandas_is_imported = False
+
+try:
+    from daal4py.oneapi import is_in_sycl_ctxt as is_in_ctx
+    ctx_imported = True
+except (ImportError, ModuleNotFoundError):
+    ctx_imported = False
+
 
 def set_idp_sklearn_verbose():
-    import warnings
-    import os
     logLevel = os.environ.get("IDP_SKLEARN_VERBOSE")
     try:
         if logLevel is not None:
@@ -79,14 +92,10 @@ def parse_dtype(dt):
 
 
 def getFPType(X):
-    try:
-        from pandas import DataFrame
-        from pandas.core.dtypes.cast import find_common_type
+    if pandas_is_imported:
         if isinstance(X, DataFrame):
             dt = find_common_type(X.dtypes.tolist())
             return parse_dtype(dt)
-    except ImportError:
-        pass
 
     dt = getattr(X, 'dtype', None)
     return parse_dtype(dt)
@@ -128,26 +137,24 @@ def get_patch_message(s):
 
 
 def is_in_sycl_ctxt():
-    try:
-        from daal4py.oneapi import is_in_sycl_ctxt as is_in_ctx
+    if ctx_imported:
         return is_in_ctx()
-    except ModuleNotFoundError:
+    else:
         return False
 
 
 def is_DataFrame(X):
-    try:
+    if pandas_is_imported:
         from pandas import DataFrame
         return isinstance(X, DataFrame)
-    except ImportError:
+    else:
         return False
 
 
 def get_dtype(X):
-    try:
-        from pandas.core.dtypes.cast import find_common_type
+    if pandas_is_imported:
         return find_common_type(list(X.dtypes)) if is_DataFrame(X) else X.dtype
-    except ImportError:
+    else:
         return getattr(X, "dtype", None)
 
 

requirements-dev.txt

@@ -1,8 +1,8 @@
 Cython==0.29.24 ; python_version <= '3.9'
 Cython==0.29.25 ; python_version >= '3.10'
 Jinja2==3.0.3
-numpy==1.21.0 ; python_version <= '3.8'
-numpy==1.19.3 ; python_version == '3.9'
-numpy==1.22.0 ; python_version >= '3.10'
+numpy==1.19.5 ; python_version == '3.6'
+numpy==1.21.6 ; python_version == '3.7'
+numpy==1.23.2 ; python_version >= '3.8'
 pybind11==2.8.0
 cmake==3.21.3

sklearnex/tests/test_run_to_run_stability_tests.py

@@ -32,8 +32,8 @@
 from sklearn.manifold import TSNE
 from sklearn.model_selection import train_test_split
 
-from sklearn.datasets import (make_classification, load_breast_cancer,
-                              load_diabetes, load_iris, load_boston)
+from sklearn.datasets import (make_classification, make_regression,
+                              load_breast_cancer, load_diabetes, load_iris)
 from sklearn.metrics import pairwise_distances, roc_auc_score
 from scipy import sparse
 from daal4py.sklearn._utils import daal_check_version
@@ -113,7 +113,8 @@ def _run_test(model, methods, dataset):
             X2 = sparse.csr_matrix(X2)
         datasets.append((X2, y2))
     elif dataset == 'regression':
-        X1, y1 = load_boston(return_X_y=True)
+        X1, y1 = make_regression(n_samples=500, n_features=10,
+                                 noise=64.0, random_state=42)
         datasets.append((X1, y1))
         X2, y2 = load_diabetes(return_X_y=True)
         datasets.append((X2, y2))