Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/main' into pubchem-multi-input-j…
Browse files Browse the repository at this point in the history
…son-qleverfile
  • Loading branch information
Hannah Bast committed Nov 16, 2024
2 parents 02b2869 + 3e0328e commit 868b7da
Show file tree
Hide file tree
Showing 2 changed files with 245 additions and 132 deletions.
4 changes: 3 additions & 1 deletion src/qlever/commands/index.py
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ def should_have_qleverfile(self) -> bool:
def relevant_qleverfile_arguments(self) -> dict[str: list[str]]:
return {"data": ["name", "format"],
"index": ["input_files", "cat_input_files", "multi_input_json",
"settings_json", "index_binary",
"parallel_parsing", "settings_json", "index_binary",
"only_pso_and_pos_permutations", "use_patterns",
"text_index", "stxxl_memory"],
"runtime": ["system", "image", "index_container"]}
Expand Down Expand Up @@ -111,6 +111,8 @@ def execute(self, args) -> bool:
index_cmd = (f"{args.cat_input_files} | {args.index_binary}"
f" -i {args.name} -s {args.name}.settings.json"
f" -F {args.format} -f -")
if args.parallel_parsing:
index_cmd += (f" -p {args.parallel_parsing}")
elif args.multi_input_json and not args.cat_input_files:
try:
input_options = self.get_input_options_for_json(args)
Expand Down
Loading

0 comments on commit 868b7da

Please sign in to comment.