Minor bugs fixed

Author: DesmondYuan

pertbio/pertbio/train.py

@@ -98,15 +98,18 @@ def append_record(filename, contents):
         f.write('\n')
 
 
-def eval_model(sess, eval_iter, obj_fn, eval_dict):
+def eval_model(sess, eval_iter, obj_fn, eval_dict, return_avg=True):
     sess.run(eval_iter.initializer, feed_dict=eval_dict)
     eval_results = []
     while True:
         try:
             eval_results.append(sess.run(obj_fn, feed_dict=eval_dict))
         except OutOfRangeError:
             break
-    return np.mean(np.array(eval_results), axis=0)
+    if return_avg:
+        return np.mean(np.array(eval_results), axis=0)
+    else:
+        return np.vstack(eval_results)
 
 
 def train_model(model, args):
@@ -226,7 +229,7 @@ def screenshot(self, sess, model, substage_i, node_index, loss_min, args):
 
         if self.export_verbose > 1 or self.export_verbose == -1:  # no params but y_hat
             sess.run(model.iter_eval.initializer, feed_dict=model.args.feed_dicts['test_set'])
-            y_hat = sess.run(model.eval_yhat, feed_dict=model.args.feed_dicts['test_set'])
+            y_hat = eval_model(sess, model.iter_eval, model.eval_yhat, args.feed_dicts['test_set'], return_avg=False)
             y_hat = pd.DataFrame(y_hat, columns=node_index[0])
             self.update({'y_hat': y_hat})
 

scripts/main.py

@@ -22,7 +22,9 @@ def set_seed(in_seed):
 def prepare_workdir(in_cfg):
     # Read Data
     in_cfg.root_dir = os.getcwd()
-    in_cfg.node_index = pd.read_csv(in_cfg.node_index_file, header=None, names=None)
+    in_cfg.node_index = pd.read_csv(in_cfg.node_index_file, header=None, names=None) \
+        if hasattr(in_cfg, 'node_index_file') else pd.DataFrame(np.arange(in_cfg.n_x))
+
     in_cfg.loo = pd.read_csv("data/loo_label.csv", header=None)
 
     # Create Output Folder