Added version compatibility for sklearn 1.8+

Author: icarosadero

cebra/integrations/sklearn/utils.py

@@ -27,6 +27,9 @@
 
 import cebra.helper
 
+from packaging import version
+from sklearn import __version__ as sklearn_version
+
 
 def update_old_param(old: dict, new: dict, kwargs: dict, default) -> tuple:
     """Handle deprecated arguments of a function until they are replaced.
@@ -74,19 +77,35 @@ def check_input_array(X: npt.NDArray, *, min_samples: int) -> npt.NDArray:
     Returns:
         The converted and validated array.
     """
-    return sklearn_utils_validation.check_array(
-        X,
-        accept_sparse=False,
-        accept_large_sparse=False,
-        dtype=("float16", "float32", "float64"),
-        order=None,
-        copy=False,
-        ensure_all_finite=True,
-        ensure_2d=True,
-        allow_nd=False,
-        ensure_min_samples=min_samples,
-        ensure_min_features=1,
-    )
+
+    if sklearn_version < version.parse("1.8"):
+        return sklearn_utils_validation.check_array(
+            X,
+            accept_sparse=False,
+            accept_large_sparse=False,
+            dtype=("float16", "float32", "float64"),
+            order=None,
+            copy=False,
+            force_all_finite=True,
+            ensure_2d=True,
+            allow_nd=False,
+            ensure_min_samples=min_samples,
+            ensure_min_features=1,
+        )
+    else:
+        return sklearn_utils_validation.check_array(
+            X,
+            accept_sparse=False,
+            accept_large_sparse=False,
+            dtype=("float16", "float32", "float64"),
+            order=None,
+            copy=False,
+            ensure_all_finite=True,
+            ensure_2d=True,
+            allow_nd=False,
+            ensure_min_samples=min_samples,
+            ensure_min_features=1,
+        )
 
 
 def check_label_array(y: npt.NDArray, *, min_samples: int):
@@ -105,18 +124,32 @@ def check_label_array(y: npt.NDArray, *, min_samples: int):
     Returns:
         The converted and validated labels.
     """
-    return sklearn_utils_validation.check_array(
-        y,
-        accept_sparse=False,
-        accept_large_sparse=False,
-        dtype="numeric",
-        order=None,
-        copy=False,
-        ensure_all_finite=True,
-        ensure_2d=False,
-        allow_nd=False,
-        ensure_min_samples=min_samples,
-    )
+    if sklearn_version < version.parse("1.8"):
+        return sklearn_utils_validation.check_array(
+            y,
+            accept_sparse=False,
+            accept_large_sparse=False,
+            dtype="numeric",
+            order=None,
+            copy=False,
+            force_all_finite=True,
+            ensure_2d=False,
+            allow_nd=False,
+            ensure_min_samples=min_samples,
+        )
+    else:
+        return sklearn_utils_validation.check_array(
+            y,
+            accept_sparse=False,
+            accept_large_sparse=False,
+            dtype="numeric",
+            order=None,
+            copy=False,
+            ensure_all_finite=True,
+            ensure_2d=False,
+            allow_nd=False,
+            ensure_min_samples=min_samples,
+        )
 
 
 def check_device(device: str) -> str: