Feature/variant helpers #404
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…er-implementation
…er-implementation
rfhaque
commented
Oct 23, 2024
lib/benchpark/experiment.py
Outdated
Comment on lines
154
to
196
| def compute_applications_section_wrapper(self): | ||
| self.expr_name = [] | ||
| self.variables = {} | ||
| self.zips = {} | ||
| self.matrix = [] | ||
| self.excludes = [] | ||
|
|
||
| self.compute_applications_section() | ||
|
|
||
| expr_name_list = [self.name, self.workload] | ||
| for cls in self.helpers: | ||
| helper_prefix = cls.get_helper_name_prefix() | ||
| if helper_prefix: | ||
| expr_name_list.append(helper_prefix) | ||
| expr_name = "_".join(expr_name_list + self.expr_name) | ||
|
|
||
| return { | ||
| self.name: { | ||
| "workloads": { | ||
| self.workload: { | ||
| "experiments": { | ||
| expr_name: { | ||
| "variants": {"package_manager": "spack"}, | ||
| "variables": self.variables, | ||
| "zips": self.zips, | ||
| "matrix": self.matrix, | ||
| "exclude": {"where" : self.excludes} if self.excludes else {}, | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } | ||
|
|
||
| def add_spack_spec(self, package_name, spec=None): | ||
| if spec: | ||
| self.package_specs[package_name] = { | ||
| "pkg_spec": spec[0], | ||
| "compiler": spec[1], | ||
| } | ||
| else: | ||
| self.package_specs[package_name] = {} | ||
|
|
There was a problem hiding this comment.
@scheibelp @pearce8 Refactored lib/experiment.py to remove much of the boilerplate code from the application experiment.py
lib/benchpark/experiment.py
Outdated
Comment on lines
202
to
225
| def compute_spack_section_wrapper(self): | ||
| for cls in self.helpers: | ||
| cls_package_specs = cls.compute_spack_section() | ||
| if ( | ||
| cls_package_specs | ||
| and "packages" in cls_package_specs | ||
| ): | ||
| self.package_specs |= cls_package_specs["packages"] | ||
|
|
||
| self.compute_spack_section() | ||
|
|
||
| if not self.name in self.package_specs: | ||
| raise BenchparkError( | ||
| f"Spack section must be defined for application package {self.name}" | ||
| ) | ||
|
|
||
| spack_variants = [cls.get_spack_variants() for cls in self.helpers] | ||
| self.package_specs[self.name]["pkg_spec"] += " ".join(spack_variants+list(self.spec.variants["extra_spack_specs"])).strip() | ||
|
|
||
| return { | ||
| "packages": {k: v for k, v in self.package_specs.items() if v}, | ||
| "environments": {self.name: {"packages": list(self.package_specs.keys())}}, | ||
| } | ||
|
|
There was a problem hiding this comment.
@scheibelp @pearce8 Refactored lib/experiment.py to remove much of the boilerplate code from the application experiment.py
Comment on lines
+232
to
+234
| "modifiers": self.compute_modifiers_section_wrapper(), | ||
| "applications": self.compute_applications_section_wrapper(), | ||
| "software": self.compute_spack_section_wrapper(), |
There was a problem hiding this comment.
@scheibelp @pearce8 Refactored lib/experiment.py to remove much of the boilerplate code from the application experiment.py
Comment on lines
68
to
70
| self.add_experiment_variable("px", p, True) | ||
| self.add_experiment_variable("py", p, True) | ||
| self.add_experiment_variable("pz", p, True) |
There was a problem hiding this comment.
@scheibelp @pearce8 The application can use an API to set experiment variables and other constructs
added 16 commits
October 23, 2024 17:49
pearce8
approved these changes
Oct 31, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Merge #356 first. Closes #400.
Programming model and modifier.