Merge branch 'main' into samples

adam2392 · web-flow · commit 9cc76c7ff32d · 2022-11-22T21:27:09.000-05:00
diff --git a/setup.py b/setup.py
@@ -70,6 +70,7 @@
 USE_NEWEST_NUMPY_C_API = (
     "sklearn.__check_build._check_build",
     "sklearn._loss._loss",
+    "sklearn.cluster._dbscan_inner",
     "sklearn.cluster._k_means_common",
     "sklearn.cluster._k_means_lloyd",
     "sklearn.cluster._k_means_elkan",
diff --git a/sklearn/cluster/_dbscan_inner.pyx b/sklearn/cluster/_dbscan_inner.pyx
@@ -7,12 +7,11 @@ cimport numpy as cnp
 
 cnp.import_array()
 
-
-def dbscan_inner(cnp.ndarray[cnp.uint8_t, ndim=1, mode='c'] is_core,
-                 cnp.ndarray[object, ndim=1] neighborhoods,
-                 cnp.ndarray[cnp.npy_intp, ndim=1, mode='c'] labels):
+def dbscan_inner(const cnp.uint8_t[::1] is_core,
+                 object[:] neighborhoods,
+                 cnp.npy_intp[::1] labels):
     cdef cnp.npy_intp i, label_num = 0, v
-    cdef cnp.ndarray[cnp.npy_intp, ndim=1] neighb
+    cdef cnp.npy_intp[:] neighb
     cdef vector[cnp.npy_intp] stack
 
     for i in range(labels.shape[0]):
diff --git a/sklearn/metrics/_classification.py b/sklearn/metrics/_classification.py
@@ -40,6 +40,7 @@
 from ..utils.multiclass import type_of_target
 from ..utils.validation import _num_samples
 from ..utils.sparsefuncs import count_nonzero
+from ..utils._param_validation import validate_params
 from ..exceptions import UndefinedMetricWarning
 
 from ._base import _check_pos_label_consistency
@@ -142,6 +143,14 @@ def _weighted_sum(sample_score, sample_weight, normalize=False):
         return sample_score.sum()
 
 
+@validate_params(
+    {
+        "y_true": ["array-like", "sparse matrix"],
+        "y_pred": ["array-like", "sparse matrix"],
+        "normalize": ["boolean"],
+        "sample_weight": ["array-like", None],
+    }
+)
 def accuracy_score(y_true, y_pred, *, normalize=True, sample_weight=None):
     """Accuracy classification score.
 
diff --git a/sklearn/tests/test_public_functions.py b/sklearn/tests/test_public_functions.py
@@ -11,6 +11,7 @@
 PARAM_VALIDATION_FUNCTION_LIST = [
     "sklearn.cluster.kmeans_plusplus",
     "sklearn.svm.l1_min_c",
+    "sklearn.metrics.accuracy_score",
 ]
 
 

Original file line number	Diff line number	Diff line change
`@@ -11,6 +11,7 @@`
`11`	`11`	`PARAM_VALIDATION_FUNCTION_LIST = [`
`12`	`12`	`"sklearn.cluster.kmeans_plusplus",`
`13`	`13`	`"sklearn.svm.l1_min_c",`
	`14`	`+ "sklearn.metrics.accuracy_score",`
`14`	`15`	`]`
`15`	`16`
`16`	`17`