Merge branch 'master' into python3.8

1 files changed, 4 insertions, 1 deletions

diff --git a/utils/triplet_loss.py b/utils/triplet_loss.py
index 77c7234..60faa0c 100644
--- a/utils/triplet_loss.py
+++ b/utils/triplet_loss.py
@@ -68,7 +68,10 @@ class BatchTripletLoss(nn.Module):
 
     @staticmethod
     def _all_distance(dist, y, p, n):
-        positive_mask = y.unsqueeze(1) == y.unsqueeze(2)
+        # Unmask identical samples
+        positive_mask = torch.eye(
+            n, dtype=torch.bool, device=y.device
+        ) ^ (y.unsqueeze(1) == y.unsqueeze(2))
         negative_mask = y.unsqueeze(1) != y.unsqueeze(2)
         all_positive = dist[positive_mask].view(p, n, -1, 1)
         all_negative = dist[negative_mask].view(p, n, 1, -1)