diff options
Diffstat (limited to 'parse_exps.py')
-rwxr-xr-x | parse_exps.py | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/parse_exps.py b/parse_exps.py index 87d0783..24bdb85 100755 --- a/parse_exps.py +++ b/parse_exps.py | |||
@@ -52,13 +52,17 @@ def get_exp_params(data_dir, col_map): | |||
52 | # Keep only params that uniquely identify the experiment | 52 | # Keep only params that uniquely identify the experiment |
53 | params = load_params(param_file) | 53 | params = load_params(param_file) |
54 | for ignored in conf.PARAMS.itervalues(): | 54 | for ignored in conf.PARAMS.itervalues(): |
55 | if ignored in params: | 55 | # Always include cycles or overhead parsing fails |
56 | if ignored in params and ignored != conf.PARAMS['cycles']: | ||
56 | params.pop(ignored) | 57 | params.pop(ignored) |
57 | 58 | ||
58 | # Track all changed params | 59 | # Track all changed params |
59 | for key, value in params.iteritems(): | 60 | for key, value in params.iteritems(): |
60 | col_map.try_add(key, value) | 61 | col_map.try_add(key, value) |
61 | 62 | ||
63 | if conf.PARAMS['cycles'] not in params: | ||
64 | params[conf.PARAMS['cycles']] = conf.DEFAULTS['cycles'] | ||
65 | |||
62 | return params | 66 | return params |
63 | 67 | ||
64 | 68 | ||
@@ -78,8 +82,9 @@ def gen_exp_data(exp_dirs, base_conf, col_map, force): | |||
78 | 82 | ||
79 | # Read and translate exp output files | 83 | # Read and translate exp output files |
80 | params = get_exp_params(data_dir, col_map) | 84 | params = get_exp_params(data_dir, col_map) |
85 | cycles = int(params[conf.PARAMS['cycles']]) | ||
81 | st_output = st.get_st_output(data_dir, tmp_dir, force) | 86 | st_output = st.get_st_output(data_dir, tmp_dir, force) |
82 | ft_output = ft.get_ft_output(data_dir, tmp_dir, force) | 87 | ft_output = ft.get_ft_output(data_dir, cycles, tmp_dir, force) |
83 | 88 | ||
84 | 89 | ||
85 | if base_conf and base_conf.viewitems() & params.viewitems(): | 90 | if base_conf and base_conf.viewitems() & params.viewitems(): |