From 64e7516c91d9f2f7ca86928f8db00ca29f3eb544 Mon Sep 17 00:00:00 2001 From: Jonathan Herman Date: Wed, 19 Dec 2012 14:10:55 -0500 Subject: Bug fix --- run_exps.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'run_exps.py') diff --git a/run_exps.py b/run_exps.py index 43de422..cc348ec 100755 --- a/run_exps.py +++ b/run_exps.py @@ -8,7 +8,7 @@ import re import shutil import traceback -from common import load_params +from common import load_params,get_executable from optparse import OptionParser from run.executable.executable import Executable from run.experiment import Experiment,ExperimentDone @@ -46,7 +46,7 @@ def convert_data(data): r"(?P[\w\-\/]+)" r"\s*{\s*(?P.*?)\s*?}$)|" r"(?P^" - r"(?P\w+?spin)?\s*" + r"(?:(?P\w+) )?\s*" r"(?P[\w\-_\d\. \=]+)\s*$)", re.S|re.I|re.M) @@ -164,7 +164,9 @@ def run_exp(name, schedule, scheduler, kernel, duration, work_dir, out_dir): # raise IndexError("No knowledge of program %s: %s" % (spin, name)) real_spin = get_executable(spin, "") - real_args = ['-w'] + args.split() + [duration] + real_args = args.split() + if re.match(".*spin", real_spin): + real_args = ['-w'] + real_args + [duration] if not lu.is_executable(real_spin): raise OSError("Cannot run spin %s: %s" % (real_spin, name)) -- cgit v1.2.2