Skip to content

Commit

Permalink
lint
Browse files Browse the repository at this point in the history
  • Loading branch information
Michael Richard Mckinsey committed Feb 13, 2025
1 parent 6305be2 commit d54a295
Showing 1 changed file with 15 additions and 5 deletions.
20 changes: 15 additions & 5 deletions lib/benchpark/experiment.py
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ class Experiment(ExperimentSystemBase, SingleNode):
variant(
"package_manager",
default="spack",
values=("spack","environment-modules"),
values=("spack", "environment-modules"),
description="package manager to use",
)

Expand Down Expand Up @@ -139,7 +139,10 @@ def compute_config_section(self):
"deprecated": True,
}
if self.spec.variants["package_manager"][0] == "spack":
default_config["spack_flags"] = {"install": "--add --keep-stage", "concretize": "-U -f"}
default_config["spack_flags"] = {
"install": "--add --keep-stage",
"concretize": "-U -f",
}
return default_config

def compute_modifiers_section(self):
Expand Down Expand Up @@ -275,14 +278,17 @@ def compute_environment_modules_section(self):
self.compute_spack_section()

if "env_modules_path" in self.spec.variants:
self.add_experiment_variable("binary_path", [p for p in self.spec.variants["env_modules_path"]], False)
self.add_experiment_variable(
"binary_path",
[p for p in self.spec.variants["env_modules_path"]],
False,
)

return {
"packages": {k: v for k, v in self.package_specs.items() if v},
"environments": {self.name: {"packages": list(self.package_specs.keys())}},
}


def compute_ramble_dict(self):
# This can be overridden by any subclass that needs more flexibility
return {
Expand All @@ -292,7 +298,11 @@ def compute_ramble_dict(self):
"modifiers": self.compute_modifiers_section_wrapper(),
"applications": self.compute_applications_section_wrapper(),
# TODO: this needs a refactor into one function
"software": self.compute_spack_section_wrapper() if self.spec.variants["package_manager"][0] == "spack" else self.compute_environment_modules_section(),
"software": (
self.compute_spack_section_wrapper()
if self.spec.variants["package_manager"][0] == "spack"
else self.compute_environment_modules_section()
),
}
}

Expand Down

0 comments on commit d54a295

Please sign in to comment.