fix loss info and typo (Closes GH-22).

config/baseline.yaml

@@ -23,11 +23,11 @@ evaluator_cfg:
       img_w: 64
 
 loss_cfg:
-  - loss_term_weights: 1.0
+  - loss_term_weight: 1.0
     margin: 0.2
     type: TripletLoss
     log_prefix: triplet
-  - loss_term_weights: 0.1
+  - loss_term_weight: 0.1
     scale: 16
     type: CrossEntropyLoss
     log_prefix: softmax

config/baseline_OUMVLP.yaml

@@ -23,11 +23,11 @@ evaluator_cfg:
   #     img_w: 128
 
 loss_cfg:
-  - loss_term_weights: 1.0
+  - loss_term_weight: 1.0
     margin: 0.2
     type: TripletLoss
     log_prefix: triplet
-  - loss_term_weights: 0.1
+  - loss_term_weight: 0.1
     scale: 16
     type: CrossEntropyLoss
     log_prefix: softmax

config/default.yaml

@@ -23,7 +23,7 @@ evaluator_cfg:
   metric: euc # cos
 
 loss_cfg:
-  loss_term_weights: 1.0
+  loss_term_weight: 1.0
   margin: 0.2
   type: TripletLoss
   log_prefix: triplet

config/gaitgl.yaml

@@ -19,11 +19,11 @@ evaluator_cfg:
     type: InferenceSampler
 
 loss_cfg:
-  - loss_term_weights: 1.0
+  - loss_term_weight: 1.0
     margin: 0.2
     type: TripletLoss
     log_prefix: triplet
-  - loss_term_weights: 1.0
+  - loss_term_weight: 1.0
     scale: 1
     type: CrossEntropyLoss
     log_accuracy: true

config/gaitgl_OUMVLP.yaml

@@ -19,11 +19,11 @@ evaluator_cfg:
     type: InferenceSampler
 
 loss_cfg:
-  - loss_term_weights: 1.0
+  - loss_term_weight: 1.0
     margin: 0.2
     type: TripletLoss
     log_prefix: triplet
-  - loss_term_weights: 1.0
+  - loss_term_weight: 1.0
     scale: 1
     type: CrossEntropyLoss
     log_accuracy: true

config/gaitpart.yaml

@@ -17,7 +17,7 @@ evaluator_cfg:
   metric: euc # cos
 
 loss_cfg:
-  loss_term_weights: 1.0
+  loss_term_weight: 1.0
   margin: 0.2
   type: TripletLoss
   log_prefix: triplet

config/gaitpart_OUMVLP.yaml

@@ -18,7 +18,7 @@ evaluator_cfg:
   metric: euc # cos
 
 loss_cfg:
-  loss_term_weights: 1.0
+  loss_term_weight: 1.0
   margin: 0.2
   type: TripletLoss
   log_prefix: triplet

config/gaitset.yaml

@@ -17,7 +17,7 @@ evaluator_cfg:
   metric: euc # cos
 
 loss_cfg:
-  loss_term_weights: 1.0
+  loss_term_weight: 1.0
   margin: 0.2
   type: TripletLoss
   log_prefix: triplet

config/gaitset_OUMVLP.yaml

@@ -18,7 +18,7 @@ evaluator_cfg:
   metric: euc # cos
 
 loss_cfg:
-  loss_term_weights: 1.0
+  loss_term_weight: 1.0
   margin: 0.2
   type: TripletLoss
   log_prefix: triplet

config/gln/gln_phase1.yaml

@@ -23,11 +23,11 @@ evaluator_cfg:
       type: BaseSilCuttingTransform
 
 loss_cfg:
-  - loss_term_weights: 1.0
+  - loss_term_weight: 1.0
     margin: 0.2
     type: TripletLoss
     log_prefix: triplet
-  # - loss_term_weights: 0.1
+  # - loss_term_weight: 0.1
   #   scale: 1
   #   type: CrossEntropyLoss
   #   log_prefix: softmax

config/gln/gln_phase2.yaml

@@ -22,11 +22,11 @@ evaluator_cfg:
       type: BaseSilCuttingTransform
 
 loss_cfg:
-  - loss_term_weights: 1.0
+  - loss_term_weight: 1.0
     margin: 0.2
     type: TripletLoss
     log_prefix: triplet
-  - loss_term_weights: 0.1
+  - loss_term_weight: 0.1
     scale: 16
     type: CrossEntropyLoss
     log_prefix: softmax

docs/1.detailed_config.md

@@ -16,7 +16,7 @@
 * Loss function
 >  * Args
 >     * type: Loss function type, support `TripletLoss` and `CrossEntropyLoss`.
->     * loss_term_weights: loss weight.
+>     * loss_term_weight: loss weight.
 >     * log_prefix: the prefix of loss log.
 
 ----
@@ -107,11 +107,11 @@ evaluator_cfg:
       img_w: 64
 
 loss_cfg:
-  - loss_term_weights: 1.0
+  - loss_term_weight: 1.0
     margin: 0.2
     type: TripletLoss
     log_prefix: triplet
-  - loss_term_weights: 0.1
+  - loss_term_weight: 0.1
     scale: 16
     type: CrossEntropyLoss
     log_prefix: softmax

lib/modeling/loss_aggregator.py

@@ -59,7 +59,7 @@ class LossAggregator():
                 loss, info = loss_func(**v)
                 for name, value in info.items():
                     loss_info['scalar/%s/%s' % (k, name)] = value
-                loss = loss.mean() * loss_func.loss_term_weights
+                loss = loss.mean() * loss_func.loss_term_weight
                 loss_sum += loss
 
             else:

lib/modeling/losses/base.py

@@ -29,14 +29,19 @@ class BaseLoss(nn.Module):
     """
     Base class for all losses.
 
-    Your loss should also subclass this class. 
+    Your loss should also subclass this class.
-
-    Attribute:
-        loss_term_weights: the weight of the loss.
-        info: the loss info.
     """
-    loss_term_weights = 1.0
+
-    info = Odict()
+    def __init__(self, loss_term_weight=1.0):
+        """
+        Initialize the base class.
+
+        Args:
+            loss_term_weight: the weight of the loss term.
+        """
+        super(BaseLoss, self).__init__()
+        self.loss_term_weight = loss_term_weight
+        self.info = Odict()
 
     def forward(self, logits, labels):
         """

lib/modeling/losses/softmax.py

@@ -5,15 +5,13 @@ from .base import BaseLoss
 
 
 class CrossEntropyLoss(BaseLoss):
-    def __init__(self, scale=2**4, label_smooth=True, eps=0.1, loss_term_weights=1.0, log_accuracy=False):
+    def __init__(self, scale=2**4, label_smooth=True, eps=0.1, loss_term_weight=1.0, log_accuracy=False):
-        super(CrossEntropyLoss, self).__init__()
+        super(CrossEntropyLoss, self).__init__(loss_term_weight)
         self.scale = scale
         self.label_smooth = label_smooth
         self.eps = eps
         self.log_accuracy = log_accuracy
 
-        self.loss_term_weights = loss_term_weights
-
     def forward(self, logits, labels):
         """
             logits: [n, p, c]

lib/modeling/losses/triplet.py

@@ -5,12 +5,10 @@ from .base import BaseLoss, gather_and_scale_wrapper
 
 
 class TripletLoss(BaseLoss):
-    def __init__(self, margin, loss_term_weights=1.0):
+    def __init__(self, margin, loss_term_weight=1.0):
-        super(TripletLoss, self).__init__()
+        super(TripletLoss, self).__init__(loss_term_weight)
         self.margin = margin
 
-        self.loss_term_weights = loss_term_weights
-
     @gather_and_scale_wrapper
     def forward(self, embeddings, labels):
         # embeddings: [n, p, c], label: [n]