Skip to content

Commit

Permalink
Last clobbered merge changes.
Browse files Browse the repository at this point in the history
Fixes #103
  • Loading branch information
C. Carouge committed Feb 15, 2024
1 parent 3957aaf commit b65ddbb
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 32 deletions.
16 changes: 5 additions & 11 deletions benchcab/benchcab.py
Original file line number Diff line number Diff line change
Expand Up @@ -267,15 +267,9 @@ def fluxsite_run_tasks(self, config_path: str):
self._validate_environment(project=config["project"], modules=config["modules"])

tasks = self.tasks if self.tasks else self._initialise_tasks(config)
self.logger.debug("Running fluxsite tasks...")
try:
multiprocess = config["fluxsite"]["multiprocess"]
except KeyError:
multiprocess = internal.FLUXSITE_DEFAULT_MULTIPROCESS
if multiprocess:
ncpus = config.get("pbs", {}).get(
"ncpus", internal.FLUXSITE_DEFAULT_PBS["ncpus"]
)
self.logger.info("Running fluxsite tasks...")

Check warning on line 270 in benchcab/benchcab.py

View check run for this annotation

Codecov / codecov/patch

benchcab/benchcab.py#L270

Added line #L270 was not covered by tests
if config["fluxsite"]["multiprocess"]:
ncpus = config["fluxsite"]["pbs"]["ncpus"]
run_tasks_in_parallel(tasks, n_processes=ncpus)

Check warning on line 273 in benchcab/benchcab.py

View check run for this annotation

Codecov / codecov/patch

benchcab/benchcab.py#L273

Added line #L273 was not covered by tests
else:
run_tasks(tasks)
Expand All @@ -294,13 +288,13 @@ def fluxsite_bitwise_cmp(self, config_path: str):
tasks = self.tasks if self.tasks else self._initialise_tasks(config)
comparisons = get_fluxsite_comparisons(tasks)

self.logger.debug("Running comparison tasks...")
self.logger.info("Running comparison tasks...")

Check warning on line 291 in benchcab/benchcab.py

View check run for this annotation

Codecov / codecov/patch

benchcab/benchcab.py#L291

Added line #L291 was not covered by tests
if config["fluxsite"]["multiprocess"]:
ncpus = config["fluxsite"]["pbs"]["ncpus"]
run_comparisons_in_parallel(comparisons, n_processes=ncpus)

Check warning on line 294 in benchcab/benchcab.py

View check run for this annotation

Codecov / codecov/patch

benchcab/benchcab.py#L294

Added line #L294 was not covered by tests
else:
run_comparisons(comparisons)
self.logger.debug("Successfully ran comparison tasks")
self.logger.info("Successfully ran comparison tasks")

Check warning on line 297 in benchcab/benchcab.py

View check run for this annotation

Codecov / codecov/patch

benchcab/benchcab.py#L296-L297

Added lines #L296 - L297 were not covered by tests

def fluxsite(self, config_path: str, no_submit: bool, skip: list[str]):
"""Endpoint for `benchcab fluxsite`."""
Expand Down
21 changes: 0 additions & 21 deletions benchcab/utils/singleton.py

This file was deleted.

0 comments on commit b65ddbb

Please sign in to comment.