Update existing modifier definitions

Author: douglasjacobsen

var/ramble/repos/builtin/modifiers/env-var-aggregator/modifier.py

@@ -78,10 +78,6 @@ class EnvVarAggregator(BasicModifier):
         modes=["explicit"],
     )
 
-    def __init__(self, file_path):
-        super().__init__(file_path)
-        self._applied_aggregation = False
-
     def _aggregate_all_env_vars(self, shell):
         script_lines = []
 
@@ -133,17 +129,14 @@ def _aggregate_explicit_env_vars(self, shell):
 
         return script_lines
 
-    executable_modifier("inject_env_aggregation_script")
+    executable_modifier("inject_env_aggregation_script", usage_filter="once")
 
     def inject_env_aggregation_script(
         self, executable_name, executable, app_inst=None
     ):
         pre_cmds = []
         post_cmds = []
 
-        if self._applied_aggregation or not app_inst:
-            return pre_cmds, post_cmds
-
         item_prefix = app_inst.expander.expand_var_name(
             "aggregated_env_var_item_prefix"
         )
@@ -175,6 +168,4 @@ def inject_env_aggregation_script(
         )
         pre_cmds.append(cmd_exec)
 
-        self._applied_aggregation = True
-
         return pre_cmds, post_cmds

var/ramble/repos/builtin/modifiers/execution-date/modifier.py

@@ -18,23 +18,18 @@ class ExecutionDate(BasicModifier):
 
     mode("standard", description="Standard execution mode")
 
-    executable_modifier("get_startend_date")
-
     modifier_variable(
         "date_format",
         default="",
         description="Date args to format output",
         mode="standard",
     )
 
+    executable_modifier("get_startend_date", usage_filter="once")
+
     def get_startend_date(self, executable_name, executable, app_inst=None):
         from ramble.util.executable import CommandExecutable
 
-        if hasattr(self, "_already_applied"):
-            return [], []
-
-        self._already_applied = True
-
         pre_cmds = []
         post_cmds = []
 

var/ramble/repos/builtin/modifiers/gcp-metadata/modifier.py

@@ -65,16 +65,11 @@ class GcpMetadata(BasicModifier):
         description="Optional suffix for {metadata_parallel_prefix}",
     )
 
-    executable_modifier("gcp_metadata_exec")
+    executable_modifier("gcp_metadata_exec", usage_filter="once")
 
     def gcp_metadata_exec(self, executable_name, executable, app_inst=None):
         from ramble.util.executable import CommandExecutable
 
-        if hasattr(self, "_already_applied"):
-            return [], []
-
-        self._already_applied = True
-
         post_cmds = []
         pre_cmds = []
 

var/ramble/repos/builtin/modifiers/install-ramble/modifier.py

@@ -111,7 +111,7 @@ class InstallRamble(BasicModifier):
         modes=["standard", "quiet"],
     )
 
-    executable_modifier("source_installed_ramble")
+    executable_modifier("source_installed_ramble", usage_filter="once")
 
     def source_installed_ramble(
         self, executable_name, executable, app_inst=None
@@ -124,15 +124,13 @@ def source_installed_ramble(
         if self._usage_mode == "quiet":
             return pre_exec, post_exec
 
-        if not hasattr(self, "_already_applied"):
-            pre_exec.append(
-                CommandExecutable(
-                    "source-installed-ramble",
-                    template=[
-                        "{source_ramble}",
-                    ],
-                )
+        pre_exec.append(
+            CommandExecutable(
+                "source-installed-ramble",
+                template=[
+                    "{source_ramble}",
+                ],
             )
+        )
 
-            self._already_applied = True
         return pre_exec, post_exec

var/ramble/repos/builtin/modifiers/install-spack/modifier.py

@@ -87,7 +87,7 @@ class InstallSpack(BasicModifier):
         modes=["standard", "quiet"],
     )
 
-    executable_modifier("source_installed_spack")
+    executable_modifier("source_installed_spack", usage_filter="once")
 
     def source_installed_spack(
         self, executable_name, executable, app_inst=None
@@ -100,15 +100,13 @@ def source_installed_spack(
         if self._usage_mode == "quiet":
             return pre_exec, post_exec
 
-        if not hasattr(self, "_already_applied"):
-            pre_exec.append(
-                CommandExecutable(
-                    "source-installed-spack",
-                    template=[
-                        "{source_spack}",
-                    ],
-                )
+        pre_exec.append(
+            CommandExecutable(
+                "source-installed-spack",
+                template=[
+                    "{source_spack}",
+                ],
             )
+        )
 
-            self._already_applied = True
         return pre_exec, post_exec

var/ramble/repos/builtin/modifiers/nccl-env/modifier.py

@@ -666,10 +666,6 @@ class NcclEnv(BasicModifier):
         modes=["standard"],
     )
 
-    def __init__(self, file_path):
-        super().__init__(file_path)
-        self._applied = False
-
     def generate_env_var_dict(self, app_inst):
         env_var_set = {}
         set_env_vars = {}
@@ -684,39 +680,42 @@ def generate_env_var_dict(self, app_inst):
 
         return env_var_set
 
-    executable_modifier("define_nccl_env_vars")
+    @ModifierBase.executable_modifier_usage_filter("first_workload_exec")
+    def filter_first_workload_executable(self, exec_mod, executable):
+        # Apply before the first executable from the workload
+        app_inst = self._get_app_inst()
+        workload = app_inst.get_workload()
+        return executable.name == workload.executables[
+            0
+        ] and not self.executable_modifier_applied(exec_mod)
+
+    executable_modifier(
+        "define_nccl_env_vars", usage_filter="first_workload_exec"
+    )
 
     def define_nccl_env_vars(self, executable_name, executable, app_inst=None):
         pre_cmds = []
         post_cmds = []
-        if self._applied:
-            return pre_cmds, post_cmds
-
-        workload = app_inst.get_workload()
 
-        # Apply before the first executable from the workload
-        if executable_name == workload.executables[0]:
-            self._applied = True
-
-            action_funcs = ramble.util.env.action_funcs
-            shell = ramble.config.get("config:shell")
-            env_var_dict = self.generate_env_var_dict(app_inst)
-            env_var_cmds = []
-            for action, conf in env_var_dict.items():
-                (env_cmds, _) = action_funcs[action](conf, set(), shell=shell)
-
-                for cmd in env_cmds:
-                    if cmd:
-                        env_var_cmds.append(cmd)
-
-            pre_cmds.append(
-                ramble.util.executable.CommandExecutable(
-                    "nccl_env_vars",
-                    template=env_var_cmds,
-                    mpi=False,
-                    redirect="",
-                    output_capture="",
-                )
+        action_funcs = ramble.util.env.action_funcs
+        shell = ramble.config.get("config:shell")
+        env_var_dict = self.generate_env_var_dict(app_inst)
+        env_var_cmds = []
+        for action, conf in env_var_dict.items():
+            (env_cmds, _) = action_funcs[action](conf, set(), shell=shell)
+
+            for cmd in env_cmds:
+                if cmd:
+                    env_var_cmds.append(cmd)
+
+        pre_cmds.append(
+            ramble.util.executable.CommandExecutable(
+                "nccl_env_vars",
+                template=env_var_cmds,
+                mpi=False,
+                redirect="",
+                output_capture="",
             )
+        )
 
         return pre_cmds, post_cmds

var/ramble/repos/builtin/modifiers/pre-exec-print/modifier.py

@@ -28,28 +28,27 @@ class PreExecPrint(BasicModifier):
     mode("standard", description="Standard execution mode for pre-print")
     default_mode("standard")
 
-    executable_modifier("pre_exec_print")
-
-    _attr_name = "_applied_pre_exec_print"
+    executable_modifier("pre_exec_print", usage_filter="once")
 
     def pre_exec_print(self, executable_name, executable, app_inst=None):
         from ramble.util.executable import CommandExecutable
 
         pre_cmds = []
         post_cmds = []
 
-        if not hasattr(self, self._attr_name):
-            echo_string = "Index: {experiment_index} -- Namespace: {experiment_namespace}"
-            if "pre_exec_print_template" in app_inst.variables:
-                echo_string = "{pre_exec_print_template}"
-            pre_cmds.append(
-                CommandExecutable(
-                    "perform-pre-exec-print",
-                    template=[f'echo "Running: {echo_string}"'],
-                    mpi=False,
-                    redirect="",
-                    output_capture="",
-                )
+        echo_string = (
+            "Index: {experiment_index} -- Namespace: {experiment_namespace}"
+        )
+        if "pre_exec_print_template" in app_inst.variables:
+            echo_string = "{pre_exec_print_template}"
+        pre_cmds.append(
+            CommandExecutable(
+                "perform-pre-exec-print",
+                template=[f'echo "Running: {echo_string}"'],
+                mpi=False,
+                redirect="",
+                output_capture="",
             )
-            setattr(self, self._attr_name, True)
+        )
+
         return pre_cmds, post_cmds

var/ramble/repos/builtin/modifiers/run-directory/modifier.py

@@ -73,7 +73,7 @@ class RunDirectory(BasicModifier):
         dest_path="postrun_copy.sh",
     )
 
-    executable_modifier("apply_run_directory_change")
+    executable_modifier("apply_run_directory_change", usage_filter="once")
 
     def apply_run_directory_change(
         self, executable_name, executable, app_inst
@@ -89,8 +89,8 @@ def apply_run_directory_change(
             return pre_cmds, post_cmds
         from ramble.util import executable
 
-        if not getattr(self, "_applied", False):
-            self._applied = True
+        if not getattr(self, "_target_cleaned", False):
+            self._target_cleaned = True
             should_cleanup = self.expander.expand_var_name(
                 "cleanup_target_directory_before_run",
                 typed=True,