Skip to content

Commit 705b918

Browse files
committed
correction to replication phase cli parsers
1 parent 5ff7fc6 commit 705b918

2 files changed

Lines changed: 24 additions & 7 deletions

File tree

.gitignore

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,19 +5,13 @@
55
__pycache__
66
.pytest_cache
77
demo/
8-
demo_old/
98
catboost_info/
10-
testlogs/
119
dask_logs/
1210
OUTPUT/
13-
OSA_OUTPUT/
14-
OSA/
1511
docs/build/
16-
job_old.e
1712
job.o
1813
job.e
1914
logs.log
20-
Scratchpad.ipynb
2115
UserData/
2216
UserRepData/
2317
UserOutput/
@@ -32,3 +26,6 @@ run_configs/cedars_amd.cfg
3226
data/AMD_Final/*
3327
data/PLCO/*
3428
run_configs/cedars_plco.cfg
29+
run_configs/cedars_gametes.cfg
30+
exp_configs/
31+
exp_data/

streamline/utils/parser.py

Lines changed: 21 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import argparse
22
import configparser
33
from streamline.utils.parser_helpers import str2bool, save_config, load_config
4-
from streamline.utils.parser_helpers import parse_general
4+
from streamline.utils.parser_helpers import parse_general, parse_replicate
55
from streamline.utils.parser_helpers import parse_logistic
66
from streamline.utils.parser_helpers import parser_function_all
77
from streamline.utils.parser_helpers import PARSER_LIST
@@ -88,6 +88,17 @@ def single_parse(mode_params, argv, config_dict=None):
8888
else:
8989
config_dict = load_config(config_dict['output_path'],
9090
config_dict['experiment_name'], config_dict)
91+
if i == 9:
92+
config_dict_copy = parse_replicate(argv, config_dict)
93+
if not config_dict_copy['rep_data_path'] == "":
94+
config_dict['rep_data_path'] = config_dict_copy['rep_data_path']
95+
if not config_dict_copy['dataset_for_rep'] == "":
96+
config_dict['dataset_for_rep'] = config_dict_copy['dataset_for_rep']
97+
if not config_dict_copy['rep_export_feature_correlations']:
98+
config_dict['rep_export_feature_correlations'] \
99+
= config_dict_copy['rep_export_feature_correlations']
100+
if not config_dict_copy['exclude_rep_plots'] == 'None':
101+
config_dict['exclude_rep_plots'] = config_dict_copy['exclude_rep_plots']
91102
config_dict = parse_logistic(argv, config_dict)
92103
return config_dict
93104

@@ -140,17 +151,26 @@ def parser_function(argv):
140151
config.read(config_file)
141152
for s in config.sections():
142153
config_dict.update({k: eval(v) for k, v in config.items(s)})
154+
save_config(config_dict['output_path'],
155+
config_dict['experiment_name'],
156+
config_dict)
143157
elif mode_params['do_till_report']:
144158
print("Running till Report Generation Stage")
145159
config = parser_function_all(argv)
146160
config_dict.update(config)
147161
config_dict.update(mode_params)
162+
save_config(config_dict['output_path'],
163+
config_dict['experiment_name'],
164+
config_dict)
148165

149166
for key in mode_params:
150167
if mode_params[key] and key not in ['config', 'do_till_report']:
151168
config = single_parse(mode_params, argv, config_dict)
152169
config_dict.update(config)
153170
config_dict.update(mode_params)
171+
save_config(config_dict['output_path'],
172+
config_dict['experiment_name'],
173+
config_dict)
154174

155175
config_dict = process_params(config_dict)
156176

0 commit comments

Comments
 (0)