Merge branch 'master' into python3.8

# Conflicts:
#	models/model.py
#	utils/configuration.py
#	utils/triplet_loss.py

1 files changed, 4 insertions, 2 deletions

diff --git a/config.py b/config.py
index 03f2f0d..f76cea5 100644
--- a/config.py
+++ b/config.py
@@ -63,8 +63,10 @@ config: Configuration = {
             'tfa_num_parts': 16,
             # Embedding dimension for each part
             'embedding_dims': 256,
-            # Triplet loss margins for HPM and PartNet
-            'triplet_margins': (1.5, 1.5),
+            # Batch Hard or Batch All
+            'triplet_is_hard': True,
+            # Triplet loss margins for HPM and PartNet, None for soft margin
+            'triplet_margins': None,
         },
         'optimizer': {
             # Global parameters