Move legacy caliper modifier implementations to the legacy directory

LLNL · Jan 10, 2025 · 2398e12 · 2398e12
1 parent 73ad9d7
commit 2398e12
Show file tree

Hide file tree

Showing 11 changed files with 9 additions and 29 deletions.
diff --git a/modifiers/caliper-cuda/configs/modifier.yaml → ...ifiers/caliper-cuda/configs/modifier.yaml b/modifiers/caliper-cuda/configs/modifier.yaml → ...ifiers/caliper-cuda/configs/modifier.yaml
diff --git a/modifiers/caliper-cuda/modifier.py → legacy/modifiers/caliper-cuda/modifier.py b/modifiers/caliper-cuda/modifier.py → legacy/modifiers/caliper-cuda/modifier.py
@@ -12,11 +12,6 @@ class CaliperCuda(CaliperBase):
 
     name = "caliper-cuda"
 
-    mode(
-        "cuda",
-        description="Profile CUDA API functions",
-    )
-
     _cali_datafile = CaliperBase._cali_datafile
 
     env_var_modification(

diff --git a/modifiers/caliper-mpi/configs/modifier.yaml → ...difiers/caliper-mpi/configs/modifier.yaml b/modifiers/caliper-mpi/configs/modifier.yaml → ...difiers/caliper-mpi/configs/modifier.yaml
diff --git a/modifiers/caliper-mpi/modifier.py → legacy/modifiers/caliper-mpi/modifier.py b/modifiers/caliper-mpi/modifier.py → legacy/modifiers/caliper-mpi/modifier.py
@@ -12,11 +12,6 @@ class CaliperMpi(CaliperBase):
 
     name = "caliper-mpi"
 
-    mode(
-        "mpi",
-        description="Profile MPI functions",
-    )
-
     _cali_datafile = CaliperBase._cali_datafile
 
     env_var_modification(

diff --git a/...ers/caliper-topdown/configs/modifier.yaml → ...ers/caliper-topdown/configs/modifier.yaml b/...ers/caliper-topdown/configs/modifier.yaml → ...ers/caliper-topdown/configs/modifier.yaml
diff --git a/modifiers/caliper-topdown/modifier.py → legacy/modifiers/caliper-topdown/modifier.py b/modifiers/caliper-topdown/modifier.py → legacy/modifiers/caliper-topdown/modifier.py
@@ -12,23 +12,6 @@ class CaliperTopdown(CaliperBase):
 
     name = "caliper-topdown"
 
-    mode(
-        "topdown-counters-all",
-        description="Raw counter values for Intel top-down analysis (all levels)",
-    )
-    mode(
-        "topdown-counters-toplevel",
-        description="Raw counter values for Intel top-down analysis (top level)",
-    )
-    mode(
-        "topdown-all",
-        description="Top-down analysis for Intel CPUs (all levels)",
-    )
-    mode(
-        "topdown-toplevel",
-        description="Top-down analysis for Intel CPUs (top level)",
-    )
-
     _cali_datafile = CaliperBase._cali_datafile
 
     env_var_modification(

diff --git a/modifiers/caliper/configs/modifier.yaml → ...y/modifiers/caliper/configs/modifier.yaml b/modifiers/caliper/configs/modifier.yaml → ...y/modifiers/caliper/configs/modifier.yaml
diff --git a/legacy/modifiers/modifier_repo.yaml b/legacy/modifiers/modifier_repo.yaml
@@ -0,0 +1,3 @@
+repo:
+  namespace: benchpark
+  subdirectory: ''
diff --git a/modifiers/none/configs/modifier.yaml → legacy/modifiers/none/configs/modifier.yaml b/modifiers/none/configs/modifier.yaml → legacy/modifiers/none/configs/modifier.yaml
diff --git a/lib/benchpark/accounting.py b/lib/benchpark/accounting.py
@@ -23,6 +23,9 @@ def benchpark_modifiers():
     modifiers = []
     for x in os.listdir(source_dir / "modifiers"):
         modifiers.append(x)
+
+    modifiers += [x for x in os.listdir(source_dir / "legacy" / "modifiers") if x not in modifiers]
+
     return modifiers
 
 

diff --git a/lib/benchpark/cmd/setup.py b/lib/benchpark/cmd/setup.py
@@ -181,7 +181,7 @@ def command(args):
 
     print(f"Setting up configs for Ramble workspace {ramble_configs_dir}")
 
-    modifier_config_dir = source_dir / "modifiers" / modifier / "configs"
+    legacy_modifier_config_dir = source_dir / "legacy" / "modifiers" / modifier / "configs"
     ramble_configs_dir.mkdir(parents=True)
     ramble_logs_dir.mkdir(parents=True)
     ramble_spack_experiment_configs_dir.mkdir(parents=True)
@@ -197,7 +197,7 @@ def include_fn(fname):
 
     symlink_tree(configs_src_dir, ramble_configs_dir, include_fn)
     symlink_tree(experiment_src_dir, ramble_configs_dir, include_fn)
-    symlink_tree(modifier_config_dir, ramble_configs_dir, include_fn)
+    symlink_tree(legacy_modifier_config_dir, ramble_configs_dir, include_fn)
     symlink_tree(
         source_dir / "legacy" / "systems" / "common",
         ramble_spack_experiment_configs_dir,
@@ -232,6 +232,7 @@ def include_fn(fname):
         ramble(f"repo add --scope=site {source_dir}/repo")
         ramble('config --scope=site add "config:disable_progress_bar:true"')
         ramble(f"repo add -t modifiers --scope=site {source_dir}/modifiers")
+        ramble(f"repo add -t modifiers --scope=site {source_dir}/legacy/modifiers")
         ramble("config --scope=site add \"config:spack:global:args:'-d'\"")
 
     if not initializer_script.exists():