Skip to content

Commit 2d5a942

Browse files
Use scipy's logsumexp function (#290)
Fixes gh-289
1 parent 8a02af7 commit 2d5a942

File tree

2 files changed

+6
-8
lines changed

2 files changed

+6
-8
lines changed

metric_learn/mlkr.py

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,16 +6,14 @@
66
import sys
77
import warnings
88
import numpy as np
9-
from sklearn.exceptions import ConvergenceWarning, ChangedBehaviorWarning
10-
from sklearn.utils.fixes import logsumexp
119
from scipy.optimize import minimize
10+
from scipy.special import logsumexp
1211
from sklearn.base import TransformerMixin
13-
12+
from sklearn.exceptions import ConvergenceWarning, ChangedBehaviorWarning
1413
from sklearn.metrics import pairwise_distances
1514

16-
from metric_learn._util import _check_n_components
1715
from .base_metric import MahalanobisMixin
18-
from ._util import _initialize_components
16+
from ._util import _initialize_components, _check_n_components
1917

2018
EPS = np.finfo(float).eps
2119

metric_learn/nca.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@
88
import sys
99
import numpy as np
1010
from scipy.optimize import minimize
11-
from sklearn.metrics import pairwise_distances
12-
from sklearn.exceptions import ConvergenceWarning, ChangedBehaviorWarning
13-
from sklearn.utils.fixes import logsumexp
11+
from scipy.special import logsumexp
1412
from sklearn.base import TransformerMixin
13+
from sklearn.exceptions import ConvergenceWarning, ChangedBehaviorWarning
14+
from sklearn.metrics import pairwise_distances
1515

1616
from ._util import _initialize_components, _check_n_components
1717
from .base_metric import MahalanobisMixin

0 commit comments

Comments
 (0)