MAINT Use _VALID_METRICS for PairwiseDistancesReductions

jjerphan · jeremiedbb · jjerphan · commit f9beef19ec22 · 2022-10-28T16:35:08.000+02:00
Co-authored-by: Jérémie du Boisberranger &lt;jeremiedbb@users.noreply.github.com&gt;
diff --git a/sklearn/metrics/_pairwise_distances_reduction/__init__.py b/sklearn/metrics/_pairwise_distances_reduction/__init__.py
@@ -91,11 +91,13 @@
     ArgKmin,
     RadiusNeighbors,
     sqeuclidean_row_norms,
+    _VALID_METRICS,
 )
 
 __all__ = [
     "BaseDistancesReductionDispatcher",
     "ArgKmin",
     "RadiusNeighbors",
     "sqeuclidean_row_norms",
+    "_VALID_METRICS",
 ]
diff --git a/sklearn/metrics/_pairwise_distances_reduction/_dispatcher.py b/sklearn/metrics/_pairwise_distances_reduction/_dispatcher.py
@@ -6,7 +6,7 @@
 
 from scipy.sparse import isspmatrix_csr
 
-from .._dist_metrics import BOOL_METRICS, METRIC_MAPPING
+from .._dist_metrics import BOOL_METRICS
 
 from ._base import (
     _sqeuclidean_row_norms64,
@@ -23,6 +23,36 @@
 
 from ... import get_config
 
+_VALID_METRICS = [
+    "euclidean",
+    "l2",
+    "l1",
+    "manhattan",
+    "cityblock",
+    "braycurtis",
+    "canberra",
+    "chebyshev",
+    "correlation",
+    "cosine",
+    "dice",
+    "hamming",
+    "jaccard",
+    "kulsinski",
+    "mahalanobis",
+    "matching",
+    "minkowski",
+    "rogerstanimoto",
+    "russellrao",
+    "seuclidean",
+    "sokalmichener",
+    "sokalsneath",
+    "sqeuclidean",
+    "yule",
+    "wminkowski",
+    "nan_euclidean",
+    "haversine",
+]
+
 
 def sqeuclidean_row_norms(X, num_threads):
     """Compute the squared euclidean norm of the rows of X in parallel.
@@ -73,7 +103,7 @@ def valid_metrics(cls) -> List[str]:
             "hamming",
             *BOOL_METRICS,
         }
-        return sorted(({"sqeuclidean"} | set(METRIC_MAPPING.keys())) - excluded)
+        return sorted(set(_VALID_METRICS) - excluded)
 
     @classmethod
     def is_usable_for(cls, X, Y, metric) -> bool:
diff --git a/sklearn/metrics/pairwise.py b/sklearn/metrics/pairwise.py
@@ -30,7 +30,7 @@
 from ..utils.fixes import delayed
 from ..utils.fixes import sp_version, parse_version
 
-from ._pairwise_distances_reduction import ArgKmin
+from ._pairwise_distances_reduction import ArgKmin, _VALID_METRICS
 from ._pairwise_fast import _chi2_kernel_fast, _sparse_manhattan
 from ..exceptions import DataConversionWarning
 
@@ -1619,36 +1619,6 @@ def _pairwise_callable(X, Y, metric, force_all_finite=True, **kwds):
     return out
 
 
-_VALID_METRICS = [
-    "euclidean",
-    "l2",
-    "l1",
-    "manhattan",
-    "cityblock",
-    "braycurtis",
-    "canberra",
-    "chebyshev",
-    "correlation",
-    "cosine",
-    "dice",
-    "hamming",
-    "jaccard",
-    "kulsinski",
-    "mahalanobis",
-    "matching",
-    "minkowski",
-    "rogerstanimoto",
-    "russellrao",
-    "seuclidean",
-    "sokalmichener",
-    "sokalsneath",
-    "sqeuclidean",
-    "yule",
-    "wminkowski",
-    "nan_euclidean",
-    "haversine",
-]
-
 _NAN_METRICS = ["nan_euclidean"]
 
 

Original file line number	Diff line number	Diff line change
`@@ -91,11 +91,13 @@`
`91`	`91`	`ArgKmin,`
`92`	`92`	`RadiusNeighbors,`
`93`	`93`	`sqeuclidean_row_norms,`
	`94`	`+ _VALID_METRICS,`
`94`	`95`	`)`
`95`	`96`
`96`	`97`	`__all__ = [`
`97`	`98`	`"BaseDistancesReductionDispatcher",`
`98`	`99`	`"ArgKmin",`
`99`	`100`	`"RadiusNeighbors",`
`100`	`101`	`"sqeuclidean_row_norms",`
	`102`	`+ "_VALID_METRICS",`
`101`	`103`	`]`