fix dump-model-params for local_vars

scripts/dump-model-params.py

@@ -35,6 +35,7 @@ with tf.Graph().as_default() as G:
     init = get_model_loader(args.model)
     sess = tf.Session(config=tf.ConfigProto(allow_soft_placement=True))
     sess.run(tf.global_variables_initializer())
+    sess.run(tf.local_variables_initializer())
     init.init(sess)
 
     # dump ...
@@ -44,6 +45,8 @@ with tf.Graph().as_default() as G:
         else:
             var = tf.get_collection(tf.GraphKeys.TRAINABLE_VARIABLES)
             var.extend(tf.get_collection(tf.GraphKeys.MODEL_VARIABLES))
+            gvars = set([k.name for k in tf.global_variables()])
+            var = [v for v in var if v.name in gvars]
             var_dict = {}
             for v in var:
                 name = varmanip.get_savename_from_varname(v.name)

tensorpack/tfutils/varmanip.py

@@ -122,6 +122,8 @@ def dump_session_params(path):
     var.extend(tf.get_collection(tf.GraphKeys.MODEL_VARIABLES))
     # TODO dedup
     assert len(set(var)) == len(var), "TRAINABLE and MODEL variables have duplication!"
+    gvars = set([k.name for k in tf.global_variables()])
+    var = [v for v in var if v.name in gvars]
     result = {}
     for v in var:
         result[v.name] = v.eval()