Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/develop' into staged-ci
Browse files Browse the repository at this point in the history
  • Loading branch information
masterleinad committed Sep 30, 2024
2 parents 8028456 + 893dba1 commit f9e224b
Show file tree
Hide file tree
Showing 167 changed files with 5,903 additions and 5,911 deletions.
28 changes: 28 additions & 0 deletions .cmake-format.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
# -----------------------------
# Options affecting formatting.
# -----------------------------
with section("format"):

# How wide to allow formatted cmake files
line_width = 120

# If an argument group contains more than this many sub-groups (parg or kwarg
# groups) then force it to a vertical layout.
max_subgroups_hwrap = 3

# If a statement is wrapped to more than one line, than dangle the closing
# parenthesis on its own line.
dangle_parens = True

# If the trailing parenthesis must be 'dangled' on its on line, then align it
# to this reference: `prefix`: the start of the statement, `prefix-indent`:
# the start of the statement, plus one indentation level, `child`: align to
# the column of the arguments
dangle_align = 'prefix'

# ------------------------------------------------
# Options affecting comment reflow and formatting.
# ------------------------------------------------
with section("markup"):
# enable comment markup parsing and reflow
enable_markup = False
2 changes: 1 addition & 1 deletion .github/workflows/clang-format-check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ on:
permissions: read-all

jobs:
formatting-check:
clang-formatting-check:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
Expand Down
17 changes: 17 additions & 0 deletions .github/workflows/cmake-format-check.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
name: cmake-format check

on: [push, pull_request]

permissions: read-all

jobs:
cmake-formatting-check:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
- name: cmake-format lint action
uses: puneetmatharu/cmake-format-lint-action@efbb497b2a8badd2c9dc638faaf8ef4a9aa71bc8 # v1.0.4
with:
args: --config-files .cmake-format.py --in-place
- name: check
run: git diff --exit-code
4 changes: 2 additions & 2 deletions .github/workflows/codeql.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:

# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
uses: github/codeql-action/init@8214744c546c1e5c8f03dde8fab3a7353211988d # v3.26.7
uses: github/codeql-action/init@461ef6c76dfe95d5c364de2f431ddbd31a417628 # v3.26.9
with:
languages: c-cpp

Expand All @@ -43,6 +43,6 @@ jobs:
cmake --build build --parallel 2

- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@8214744c546c1e5c8f03dde8fab3a7353211988d # v3.26.7
uses: github/codeql-action/analyze@461ef6c76dfe95d5c364de2f431ddbd31a417628 # v3.26.9
with:
category: "/language:c-cpp"
2 changes: 1 addition & 1 deletion .github/workflows/continuous-integration-windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
runs-on: windows-2022

steps:
- uses: Jimver/cuda-toolkit@9b295696791d75d658d8de64c4a85097ad8abeaf # v0.2.16
- uses: Jimver/cuda-toolkit@dc581bec6470cf161025608f13d71b3c00c2c0b7 # v0.2.17
id: cuda-toolkit
with:
cuda: '12.4.1'
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/scorecard.yml
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,6 @@ jobs:

# Upload the results to GitHub's code scanning dashboard.
- name: "Upload SARIF results to code scanning"
uses: github/codeql-action/upload-sarif@8214744c546c1e5c8f03dde8fab3a7353211988d # v3.26.7
uses: github/codeql-action/upload-sarif@461ef6c76dfe95d5c364de2f431ddbd31a417628 # v3.26.9
with:
sarif_file: results.sarif
51 changes: 51 additions & 0 deletions .github/workflows/weekly-cea.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
name: Weekly CEA builds

on:
schedule:
- cron: "0 2 * * 6" # every Saturday at 2am UTC
workflow_dispatch:

jobs:
build_and_test:
env:
build_jobs: 20

strategy:
matrix:
build_type:
- Release
- Debug
backend:
- name: cuda-a100
flags: -DKokkos_ENABLE_CUDA=ON -DKokkos_ARCH_AMPERE80=ON
modules: gcc/11.2.0/gcc-4.8.5 cuda/12.2.1/gcc-11.2.0 cmake/3.28.3/gcc-11.2.0
slurm_args: --nodes=1 --time=01:00:00 --mem=80G -p gpua100 --gres=gpu:1
runner: [self-hosted, cuda]

runs-on: ${{ matrix.backend.runner }}

steps:
- uses: actions/checkout@v4

- name: Configure
run: |
module load ${{ matrix.backend.modules }}
cmake -B build \
-DCMAKE_BUILD_TYPE=${{ matrix.build_type }} \
-DCMAKE_CXX_STANDARD=17 \
-DCMAKE_CXX_FLAGS=-Werror \
-DKokkos_ENABLE_COMPILER_WARNINGS=ON \
-DKokkos_ENABLE_TESTS=ON \
-DKokkos_ENABLE_EXAMPLES=ON \
${{ matrix.backend.flags }}
- name: Build
run: |
module load ${{ matrix.backend.modules }}
cmake --build build --parallel $build_jobs
- name: Test
run: |
module load ${{ matrix.backend.modules }}
srun ${{ matrix.backend.slurm_args }} \
ctest --test-dir build --output-on-failure
2 changes: 1 addition & 1 deletion .jenkins
Original file line number Diff line number Diff line change
Expand Up @@ -474,7 +474,7 @@ pipeline {
-DKokkos_ENABLE_LIBDL=OFF \
-DKokkos_ENABLE_OPENMP=ON \
-DKokkos_ENABLE_IMPL_MDSPAN=OFF \
-DKokkos_ENABLE_IMPL_CUDA_MALLOC_ASYNC=OFF \
-DKokkos_ENABLE_IMPL_CUDA_MALLOC_ASYNC=ON \
.. && \
make -j8 && ctest --verbose && \
cd ../example/build_cmake_in_tree && \
Expand Down
Loading

0 comments on commit f9e224b

Please sign in to comment.