X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;ds=sidebyside;f=t%2Fmoe%2Feval.py;h=bc1ea83e46ebc18c4530b1b53002df76317d7ef9;hb=e9b511e32341f3712df0c285553378a140eaeb97;hp=c92ce8a753c06d2bb0c2b9885ddefc0370f3a444;hpb=8175ec1a0fe914d582d4f4936cb5d2857e4d6edc;p=moe.git

diff --git a/t/moe/eval.py b/t/moe/eval.py
index c92ce8a..bc1ea83 100644
--- a/t/moe/eval.py
+++ b/t/moe/eval.py
@@ -20,7 +20,7 @@ class Eval:
 	self.config = moe.config.ConfigTree()
 	self.main_pipe = moe.pipeline.MoePipeline("main")
 	self.test_pipe = moe.pipeline.MoePipeline("test")
-	self.stat = moe.status.MoeStatus()
+	self.status = moe.status.MoeStatus()
 
     def __getitem__(self, key):
 	return self.config[key]
@@ -35,16 +35,30 @@ class Eval:
 	self.config.parse('LOG="{HOME}/log"', source="<builtins>", level=0)
 	self.config.parse('DEBUG_LEVEL="0"', source="<builtins>", level=0)
 	self.config.parse('VERBOSE=""', source="<builtins>", level=0)
-	self.config.parse('TDIR="{HOME}/test"', source="<temp-builtins>", level=0) # -> config
-	self.config.parse('USER_LOG="{TDIR}/log"', source="<temp-builtins>", level=0) # -> config
+	
+	# Non-basic configuration, should be in default config file 
+	self.config.parse("""
+	    TDIR = "{HOME}/test"
+	    PDIR = "{HOME}/tasks/{TASK}"
+	    USER_LOG = "{TDIR}/log"
+	    TASK_CONFIG = "{PDIR}/config"
+	    STATUS_FILE = "{TDIR}/status"
+	    EXTENSIONS = ""
+	    # only for testing: 
+	    TASK = "sum"
+	    TASK_TYPE = "dummy"
+	    USER = "gavento"
+	    SOURCE = "suma.c"
+	    EXTENSIONS += " dummy "
+	    """, source="<temp-builtins>", level=0) # -> config
+
 	# apply overrides
 	for ov in overrides:
-	  self.config.parse(ov, source="<overrides>", level=100)
+	    self.config.parse(ov, source="<overrides>", level=100)
 	
 	# load config file
 	self.config.fix('CONFIG')
-	with open(self['CONFIG'], 'r') as f:
-	  self.config.parse(f, source=self['CONFIG'], level=30)
+	self.config.parse_file(self['CONFIG'], level=30)
 	# fix variables
 	self.config.fix(['LOG', 'USER_LOG', 'VERBOSE', 'HOME', 'DEBUG_LEVEL', 'TDIR'])
 	# start logging
@@ -57,61 +71,85 @@ class Eval:
 	self.init_TDIR()
 	
 	# insert hooks into main pipeline
-	# TODO
-	# TODO moe.box.init(self)
-
-	# insert custom hooks
-	self.conf.fix('HOOKS')
-	self.main_pipe.configure(self['HOOKS'])
-
+	self.main_pipe.insert(5, "Eval.hook_init_dirs", self.hook_init_dirs)
+	self.main_pipe.insert(15, "Eval.hook_load_task_config", self.hook_load_task_config)
+	self.main_pipe.insert(20, "Eval.hook_init_tasktype", self.hook_init_tasktype)
+	self.main_pipe.insert(90, "Eval.hook_write_metadata", self.hook_write_metadata)
+
+	# ininialize extensions (let them insert hooks) 
+	self.conf.fix('EXTENSIONS')
+	exts = self['EXTENSIONS'].split()
+	for e in exts:
+	    if not e:
+		raise MoeError, "Invalid extension name: %r" % e
+	    self.log.debug("Loading extension %s", e)
+	    try:
+		mod = util.load_module('moe.exts.' + e)
+	    except ImportError:
+		self.log.exception()
+		raise MoeError, 'Unknown extension: %r' % e
+	    mod.init(self)
+	
     def run(self):
 	"Run the main pipeline."
 	self.debug_dump_pipe(self.main_pipe)
 	self.debug('Running main pipeline')
 	self.main_pipe.run(self)
 
-
-    def init_TDIR(self):
-	test = self['TDIR']
-	if os.path.isdir(test):
-	    shutil.rmtree(test)
-	try: #TODO: Remove
-	    moe.util.mkdir_tree(test)	
-	except OSError, err:
-	    raise moe.MoeError, "Cannot create %s: %s" % (test, err.strerror)
-
     def debug_dump_config(self):
-      "Dumps at level DDEBUG and only compiles the dump if main level low enough."
-      if self.log.level <= 5:
-	self.log.ddebug('****** Config dump: ******'))
-	self.log.ddebug(self.config.dump('**** '))
-	self.log.ddebug('**************************'))
+	"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(self.config.dump('**** '))
+	    self.log.ddebug('**************************')
 
     def debug_dump_pipe(self, pipe):
-      "Dumps at level DDEBUG and 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.dump(prefix='**** '))
-	self.log.ddebug('**************************'))
-
-#TODO ...
-    def init_task(self):
-	task = self['TASK']
-	task_dir = self['PDIR']
-	if not os.path.isdir(task_dir):
-	    raise moe.MoeError, "No such task %s" % task
-
-	task_cfg = moe.config.MoeConfig(name = os.path.join(task_dir, "config"), type='task')
-	self.cfgs.push(task_cfg)
-	self.log_config(3, "after loading the task")
-
-	self.stat["task"] = task
-
-	type = self['TASK_TYPE']
-	if type == "batch" or type == "interactive":
-	    moe.batch.prepare_pipe(self)
-	elif type == "opendata":
-	    raise moe.MoeError, "Opendata tasks not implemented yet"
-	else:
-	    raise moe.MoeError, "Unknown task type " + type
+	"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.dump(prefix='**** '))
+	    self.log.ddebug('**************************')
+
+    def hook_init_dirs(self):
+	"""(mainline at time 5) Create and check directories, fix directory variables.
+	.. note:: Currently only TDIR."""
+	self.config.fix('TDIR')
+	tdir = self['TDIR']
+	if os.path.isdir(tdir):
+	    shutil.rmtree(tdir)
+	moe.util.mkdir_tree(tdir)
+    
+    def hook_load_task_config(self):
+	"""(mainline at time 15) Load `TASK_CONFIG` and check `PDIR`, fixes `TASK`, `PDIR`, `TASK_CONFIG`."""
+	self.config.fix(['TASK', 'PDIR', 'TASK_CONFIG'])
+	self.log.debug('Loading task config %s', self['TASK_CONFIG'])
+	if not os.path.isdir(self['PDIR']):
+	    raise moe.MoeError, "No such task %s in %s" % (self['TASK'], self['PDIR'])
+	self.config.parse_file(self['TASK_CONFIG'], level=50)
+	self.debug_dump_config()
+
+	self.stat["task"] = task  # Metadata
+    
+    def hook_init_tasktype(self):
+	"""(mainline at time 20) Fix `TASK_TYPE`, initialize task type module."""
+
+	self.config.fix('TASK_TYPE')
+	task_type = self['TASK_TYPE']
+	self.log.debug('Loading module for TASK_TYPE: %r', task_type)
+	if not task_type:
+	    raise MoeError, "Invalid TASK_TYPE: %r" % e
+	try:
+	    self.tasktype_module = utils.load_module('moe.tasktypes.' + task_type)
+	except ImportError:
+	    self.log.exception()
+	    raise MoeError, 'Unknown TASK_TYPE: %r' % task_type
+	mod.tasktype_module.init(self)
+
+    def hook_write_metadata(self):
+	"""(mainline at time 90) Write status metadata into file `STATUS_FILE`."""
+	self.log.debug('Writing status file %s', self['STATUS_FILE'])
+	self.status.write(self['STATUS_FILE'])
+	# TODO: dump to ddebug	
+
+