Merge branch 'master' into data_parallel

# Conflicts:
#	models/model.py

1 files changed, 4 insertions, 3 deletions

diff --git a/utils/configuration.py b/utils/configuration.py
index 435d815..0f8d9ff 100644
--- a/utils/configuration.py
+++ b/utils/configuration.py
@@ -43,6 +43,8 @@ class ModelHPConfiguration(TypedDict):
     tfa_squeeze_ratio: int
     tfa_num_parts: int
     embedding_dims: int
+    triplet_is_hard: bool
+    triplet_is_mean: bool
     triplet_margins: tuple[float, float]
 
 
@@ -55,7 +57,6 @@ class SubOptimizerHPConfiguration(TypedDict):
 
 
 class OptimizerHPConfiguration(TypedDict):
-    start_iter: int
     lr: int
     betas: tuple[float, float]
     eps: float
@@ -68,8 +69,8 @@ class OptimizerHPConfiguration(TypedDict):
 
 
 class SchedulerHPConfiguration(TypedDict):
-    step_size: int
-    gamma: float
+    start_step: int
+    final_gamma: float
 
 
 class HyperparameterConfiguration(TypedDict):