|
34 | 34 | import wrappers.maverick_wrapper as mw |
35 | 35 | import wrappers.faststructure_wrapper as fsw |
36 | 36 | import wrappers.structure_wrapper as sw |
| 37 | + import wrappers.alstructure_wrapper as alsw |
37 | 38 | import argparser |
38 | 39 |
|
39 | 40 | except ImportError: |
|
43 | 44 | import structure_threader.wrappers.maverick_wrapper as mw |
44 | 45 | import structure_threader.wrappers.faststructure_wrapper as fsw |
45 | 46 | import structure_threader.wrappers.structure_wrapper as sw |
| 47 | + import structure_threader.wrappers.alstructure_wrapper as alsw |
46 | 48 | import structure_threader.argparser as argparser |
47 | 49 |
|
48 | 50 | # Where are we? |
@@ -85,10 +87,17 @@ def runprogram(wrapped_prog, iterations, arg): |
85 | 87 | mav_params = mw.mav_params_parser(arg.params) |
86 | 88 | cli, output_dir = mw.mav_cli_generator(arg, k_val, mav_params) |
87 | 89 |
|
| 90 | + elif wrapped_prog == "alstructure": # Run ALStructure |
| 91 | + cli, output_file = alsw.alstr_cli_generator(arg, k_val) |
| 92 | + |
88 | 93 | else: # Run fastStructure |
89 | 94 | cli, output_file = fsw.fs_cli_generator(k_val, arg) |
90 | 95 |
|
91 | 96 | logging.info("Running: " + " ".join(cli)) |
| 97 | + if wrapped_prog == "alstructure": |
| 98 | + logging.info("If this is the first time running ALStructure it might " |
| 99 | + "take a while to install all the dependencies. Please " |
| 100 | + "be patient.") |
92 | 101 | program = subprocess.Popen(cli, |
93 | 102 | stdout=subprocess.PIPE, |
94 | 103 | stderr=subprocess.PIPE) |
@@ -277,6 +286,10 @@ def full_run(arg): |
277 | 286 | wrapped_prog = "maverick" |
278 | 287 | elif "-st" in sys.argv: |
279 | 288 | wrapped_prog = "structure" |
| 289 | + elif "-als" in sys.argv: |
| 290 | + wrapped_prog = "alstructure" |
| 291 | + arg.threads = 1 |
| 292 | + arg.notests = True |
280 | 293 |
|
281 | 294 | structure_threader(wrapped_prog, arg) |
282 | 295 |
|
|
0 commit comments