Update circlemargin.py

ppcls/arch/gears/circlemargin.py

@@ -28,7 +28,7 @@ class CircleMargin(nn.Layer):
 
         weight_attr = paddle.ParamAttr(
             initializer=paddle.nn.initializer.XavierNormal())
-        self.fc0 = paddle.nn.Linear(
+        self.fc = paddle.nn.Linear(
             self.embedding_size, self.class_num, weight_attr=weight_attr)
 
     def forward(self, input, label):
@@ -36,19 +36,22 @@ class CircleMargin(nn.Layer):
             paddle.sum(paddle.square(input), axis=1, keepdim=True))
         input = paddle.divide(input, feat_norm)
 
-        weight = self.fc0.weight
+        weight = self.fc.weight
         weight_norm = paddle.sqrt(
             paddle.sum(paddle.square(weight), axis=0, keepdim=True))
         weight = paddle.divide(weight, weight_norm)
 
         logits = paddle.matmul(input, weight)
+        if not self.training or label is None:
+            return logits
 
         alpha_p = paddle.clip(-logits.detach() + 1 + self.margin, min=0.)
         alpha_n = paddle.clip(logits.detach() + self.margin, min=0.)
         delta_p = 1 - self.margin
         delta_n = self.margin
-        index = paddle.fluid.layers.where(label != -1).reshape([-1])
+        
         m_hot = F.one_hot(label.reshape([-1]), num_classes=logits.shape[1])
+        
         logits_p = alpha_p * (logits - delta_p)
         logits_n = alpha_n * (logits - delta_n)
         pre_logits = logits_p * m_hot + logits_n * (1 - m_hot)