summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarc Glisse <marc.glisse@inria.fr>2022-11-18 15:55:31 +0100
committerMarc Glisse <marc.glisse@inria.fr>2022-11-18 15:55:31 +0100
commit78533374f5255a601e4e12edf28ca8b51b93f016 (patch)
tree0f1ea2d5147c3143c38b56a397d69782c2923c01
parent94e2b090219233be602ed9a59994c2aced288b3a (diff)
sklearn's DistanceMetric has moved
-rw-r--r--src/python/gudhi/representations/vector_methods.py7
1 files changed, 6 insertions, 1 deletions
diff --git a/src/python/gudhi/representations/vector_methods.py b/src/python/gudhi/representations/vector_methods.py
index a169aee8..d52185ef 100644
--- a/src/python/gudhi/representations/vector_methods.py
+++ b/src/python/gudhi/representations/vector_methods.py
@@ -13,8 +13,13 @@ import numpy as np
from sklearn.base import BaseEstimator, TransformerMixin
from sklearn.exceptions import NotFittedError
from sklearn.preprocessing import MinMaxScaler, MaxAbsScaler
-from sklearn.neighbors import DistanceMetric
from sklearn.metrics import pairwise
+try:
+ # New location since 1.0
+ from sklearn.metrics import DistanceMetric
+except ImportError:
+ # Will be removed in 1.3
+ from sklearn.neighbors import DistanceMetric
from .preprocessing import DiagramScaler, BirthPersistenceTransform