Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Move legacy caliper modifiers #542

Merged
merged 4 commits into from
Jan 11, 2025
Merged

Move legacy caliper modifiers #542

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2398e12
Move legacy caliper modifier implementations to the legacy directory
Jan 10, 2025
a4481d7
lint
Jan 10, 2025
ff66c72
Ignore legacy modifiers in lint
Jan 10, 2025
a0e7b22
Merge remote-tracking branch 'origin/develop' into deprecate/legacy-c…
Jan 11, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .flake8
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 =
Expand Down
0 modifiers/caliper-cuda/configs/modifier.yaml → ...ifiers/caliper-cuda/configs/modifier.yaml
View file
Open in desktop
File renamed without changes.
5 changes: 0 additions & 5 deletions modifiers/caliper-cuda/modifier.py → legacy/modifiers/caliper-cuda/modifier.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down
0 modifiers/caliper-mpi/configs/modifier.yaml → ...difiers/caliper-mpi/configs/modifier.yaml
View file
Open in desktop
File renamed without changes.
5 changes: 0 additions & 5 deletions modifiers/caliper-mpi/modifier.py → legacy/modifiers/caliper-mpi/modifier.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,6 @@ class CaliperMpi(CaliperBase):

name = "caliper-mpi"

mode(
"mpi",
description="Profile MPI functions",
)

_cali_datafile = CaliperBase._cali_datafile

env_var_modification(
Expand Down
0 ...ers/caliper-topdown/configs/modifier.yaml → ...ers/caliper-topdown/configs/modifier.yaml
View file
Open in desktop
File renamed without changes.
17 changes: 0 additions & 17 deletions modifiers/caliper-topdown/modifier.py → legacy/modifiers/caliper-topdown/modifier.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down
0 modifiers/caliper/configs/modifier.yaml → ...y/modifiers/caliper/configs/modifier.yaml
View file
Open in desktop
File renamed without changes.
3 changes: 3 additions & 0 deletions legacy/modifiers/modifier_repo.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
repo:
namespace: benchpark
subdirectory: ''
0 modifiers/none/configs/modifier.yaml → legacy/modifiers/none/configs/modifier.yaml
View file
Open in desktop
File renamed without changes.
5 changes: 5 additions & 0 deletions lib/benchpark/accounting.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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


Expand Down
7 changes: 5 additions & 2 deletions lib/benchpark/cmd/setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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,
Expand Down Expand Up @@ -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():
Expand Down