Rename preloaded model.

SamvitJ · Jun 10, 2019 · bc4089d · bc4089d
1 parent 4424d1f
commit bc4089d
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 10 deletions.
diff --git a/dff_deeplab/config/config.py b/dff_deeplab/config/config.py
@@ -26,7 +26,8 @@
 # network related params
 config.network = edict()
 config.network.pretrained = ''
-config.network.pretrained_flow = ''
+config.network.pretrained_base = ''
+config.network.pretrained_ec = ''
 config.network.pretrained_epoch = 0
 config.network.PIXEL_MEANS = np.array([0, 0, 0])
 config.network.IMAGE_STRIDE = 0

diff --git a/dff_deeplab/train_end2end.py b/dff_deeplab/train_end2end.py
@@ -49,7 +49,7 @@ def parse_args():
 from utils.lr_scheduler import WarmupMultiFactorScheduler
 
 
-def train_net(args, ctx, pretrained, pretrained_flow, pretrained_ec, epoch, prefix, begin_epoch, end_epoch, lr, lr_step):
+def train_net(args, ctx, pretrained, pretrained_base, pretrained_ec, epoch, prefix, begin_epoch, end_epoch, lr, lr_step):
     logger, final_output_path = create_logger(config.output_path, args.cfg, config.dataset.image_set)
     prefix = os.path.join(final_output_path, prefix)
 
@@ -95,9 +95,9 @@ def train_net(args, ctx, pretrained, pretrained_flow, pretrained_ec, epoch, pref
     else:
         print pretrained
         arg_params, aux_params = load_param(pretrained, epoch, convert=True)
-        arg_params_flow, aux_params_flow = load_param(pretrained_flow, epoch, convert=True)
-        arg_params.update(arg_params_flow)
-        aux_params.update(aux_params_flow)
+        arg_params_base, aux_params_base = load_param(pretrained_base, epoch, convert=True)
+        arg_params.update(arg_params_base)
+        aux_params.update(aux_params_base)
         arg_params_ec, aux_params_ec = load_param(pretrained_ec, epoch, convert=True, argprefix=config.TRAIN.arg_prefix)
         arg_params.update(arg_params_ec)
         aux_params.update(aux_params_ec)
@@ -162,7 +162,7 @@ def train_net(args, ctx, pretrained, pretrained_flow, pretrained_ec, epoch, pref
 def main():
     print('Called with argument:', args)
     ctx = [mx.gpu(int(i)) for i in config.gpus.split(',')]
-    train_net(args, ctx, config.network.pretrained, config.network.pretrained_flow, config.network.pretrained_ec, config.network.pretrained_epoch, config.TRAIN.model_prefix,
+    train_net(args, ctx, config.network.pretrained, config.network.pretrained_base, config.network.pretrained_ec, config.network.pretrained_epoch, config.TRAIN.model_prefix,
               config.TRAIN.begin_epoch, config.TRAIN.end_epoch, config.TRAIN.lr, config.TRAIN.lr_step)
 
 if __name__ == '__main__':

diff --git a/experiments/dff_deeplab/cfgs/accel_101_cityscapes_end2end_ohem.yaml b/experiments/dff_deeplab/cfgs/accel_101_cityscapes_end2end_ohem.yaml
@@ -11,7 +11,7 @@ default:
   kvstore: device
 network:
   pretrained: "./model/rfcn_dff_flownet_vid"
-  pretrained_flow: "./model/pretrained/deeplab-101"
+  pretrained_base: "./model/pretrained/deeplab-101"
   pretrained_ec: "./model/pretrained/deeplab-101"
   pretrained_epoch: 0
   PIXEL_MEANS:

diff --git a/experiments/dff_deeplab/cfgs/accel_18_cityscapes_end2end_ohem.yaml b/experiments/dff_deeplab/cfgs/accel_18_cityscapes_end2end_ohem.yaml
@@ -11,7 +11,7 @@ default:
   kvstore: device
 network:
   pretrained: "./model/rfcn_dff_flownet_vid"
-  pretrained_flow: "./model/pretrained/deeplab-101"
+  pretrained_base: "./model/pretrained/deeplab-101"
   pretrained_ec: "./model/pretrained/deeplab-18"
   pretrained_epoch: 0
   PIXEL_MEANS:

diff --git a/experiments/dff_deeplab/cfgs/accel_34_cityscapes_end2end_ohem.yaml b/experiments/dff_deeplab/cfgs/accel_34_cityscapes_end2end_ohem.yaml
@@ -11,7 +11,7 @@ default:
   kvstore: device
 network:
   pretrained: "./model/rfcn_dff_flownet_vid"
-  pretrained_flow: "./model/pretrained/deeplab-101"
+  pretrained_base: "./model/pretrained/deeplab-101"
   pretrained_ec: "./model/pretrained/deeplab-34"
   pretrained_epoch: 0
   PIXEL_MEANS:

diff --git a/experiments/dff_deeplab/cfgs/accel_50_cityscapes_end2end_ohem.yaml b/experiments/dff_deeplab/cfgs/accel_50_cityscapes_end2end_ohem.yaml
@@ -11,7 +11,7 @@ default:
   kvstore: device
 network:
   pretrained: "./model/rfcn_dff_flownet_vid"
-  pretrained_flow: "./model/pretrained/deeplab-101"
+  pretrained_base: "./model/pretrained/deeplab-101"
   pretrained_ec: "./model/pretrained/deeplab-50"
   pretrained_epoch: 0
   PIXEL_MEANS: