diff options
-rwxr-xr-x | run_exps.py | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/run_exps.py b/run_exps.py index d1e0026..84e2b4c 100755 --- a/run_exps.py +++ b/run_exps.py | |||
@@ -88,13 +88,14 @@ def load_experiment(sched_file, scheduler, duration, param_file, out_dir): | |||
88 | if not os.path.isfile(sched_file): | 88 | if not os.path.isfile(sched_file): |
89 | raise IOError("Cannot find schedule file: %s" % sched_file) | 89 | raise IOError("Cannot find schedule file: %s" % sched_file) |
90 | 90 | ||
91 | dirname = os.path.split(sched_file)[0] | 91 | dir_name, fname = os.path.split(sched_file) |
92 | exp_name = os.path.split(dir_name)[1] + "/" + fname | ||
92 | 93 | ||
93 | params = {} | 94 | params = {} |
94 | kernel = "" | 95 | kernel = "" |
95 | 96 | ||
96 | param_file = param_file or \ | 97 | param_file = param_file or \ |
97 | "%s/%s" % (dirname, conf.DEFAULTS['params_file']) | 98 | "%s/%s" % (dir_name, conf.DEFAULTS['params_file']) |
98 | 99 | ||
99 | if os.path.isfile(param_file): | 100 | if os.path.isfile(param_file): |
100 | params = load_params(param_file) | 101 | params = load_params(param_file) |
@@ -112,10 +113,10 @@ def load_experiment(sched_file, scheduler, duration, param_file, out_dir): | |||
112 | 113 | ||
113 | # Parse schedule file's intentions | 114 | # Parse schedule file's intentions |
114 | schedule = load_schedule(sched_file) | 115 | schedule = load_schedule(sched_file) |
115 | work_dir = "%s/tmp" % dirname | 116 | work_dir = "%s/tmp" % dir_name |
116 | fix_paths(schedule, os.path.split(sched_file)[0], sched_file) | 117 | fix_paths(schedule, os.path.split(sched_file)[0], sched_file) |
117 | 118 | ||
118 | run_exp(sched_file, schedule, scheduler, kernel, duration, work_dir, out_dir) | 119 | run_exp(exp_name, schedule, scheduler, kernel, duration, work_dir, out_dir) |
119 | 120 | ||
120 | # Save parameters used to run experiment in out_dir | 121 | # Save parameters used to run experiment in out_dir |
121 | out_params = dict(params.items() + | 122 | out_params = dict(params.items() + |