From ef811073fd73630a6adbe166756e8d5e91cfe04d Mon Sep 17 00:00:00 2001 From: Riyaz Haque <5333387+rfhaque@users.noreply.github.com> Date: Sat, 11 Jan 2025 11:06:46 -0800 Subject: [PATCH] Move legacy caliper modifiers (#542) * Move legacy caliper modifier implementations to the legacy directory * lint * Ignore legacy modifiers in lint --------- Co-authored-by: Riyaz Haque --- .flake8 | 1 + .../caliper-cuda/configs/modifier.yaml | 0 .../modifiers}/caliper-cuda/modifier.py | 5 ----- .../caliper-mpi/configs/modifier.yaml | 0 .../modifiers}/caliper-mpi/modifier.py | 5 ----- .../caliper-topdown/configs/modifier.yaml | 0 .../modifiers}/caliper-topdown/modifier.py | 17 ----------------- .../modifiers}/caliper/configs/modifier.yaml | 0 legacy/modifiers/modifier_repo.yaml | 3 +++ .../modifiers}/none/configs/modifier.yaml | 0 lib/benchpark/accounting.py | 5 +++++ lib/benchpark/cmd/setup.py | 7 +++++-- 12 files changed, 14 insertions(+), 29 deletions(-) rename {modifiers => legacy/modifiers}/caliper-cuda/configs/modifier.yaml (100%) rename {modifiers => legacy/modifiers}/caliper-cuda/modifier.py (87%) rename {modifiers => legacy/modifiers}/caliper-mpi/configs/modifier.yaml (100%) rename {modifiers => legacy/modifiers}/caliper-mpi/modifier.py (89%) rename {modifiers => legacy/modifiers}/caliper-topdown/configs/modifier.yaml (100%) rename {modifiers => legacy/modifiers}/caliper-topdown/modifier.py (70%) rename {modifiers => legacy/modifiers}/caliper/configs/modifier.yaml (100%) create mode 100644 legacy/modifiers/modifier_repo.yaml rename {modifiers => legacy/modifiers}/none/configs/modifier.yaml (100%) diff --git a/.flake8 b/.flake8 index 24623e3f0..3478ee08a 100644 --- a/.flake8 +++ b/.flake8 @@ -11,6 +11,7 @@ ignore = E501,W503,E203 per-file-ignores = modifiers/*/modifier.py:F403,F405 + legacy/modifiers/*/modifier.py:F403,F405 builtins = IPython exclude = diff --git a/modifiers/caliper-cuda/configs/modifier.yaml b/legacy/modifiers/caliper-cuda/configs/modifier.yaml similarity index 100% rename from modifiers/caliper-cuda/configs/modifier.yaml rename to legacy/modifiers/caliper-cuda/configs/modifier.yaml diff --git a/modifiers/caliper-cuda/modifier.py b/legacy/modifiers/caliper-cuda/modifier.py similarity index 87% rename from modifiers/caliper-cuda/modifier.py rename to legacy/modifiers/caliper-cuda/modifier.py index 7761a467e..2abe3ecf8 100644 --- a/modifiers/caliper-cuda/modifier.py +++ b/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 b/legacy/modifiers/caliper-mpi/configs/modifier.yaml similarity index 100% rename from modifiers/caliper-mpi/configs/modifier.yaml rename to legacy/modifiers/caliper-mpi/configs/modifier.yaml diff --git a/modifiers/caliper-mpi/modifier.py b/legacy/modifiers/caliper-mpi/modifier.py similarity index 89% rename from modifiers/caliper-mpi/modifier.py rename to legacy/modifiers/caliper-mpi/modifier.py index f742cd874..09b88e1fe 100644 --- a/modifiers/caliper-mpi/modifier.py +++ b/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/modifiers/caliper-topdown/configs/modifier.yaml b/legacy/modifiers/caliper-topdown/configs/modifier.yaml similarity index 100% rename from modifiers/caliper-topdown/configs/modifier.yaml rename to legacy/modifiers/caliper-topdown/configs/modifier.yaml diff --git a/modifiers/caliper-topdown/modifier.py b/legacy/modifiers/caliper-topdown/modifier.py similarity index 70% rename from modifiers/caliper-topdown/modifier.py rename to legacy/modifiers/caliper-topdown/modifier.py index d980e5b52..4af4a6d38 100644 --- a/modifiers/caliper-topdown/modifier.py +++ b/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 b/legacy/modifiers/caliper/configs/modifier.yaml similarity index 100% rename from modifiers/caliper/configs/modifier.yaml rename to legacy/modifiers/caliper/configs/modifier.yaml diff --git a/legacy/modifiers/modifier_repo.yaml b/legacy/modifiers/modifier_repo.yaml new file mode 100644 index 000000000..23ed59a45 --- /dev/null +++ b/legacy/modifiers/modifier_repo.yaml @@ -0,0 +1,3 @@ +repo: + namespace: benchpark + subdirectory: '' diff --git a/modifiers/none/configs/modifier.yaml b/legacy/modifiers/none/configs/modifier.yaml similarity index 100% rename from modifiers/none/configs/modifier.yaml rename to legacy/modifiers/none/configs/modifier.yaml diff --git a/lib/benchpark/accounting.py b/lib/benchpark/accounting.py index 89e974097..89ae7c665 100644 --- a/lib/benchpark/accounting.py +++ b/lib/benchpark/accounting.py @@ -23,6 +23,11 @@ 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 index 84c81a4fb..f457b99f7 100644 --- a/lib/benchpark/cmd/setup.py +++ b/lib/benchpark/cmd/setup.py @@ -181,7 +181,9 @@ 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 +199,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 +234,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():