Skip to content

Commit

Permalink
Merge with develop
Browse files Browse the repository at this point in the history
  • Loading branch information
Riyaz Haque committed Jan 29, 2025
2 parents 28bff28 + 3ef00c5 commit e95d622
Show file tree
Hide file tree
Showing 8 changed files with 90 additions and 6 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683

- name: Setup Python
uses: actions/setup-python@0b93645e9fea7318ecaed2b359559ac225c90a2b
uses: actions/setup-python@42375524e23c412d93fb67b49958b491fce71c38
with:
python-version: '3.11'
cache: 'pip'
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/license.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ jobs:
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683

- name: Set up Python 3.11
uses: actions/setup-python@0b93645e9fea7318ecaed2b359559ac225c90a2b
uses: actions/setup-python@42375524e23c412d93fb67b49958b491fce71c38
with:
python-version: '3.11'

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/requirements/docs.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# docs
sphinx==8.1.3
sphinx-rtd-theme==3.0.2
codespell==2.3.0
codespell==2.4.0
pandas==2.2.3
pyyaml==6.0.2
sphinxcontrib-programoutput==0.18
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/requirements/style.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
black==24.10.0
flake8==7.1.1
isort==5.13.2
codespell==2.3.0
codespell==2.4.0
27 changes: 27 additions & 0 deletions .github/workflows/run.yml
Original file line number Diff line number Diff line change
Expand Up @@ -757,3 +757,30 @@ jobs:
benchmark_spec: hpl caliper=mpi,time
system_name: lassen
system_spec: llnl-sierra cuda=11-8-0 compiler=clang-ibm

- name: stream/mpi caliper=mpi,time ruby llnl-cluster cluster=ruby
uses: ./.github/actions/dynamic-dry-run
with:
benchmark_name: stream
benchmark_mode: mpi
benchmark_spec: stream caliper=mpi,time
system_name: ruby
system_spec: llnl-cluster cluster=ruby

- name: stream/mpi caliper=mpi,time lassen llnl-sierra cuda=11-8-0 compiler=clang-ibm
uses: ./.github/actions/dynamic-dry-run
with:
benchmark_name: stream
benchmark_mode: mpi
benchmark_spec: stream caliper=mpi,time
system_name: lassen
system_spec: llnl-sierra cuda=11-8-0 compiler=clang-ibm

- name: stream/mpi caliper=mpi,time llnl-elcapitan rocm=5.5.1 compiler=cce
uses: ./.github/actions/dynamic-dry-run
with:
benchmark_name: stream
benchmark_mode: mpi
benchmark_spec: stream caliper=mpi,time
system_name: tioga
system_spec: llnl-elcapitan rocm=5.5.1 compiler=cce
2 changes: 1 addition & 1 deletion .github/workflows/style.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ jobs:
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683

- name: Set up Python 3.11
uses: actions/setup-python@0b93645e9fea7318ecaed2b359559ac225c90a2b
uses: actions/setup-python@42375524e23c412d93fb67b49958b491fce71c38
with:
python-version: '3.11'
cache: 'pip'
Expand Down
57 changes: 57 additions & 0 deletions experiments/stream/experiment.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,57 @@
# Copyright 2023 Lawrence Livermore National Security, LLC and other
# Benchpark Project Developers. See the top-level COPYRIGHT file for details.
#
# SPDX-License-Identifier: Apache-2.0

from benchpark.directives import variant
from benchpark.experiment import Experiment
from benchpark.caliper import Caliper


class Stream(
Experiment,
Caliper,
):
variant(
"workload",
default="stream",
description="stream",
)

variant(
"version",
default="5.10",
description="app version",
)

def compute_applications_section(self):

array_size = {"s": 650000000}

self.add_experiment_variable("processes_per_node", "1", True)
self.add_experiment_variable("n", "35", False)
self.add_experiment_variable("o", "0", False)
self.add_experiment_variable("n_ranks", 1, True)
self.add_experiment_variable("n_threads_per_proc", [16, 32], True)

self.matrix_experiment_variables("n_threads_per_proc")

for pk, pv in array_size.items():
self.add_experiment_variable(pk, pv, True)

def compute_spack_section(self):
# get package version
app_version = self.spec.variants["version"][0]

# get system config options
# TODO: Get compiler/mpi/package handles directly from system.py
system_specs = {}
system_specs["compiler"] = "default-compiler"
system_specs["mpi"] = "default-mpi"

# set package spack specs
self.add_spack_spec(system_specs["mpi"])

self.add_spack_spec(
self.name, [f"stream@{app_version}", system_specs["compiler"]]
)
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -57,5 +57,5 @@ per-file-ignores = """
"""

[tool.codespell]
skip = './docs/_build,./docs/_static'
skip = './docs/_build,./docs/_static,./taxonomy.yaml'
ignore-words-list = 'fom'

0 comments on commit e95d622

Please sign in to comment.