Skip to content

Commit

Permalink
Merge branch 'develop' into fix/legacy-workflow-calls
Browse files Browse the repository at this point in the history
  • Loading branch information
pearce8 authored Jan 8, 2024
2 parents 02c7ded + 35c2b9e commit 1f24ea2
Show file tree
Hide file tree
Showing 24 changed files with 129 additions and 15 deletions.
31 changes: 31 additions & 0 deletions .github/labeler.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
application:
- changed-files:
- any-glob-to-any-file:
- repo/**

ci:
- changed-files:
- any-glob-to-any-file:
- .github/**

configs:
- changed-files:
- any-glob-to-any-file:
- configs/**

dependencies:
- changed-files:
- any-glob-to-any-file:
- .github/worklflows/requirements/**
- pyproject.toml

docs:
- changed-files:
- any-glob-to-any-file:
- docs/**
- README.rst

experiment:
- changed-files:
- any-glob-to-any-file:
- experiments/**
2 changes: 1 addition & 1 deletion .github/workflows/bin/license
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ from __future__ import print_function

import os
import re
from collections import defaultdict
import sys
from collections import defaultdict

#: SPDX license id must appear in the first <license_lines> lines of a file
license_lines = 7
Expand Down
4 changes: 4 additions & 0 deletions .github/workflows/docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,10 @@ jobs:
run: |
sphinx-build docs/ _build
- name: Check for Typos using Codespell
run: |
codespell
- name: Upload artifact
uses: actions/upload-pages-artifact@0252fc4ba7626f0298f0cf00902a25c6afc77fa8
if: github.ref == 'refs/heads/develop'
Expand Down
21 changes: 21 additions & 0 deletions .github/workflows/label.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
#-----------------------------------------------------------------------
# DO NOT modify unless you really know what you are doing.
#
# See https://stackoverflow.com/a/74959635 for more info.
# Talk to @alecbcs if you have questions/are not sure of a change's
# possible impact to security.
#-----------------------------------------------------------------------
name: label
on:
pull_request_target:
branches:
- develop

jobs:
pr:
runs-on: ubuntu-latest
permissions:
contents: read
pull-requests: write
steps:
- uses: actions/labeler@8558fd74291d67161a8a78ce36a881fa63b766a9
13 changes: 13 additions & 0 deletions .github/workflows/nightly.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
name: nightly
on:
schedule:
- cron: '0 14 * * *'

#------------------------------------------------------------------------
# Execute a nightly CI run to verify benchmarks continue to build & run
# sucessfully. Will also update the CI buildcache to minimize build
# times in PRs.
#------------------------------------------------------------------------
jobs:
run:
uses: ./.github/workflows/run.yml
1 change: 1 addition & 0 deletions .github/workflows/requirements/docs.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
# docs
sphinx==7.2.6
sphinx-rtd-theme==2.0.0
codespell==2.2.6
2 changes: 2 additions & 0 deletions .github/workflows/requirements/style.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,4 @@
black==23.12.1
flake8==7.0.0
isort==5.13.2
codespell==2.2.6
17 changes: 17 additions & 0 deletions .github/workflows/run.yml
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,23 @@ jobs:
--disable-logger \
workspace analyze
- name: Archive Experiment Workspace
working-directory: ./workspace/saxpy/openmp/x86_64/workspace/
if: always()
run: |
ramble \
--workspace-dir . \
--disable-progress-bar \
--disable-logger \
workspace archive
- name: Upload Workspace Archive as CI Artifact
if: always()
uses: actions/upload-artifact@c7d193f32edcb7bfad88892161225aeda64e9392
with:
name: workspace-archive
path: './workspace/saxpy/openmp/x86_64/workspace/archive/**'

- name: Upload Binaries to CI Cache
if: github.ref == 'refs/heads/develop'
run: |
Expand Down
4 changes: 3 additions & 1 deletion .github/workflows/style.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,9 @@ jobs:
run: |
pip install -r .github/workflows/requirements/style.txt
- name: Lint and Format Check with Flake8 and Black
- name: Lint and Format Check
run: |
black --diff --check .
codespell
isort
flake8
6 changes: 3 additions & 3 deletions bin/benchpark
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@
# SPDX-License-Identifier: Apache-2.0

import argparse
import subprocess
import pathlib
import os
import shutil
import pathlib
import shlex
import shutil
import subprocess
import sys

DEBUG = False
Expand Down
3 changes: 2 additions & 1 deletion docs/generate-sys-defs-list.py
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
#!/usr/bin/env python3

import yaml
import glob

import pandas as pd
import yaml


def main():
Expand Down
10 changes: 10 additions & 0 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ requires-python = ">=3.8"

[tool.black]
line-length = 88
color = true
target-version = ['py38', 'py39', 'py310', 'py311']
include = '\.pyi?$|bin\/benchpark'
exclude = '''
Expand All @@ -23,3 +24,12 @@ exclude = '''
| repo
)/
'''

[tool.isort]
profile = "black"
skip_gitignore = true
color_output = true

[tool.codespell]
skip = './_build,./docs/_static'
ignore-words-list = 'fom'
3 changes: 2 additions & 1 deletion repo/amg2023/application.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,10 @@
#
# SPDX-License-Identifier: Apache-2.0

import sys

from ramble.appkit import *

import sys

class Amg2023(SpackApplication):
"""AMG2023 benchmark"""
Expand Down
1 change: 1 addition & 0 deletions repo/cray-mpich/package.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
from spack.package import *
from spack.pkg.builtin.cray_mpich import CrayMpich as BuiltinCM


class CrayMpich(BuiltinCM):

variant("gtl", default=False, description="enable GPU-aware mode")
Expand Down
1 change: 1 addition & 0 deletions repo/cublas/package.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@

from spack.package import *


class Cublas(Package):

provides("blas")
3 changes: 2 additions & 1 deletion repo/hypre/package.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,11 @@
#
# SPDX-License-Identifier: Apache-2.0

import os

from spack.package import *
from spack.pkg.builtin.hypre import Hypre as BuiltinHypre

import os

class Hypre(BuiltinHypre):
requires("+rocm", when="^rocblas")
Expand Down
1 change: 1 addition & 0 deletions repo/lapack-xl/package.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@

from spack.package import *


class LapackXl(Package):

provides("lapack")
Expand Down
3 changes: 2 additions & 1 deletion repo/lbann/application.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,10 @@
#
# SPDX-License-Identifier: Apache-2.0

import sys

from ramble.appkit import *

import sys

class LBANN(SpackApplication):
"""LBANN benchmark"""
Expand Down
3 changes: 2 additions & 1 deletion repo/raja-perf/application.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,10 @@
#
# SPDX-License-Identifier: Apache-2.0

import sys

from ramble.appkit import *

import sys

class RajaPerf(SpackApplication):
"""RAJA Performance suite"""
Expand Down
6 changes: 3 additions & 3 deletions repo/raja-perf/package.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,16 @@
#
# SPDX-License-Identifier: Apache-2.0

import os
import socket
import glob
import os
import re

import socket
from os import environ as env
from os.path import join as pjoin

from spack import *


def spec_uses_toolchain(spec):
gcc_toolchain_regex = re.compile(".*gcc-toolchain.*")
using_toolchain = list(filter(gcc_toolchain_regex.match, spec.compiler_flags["cxxflags"]))
Expand Down
1 change: 1 addition & 0 deletions repo/rocblas/package.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
from spack.package import *
from spack.pkg.builtin.rocblas import Rocblas as BuiltinRocblas


class Rocblas(BuiltinRocblas):

provides("blas")
Expand Down
1 change: 1 addition & 0 deletions repo/rocsolver/package.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
from spack.package import *
from spack.pkg.builtin.rocsolver import Rocsolver as BuiltinRocsolver


class Rocsolver(BuiltinRocsolver):

provides("lapack")
3 changes: 2 additions & 1 deletion repo/saxpy/application.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,10 @@
#
# SPDX-License-Identifier: Apache-2.0

import sys

from ramble.appkit import *

import sys

class Saxpy(SpackApplication):
"""saxpy benchmark"""
Expand Down
4 changes: 3 additions & 1 deletion repo/saxpy/package.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,12 @@
#
# SPDX-License-Identifier: Apache-2.0

from spack.package import *
import os
import shutil

import spack.repo
from spack.package import *


class Saxpy(CMakePackage, CudaPackage, ROCmPackage):
"""Test saxpy problem."""
Expand Down

0 comments on commit 1f24ea2

Please sign in to comment.