From b70a0f9b2b21aa121f15cd731f49f49d9aa80ef0 Mon Sep 17 00:00:00 2001
From: Bai Yifan <me@ethanbai.com>
Date: Thu, 13 Feb 2020 17:02:05 +0800
Subject: [PATCH] fix slim distillation load params (#233)

---
 slim/distillation/distill.py | 38 +++++++++++++++++-------------------
 1 file changed, 18 insertions(+), 20 deletions(-)

diff --git a/slim/distillation/distill.py b/slim/distillation/distill.py
index cbc9b823d..136507f6d 100644
--- a/slim/distillation/distill.py
+++ b/slim/distillation/distill.py
@@ -156,26 +156,7 @@ def main():
     train_fetches = model.train(train_feed_vars)
     loss = train_fetches['loss']
 
-    fuse_bn = getattr(model.backbone, 'norm_type', None) == 'affine_channel'
-    ignore_params = cfg.finetune_exclude_pretrained_params \
-                 if 'finetune_exclude_pretrained_params' in cfg else []
     start_iter = 0
-    if FLAGS.resume_checkpoint:
-        checkpoint.load_checkpoint(exe,
-                                   fluid.default_main_program(),
-                                   FLAGS.resume_checkpoint)
-        start_iter = checkpoint.global_step()
-    elif cfg.pretrain_weights and fuse_bn and not ignore_params:
-        checkpoint.load_and_fusebn(exe,
-                                   fluid.default_main_program(),
-                                   cfg.pretrain_weights)
-    elif cfg.pretrain_weights:
-        checkpoint.load_params(
-            exe,
-            fluid.default_main_program(),
-            cfg.pretrain_weights,
-            ignore_params=ignore_params)
-
     train_reader = create_reader(cfg.TrainReader, (cfg.max_iters - start_iter) *
                                  devices_num, cfg)
     train_loader.set_sample_list_generator(train_reader, place)
@@ -283,11 +264,28 @@ def main():
     opt.minimize(loss)
 
     exe.run(fluid.default_startup_program())
+    fuse_bn = getattr(model.backbone, 'norm_type', None) == 'affine_channel'
+    ignore_params = cfg.finetune_exclude_pretrained_params \
+                 if 'finetune_exclude_pretrained_params' in cfg else []
+    if FLAGS.resume_checkpoint:
+        checkpoint.load_checkpoint(exe,
+                                   fluid.default_main_program(),
+                                   FLAGS.resume_checkpoint)
+        start_iter = checkpoint.global_step()
+    elif cfg.pretrain_weights and fuse_bn and not ignore_params:
+        checkpoint.load_and_fusebn(exe,
+                                   fluid.default_main_program(),
+                                   cfg.pretrain_weights)
+    elif cfg.pretrain_weights:
+        checkpoint.load_params(
+            exe,
+            fluid.default_main_program(),
+            cfg.pretrain_weights,
+            ignore_params=ignore_params)
 
     build_strategy = fluid.BuildStrategy()
     build_strategy.fuse_all_reduce_ops = False
     build_strategy.fuse_all_optimizer_ops = False
-    build_strategy.fuse_elewise_add_act_ops = True
     # only enable sync_bn in multi GPU devices
     sync_bn = getattr(model.backbone, 'norm_type', None) == 'sync_bn'
     build_strategy.sync_batch_norm = sync_bn and devices_num > 1 \
-- 
GitLab