From bc4089d89bb377c99a2740116942c915ee51f4c9 Mon Sep 17 00:00:00 2001 From: SamvitJ Date: Mon, 10 Jun 2019 13:17:25 -0700 Subject: [PATCH] Rename preloaded model. --- dff_deeplab/config/config.py | 3 ++- dff_deeplab/train_end2end.py | 10 +++++----- .../cfgs/accel_101_cityscapes_end2end_ohem.yaml | 2 +- .../cfgs/accel_18_cityscapes_end2end_ohem.yaml | 2 +- .../cfgs/accel_34_cityscapes_end2end_ohem.yaml | 2 +- .../cfgs/accel_50_cityscapes_end2end_ohem.yaml | 2 +- 6 files changed, 11 insertions(+), 10 deletions(-) diff --git a/dff_deeplab/config/config.py b/dff_deeplab/config/config.py index 9fdf74f..f682b46 100644 --- 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 index 759de4e..8539a93 100644 --- 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 index 244b737..7f2b128 100644 --- 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 index b8e0f5c..966e95f 100644 --- 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 index 5aa770e..d66b2ba 100644 --- 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 index 5f791e1..447df61 100644 --- 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: