Merge pull request #1190 from douglasjacobsen/variants-in-results

Include variant definitions in results

Author: linsword13

lib/ramble/ramble/experiment_result.py

@@ -35,6 +35,7 @@ class ExperimentStatus(str, Enum):
     namespace.variables: "RAMBLE_VARIABLES",
     "raw_variables": "RAMBLE_RAW_VARIABLES",
     namespace.tags: "TAGS",
+    namespace.variants: "VARIANTS",
     "experiment_chain": "EXPERIMENT_CHAIN",
     "success_criteria": "SUCCESS_CRITERIA",
 }
@@ -72,6 +73,13 @@ def __init__(self, app_inst):
             if var not in app_inst.keywords.keys or not app_inst.keywords.is_key_level(var):
                 self.variables[var] = app_inst.expander.expand_var(val)
 
+        self.variants = set()
+        for _, obj_inst in app_inst._objects():
+            if hasattr(obj_inst, "object_variants"):
+                obj_var_set = obj_inst.object_variants.as_set()
+                self.variants = self.variants.union(obj_var_set)
+        self.variants = list(self.variants)
+
     def to_dict(self):
         """Generate a dict for encoders (json, yaml) and uploaders.
 

lib/ramble/ramble/workspace/workspace.py

@@ -1744,6 +1744,11 @@ def dump_results(self, output_formats=None, print_results=False, summary_only=Fa
                             if software_key in exp and exp[software_key]:
                                 self.write_software_info(f, exp)
 
+                        if exp["VARIANTS"]:
+                            f.write("  Experiment variants:\n")
+                            for variant in exp["VARIANTS"]:
+                                f.write(f"  - {variant}\n")
+
                         if exp["SUCCESS_CRITERIA"]:
                             f.write("  Success criteria summary:\n")
                             for name, result in exp["SUCCESS_CRITERIA"].items():