fix res100 bug (#86)

* support res100

Author: GuoxiaWang

plsc/entry.py

@@ -162,6 +162,13 @@ def __init__(self):
         logger.info('default test period: {}'.format(self.test_period))
         logger.info('=' * 30)
 
+    def set_model_name(self, model_name):
+        """
+        Set model name, eg. "ResNet50", "ResNet101"
+        """
+        self.model_name = model_name
+        logger.info("Set model_name to {}.".format(model_name))
+
     def set_use_quant(self, quant):
         """
         Whether to use quantization
@@ -203,8 +210,9 @@ def set_val_targets(self, targets):
     def set_train_batch_size(self, batch_size):
         self.train_batch_size = batch_size
         self.global_train_batch_size = batch_size * self.num_trainers
-        logger.info("Set train batch size per trainer to {}.".format(
-            batch_size))
+        logger.info("Set train batch size per trainer to {}, global "
+                    "train batch size to {}.".format(
+                        batch_size, self.global_train_batch_size))
 
     def set_log_period(self, period):
         self.log_period = period
@@ -219,8 +227,8 @@ def set_lr_decay_factor(self, factor):
         logger.info("Set lr decay factor to {}.".format(factor))
 
     def set_step_boundaries(self, boundaries):
-        if not isinstance(boundaries, list):
-            raise ValueError("The parameter must be of type list.")
+        if not isinstance(boundaries, (tuple, list)):
+            raise ValueError("The parameter must be of type tuple or list.")
         self.lr_steps = boundaries
         logger.info("Set step boundaries to {}.".format(boundaries))
 

plsc/models/base_model.py

@@ -16,7 +16,7 @@
 
 import paddle
 from paddle.utils import unique_name
-from paddle.distributed.fleet.utils.plsc_util import class_center_sample
+from paddle.distributed.fleet.utils import class_center_sample
 
 from . import dist_algo
 

plsc/models/dist_algo.py

@@ -22,7 +22,7 @@
 import paddle.nn as nn
 import paddle.utils.unique_name as unique_name
 from paddle.optimizer import Optimizer
-from paddle.distributed.fleet.utils.plsc_util import class_center_sample
+from paddle.distributed.fleet.utils import class_center_sample
 from ..utils.fp16_utils import rewrite_program, update_role_var_grad
 from ..utils.fp16_utils import update_loss_scaling, move_optimize_ops_back, check_finite_and_unscale
 from ..utils.fp16_lists import AutoMixedPrecisionLists

plsc/models/resnet.py

@@ -16,7 +16,7 @@
 
 from .base_model import BaseModel
 
-__all__ = ["ResNet", "ResNet50", "ResNet101", "ResNet152"]
+__all__ = ["ResNet", "ResNet50", "ResNet100", "ResNet101", "ResNet152"]
 
 
 class ResNet(BaseModel):
@@ -184,6 +184,11 @@ def ResNet50(emb_dim=512):
     return model
 
 
+def ResNet100(emb_dim=512):
+    model = ResNet(layers=100, emb_dim=emb_dim)
+    return model
+
+
 def ResNet101(emb_dim=512):
     model = ResNet(layers=101, emb_dim=emb_dim)
     return model