X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;ds=inline;f=t%2Fmoe%2Feval.py;h=3e22c82653f1b7340cdc498c7290f4ee835a27ea;hb=258204ca478a8e8c180931575e1cd0748f677e8c;hp=f19df47366244f7ecf4b072b57f3f9243e7d1a3b;hpb=a249fb797c925052e3ad692d887eb2004d66c455;p=moe.git

diff --git a/t/moe/eval.py b/t/moe/eval.py
index f19df47..3e22c82 100644
--- a/t/moe/eval.py
+++ b/t/moe/eval.py
@@ -6,7 +6,6 @@ import moe.box
 import moe.log
 import moe.status
 import moe.pipeline
-import moe.batch
 import moe.util
 import os.path
 import shutil
@@ -20,7 +19,7 @@ class Eval:
 	self.config = moe.config.ConfigTree()
 	self.main_pipe = moe.pipeline.Pipeline(self, "main")
 	self.test_pipe = moe.pipeline.Pipeline(self, "test")
-	self.status = moe.status.MoeStatus()
+	self.status = moe.status.Status()
 
     def __getitem__(self, key):
 	return self.config[key]
@@ -52,10 +51,10 @@ class Eval:
 	self.debug_dump_config()
 
 	# insert hooks into main pipeline
-	self.main_pipe.insert(5, "Eval.hook_init_dirs", hook_init_dirs)
-	self.main_pipe.insert(15, "Eval.hook_load_task_config", hook_load_task_config)
-	self.main_pipe.insert(20, "Eval.hook_init_tasktype", hook_init_tasktype)
-	self.main_pipe.insert(90, "Eval.hook_write_metadata", hook_write_metadata)
+	self.main_pipe.insert(5, hook_init_dirs, "Initialize working directories")
+	self.main_pipe.insert(15, hook_load_task_config, "Load task config")
+	self.main_pipe.insert(20, hook_init_tasktype, "Load tasktype module")
+	self.main_pipe.insert(90, hook_write_metadata, "Write final metadata file")
 
 	# ininialize extensions (let them insert hooks) 
 	self.config.fix('EXTENSIONS')
@@ -80,17 +79,23 @@ class Eval:
     def debug_dump_config(self):
 	"Dumps config at level DDEBUG (only compiles the dump if main level is low enough)."
 	if self.log.level <= 5:
-	    self.log.ddebug('****** Config dump: ******')
-	    self.log.ddebug('\n'.join(self.config.dump('*  ')))
-	    self.log.ddebug('**************************')
+	    self.log.ddebug(' ****** Config dump: ******')
+	    self.log.ddebug('\n'.join(self.config.dump(' * ')))
+	    self.log.ddebug(' **************************')
 
     def debug_dump_pipe(self, pipe):
 	"Dumps pipeline `pipe` at level DDEBUG (only compiles the dump if main level low enough)."
 	if self.log.level <= 5:
-	    self.log.ddebug('****** Pipeline %r dump: ******'%pipe.name)
-	    self.log.ddebug(pipe.pipe)
-	    self.log.ddebug(pipe.dump(prefix='*  '))
-	    self.log.ddebug('**************************')
+	    self.log.ddebug(' ****** Pipeline %r dump: ******'%pipe.name)
+	    self.log.ddebug('\n'.join(pipe.dump(prefix=' * ')))
+	    self.log.ddebug(' **************************')
+    
+    def debug_dump_status(self):
+	"Dumps status metadata at level DDEBUG (only compiles the dump if main level low enough)."
+	if self.log.level <= 5:
+	    self.log.ddebug(' ****** Status dump: ******')
+	    self.log.ddebug('\n'.join(self.status.dump(prefix=' * ')).rstrip())
+	    self.log.ddebug(' **************************')
 
 def hook_init_dirs(e):
     """(mainline at time 5) Create and check directories, fix directory variables.
@@ -104,13 +109,13 @@ def hook_init_dirs(e):
 def hook_load_task_config(e):
     """(mainline at time 15) Load `TASK_CONFIG` and check `PDIR`, fixes `TASK`, `PDIR`, `TASK_CONFIG`."""
     e.config.fix(['TASK', 'PDIR', 'TASK_CONFIG'])
-    e.log.debug('Loading task config %s', self['TASK_CONFIG'])
+    e.log.debug('Loading task config %s', e['TASK_CONFIG'])
     if not os.path.isdir(e['PDIR']):
-	raise moe.MoeError, "No such task %s in %s" % (e['TASK'], self['PDIR'])
-    e.config.parse_file(self['TASK_CONFIG'], level=50)
+	raise moe.MoeError, "No such task %s in %s" % (e['TASK'], e['PDIR'])
+    e.config.parse_file(e['TASK_CONFIG'], level=50)
     e.debug_dump_config()
 
-    e.status["task"] = task  # Metadata
+    e.status["task"] = e['TASK']  # Metadata
 
 def hook_init_tasktype(e):
     """(mainline at time 20) Fix `TASK_TYPE`, initialize task type module."""
@@ -121,17 +126,18 @@ def hook_init_tasktype(e):
     if not task_type:
 	raise MoeError, "Invalid TASK_TYPE: %r" % e
     try:
-	e.tasktype_module = utils.load_module('moe.tasktypes.' + task_type)
+	e.tasktype_module = moe.util.load_module('moe.tasktypes.' + task_type)
     except ImportError:
 	e.log.exception()
 	raise MoeError, 'Unknown TASK_TYPE: %r' % task_type
-    mod.tasktype_module.init(e)
+    e.tasktype_module.init(e)
 
 def hook_write_metadata(e):
     """(mainline at time 90) Write status metadata into file `STATUS_FILE`."""
-    e.log.debug('Writing status file %s', self['STATUS_FILE'])
-    e.status.write(self['STATUS_FILE'])
-    # TODO: dump to ddebug	
+    e.debug_dump_status()
+    e.log.debug('Writing status file %s', e['STATUS_FILE'])
+    with open(e['STATUS_FILE'], 'w') as f:
+	e.status.write(f)