Merge branch 'defaultrunconfig' into predict

bob/learn/tensorflow/examples/mnist/mnist_config.py

@@ -17,9 +17,8 @@ from __future__ import absolute_import
 from __future__ import division
 from __future__ import print_function
 
-# by default create reproducible nets:
+# create reproducible nets:
 from bob.learn.tensorflow.utils.reproducible import run_config
-# utils.reproducible import run_config
 import tensorflow as tf
 from bob.db.mnist import Database
 

bob/learn/tensorflow/script/eval_generic.py

@@ -63,7 +63,7 @@ def main(argv=None):
     model_fn = config.model_fn
     eval_input_fn = config.eval_input_fn
 
-    eval_interval_secs = getattr(config, 'eval_interval_secs', 300)
+    eval_interval_secs = getattr(config, 'eval_interval_secs', 60)
     run_once = getattr(config, 'run_once', False)
     run_config = getattr(config, 'run_config', None)
     model_params = getattr(config, 'model_params', None)
@@ -75,7 +75,7 @@ def main(argv=None):
     nn = tf.estimator.Estimator(model_fn=model_fn, model_dir=model_dir,
                                 params=model_params, config=run_config)
     if name:
-        real_name = name + '_eval'
+        real_name = 'eval_' + name
     else:
         real_name = 'eval'
     evaluated_file = os.path.join(nn.model_dir, real_name, 'evaluated')
@@ -91,7 +91,12 @@ def main(argv=None):
             continue
 
         for checkpoint_path in ckpt.all_model_checkpoint_paths:
-            global_step = str(get_global_step(checkpoint_path))
+            try:
+                global_step = str(get_global_step(checkpoint_path))
+            except Exception:
+                print('Failed to find global_step for checkpoint_path {}, '
+                      'skipping ...'.format(checkpoint_path))
+                continue
             if global_step in evaluated_steps:
                 continue
 

bob/learn/tensorflow/script/train_generic.py

@@ -66,9 +66,7 @@ def main(argv=None):
 
     if run_config is None:
         # by default create reproducible nets:
-        from bob.learn.tensorflow.utils.reproducible import session_conf
-        run_config = tf.estimator.RunConfig()
-        run_config.replace(session_config=session_conf)
+        from bob.learn.tensorflow.utils.reproducible import run_config
 
     # Instantiate Estimator
     nn = tf.estimator.Estimator(model_fn=model_fn, model_dir=model_dir,