Skip to content

Commit a7e4807

Browse files
author
William de Vazelhes
committed
find unique rows in a way compatible with numpy 1.12.1
1 parent 3acf31a commit a7e4807

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

metric_learn/itml.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ def _process_pairs(self, pairs, y, bounds):
6464
neg_pairs = neg_pairs[neg_no_ident]
6565
# init bounds
6666
if bounds is None:
67-
X = np.unique(pairs.reshape(-1, pairs.shape[2]), axis=0)
67+
X = np.vstack({tuple(row) for row in pairs.reshape(-1, pairs.shape[2])})
6868
self.bounds_ = np.percentile(pairwise_distances(X), (5, 95))
6969
else:
7070
assert len(bounds) == 2

metric_learn/lsml.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ def _prepare_quadruplets(self, quadruplets, weights):
5050
self.w_ = weights
5151
self.w_ /= self.w_.sum() # weights must sum to 1
5252
if self.prior is None:
53-
X = np.unique(pairs.reshape(-1, pairs.shape[2]), axis=0)
53+
X = np.vstack({tuple(row) for row in pairs.reshape(-1, pairs.shape[2])})
5454
self.prior_inv_ = np.atleast_2d(np.cov(X, rowvar=False))
5555
self.M_ = np.linalg.inv(self.prior_inv_)
5656
else:

metric_learn/sdml.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ def _prepare_pairs(self, pairs, y):
4747
ensure_2d=False, allow_nd=True)
4848
# set up prior M
4949
if self.use_cov:
50-
X = np.unique(pairs.reshape(-1, pairs.shape[2]), axis=0)
50+
X = np.vstack({tuple(row) for row in pairs.reshape(-1, pairs.shape[2])})
5151
self.M_ = pinvh(np.cov(X, rowvar = False))
5252
else:
5353
self.M_ = np.identity(pairs.shape[2])

0 commit comments

Comments
 (0)