Update for function input validation (#1347)

* Update for function input validation * Add sklearn 1.3 version to CI matrix
intel · Jun 30, 2023 · c40bdda · c40bdda
1 parent 40ccd1c
commit c40bdda
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 9 deletions.
diff --git a/.ci/pipeline/ci.yml b/.ci/pipeline/ci.yml
@@ -78,6 +78,9 @@ jobs:
       Python3.11_Sklearn1.2:
         PYTHON_VERSION: '3.11'
         SKLEARN_VERSION: '1.2'
+      Python3.11_Sklearn1.3:
+        PYTHON_VERSION: '3.11'
+        SKLEARN_VERSION: '1.3'
   pool:
     vmImage: 'ubuntu-22.04'
   steps:
@@ -101,6 +104,9 @@ jobs:
       Python3.11_Sklearn1.2:
         PYTHON_VERSION: '3.11'
         SKLEARN_VERSION: '1.2'
+      Python3.11_Sklearn1.3:
+        PYTHON_VERSION: '3.11'
+        SKLEARN_VERSION: '1.3'
   pool:
     vmImage: 'macos-12'
   steps:
@@ -124,6 +130,9 @@ jobs:
       Python3.11_Sklearn1.2:
         PYTHON_VERSION: '3.11'
         SKLEARN_VERSION: '1.2'
+      Python3.11_Sklearn1.3:
+        PYTHON_VERSION: '3.11'
+        SKLEARN_VERSION: '1.3'
   pool:
     vmImage: 'windows-latest'
   steps:

diff --git a/daal4py/sklearn/metrics/_pairwise.py b/daal4py/sklearn/metrics/_pairwise.py
@@ -222,14 +222,12 @@ def pairwise_distances(X, Y=None, metric="euclidean", n_jobs=None,
 
 
 if sklearn_check_version('1.3'):
-    validation_kwargs = {'prefer_skip_nested_validation': True} \
-        if sklearn_check_version('1.4') else {}
     pairwise_distances = validate_params(
         {
             "X": ["array-like", "sparse matrix"],
             "Y": ["array-like", "sparse matrix", None],
             "metric": [StrOptions(set(_VALID_METRICS) | {"precomputed"}), callable],
             "n_jobs": [Integral, None],
             "force_all_finite": ["boolean", StrOptions({"allow-nan"})],
-        }, **validation_kwargs
+        }, prefer_skip_nested_validation=True
     )(pairwise_distances)
diff --git a/daal4py/sklearn/metrics/_ranking.py b/daal4py/sklearn/metrics/_ranking.py
@@ -183,8 +183,6 @@ def roc_auc_score(
 
 
 if sklearn_check_version('1.3'):
-    validation_kwargs = {'prefer_skip_nested_validation': True} \
-        if sklearn_check_version('1.4') else {}
     roc_auc_score = validate_params(
         {
             "y_true": ["array-like"],
@@ -194,5 +192,5 @@ def roc_auc_score(
             "max_fpr": [Interval(Real, 0.0, 1, closed="right"), None],
             "multi_class": [StrOptions({"raise", "ovr", "ovo"})],
             "labels": ["array-like", None],
-        }, **validation_kwargs
+        }, prefer_skip_nested_validation=True
     )(roc_auc_score)
diff --git a/daal4py/sklearn/model_selection/_split.py b/daal4py/sklearn/model_selection/_split.py
@@ -258,8 +258,6 @@ def train_test_split(*arrays, **options):
 
 
 if sklearn_check_version('1.3'):
-    validation_kwargs = {'prefer_skip_nested_validation': True} \
-        if sklearn_check_version('1.4') else {}
     train_test_split = validate_params({
         "test_size": [
             Interval(RealNotInt, 0, 1, closed="neither"),
@@ -274,4 +272,4 @@ def train_test_split(*arrays, **options):
         "random_state": ["random_state"],
         "shuffle": ["boolean"],
         "stratify": ["array-like", None],
-    }, **validation_kwargs)(train_test_split)
+    }, prefer_skip_nested_validation=True)(train_test_split)