dumbo/decor.py @@ -22,6 +22,7 @@ Please refer to http://wiki.github.com/klbostee/dumbo for more info. from dumbo.core import run, main, Job, Program, Counter from dumbo.lib import * +from dumbo.decor import * if __name__ == '__main__': import sys dumbo/__init__.py @@ -462,6 +462,7 @@ def run(mapper, redconf=None, mapclose=None, redclose=None, + opts=None, iter=0, itercnt=1): if len(sys.argv) > 1 and not sys.argv[1][0] == '-': @@ -587,7 +588,13 @@ def run(mapper, for output in dumpcode(inputs): print '\t'.join(output) else: - opts = parseargs(sys.argv[1:]) + if not opts: + opts = [] + if hasattr(mapper, 'opts'): + opts += mapper.opts + if hasattr(reducer, 'opts'): + opts += reducer.opts + opts += parseargs(sys.argv[1:]) newopts = {} newopts['iteration'] = str(iter) newopts['itercount'] = str(itercnt) dumbo/core.py a18d3916bc32d4ff7494fe659fc58582b4778d55 Klaas Bosteels klaas.bosteels@gmail.com http://github.com/klbostee/dumbo/commit/3baa6c2c450091ae6f13bfa644d3fa7087c24723 3baa6c2c450091ae6f13bfa644d3fa7087c24723 2009-05-12T09:04:59-07:00 2009-05-12T09:04:59-07:00 Closes #29 fb3c7bc5eeb9123750a30015d69d9f88ebcaf86d Klaas Bosteels klaas.bosteels@gmail.com