Skip to content

Commit 40f8c3e

Browse files
committed
Merge remote-tracking branch 'upstream/main' into cuda-graph-dev
2 parents 719027b + 0c6f1e6 commit 40f8c3e

769 files changed

Lines changed: 31328 additions & 14088 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.clang-format

Lines changed: 31 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,37 @@
11
BasedOnStyle: "Google"
22

3-
AlignAfterOpenBracket: Align
4-
AlignArrayOfStructures: Left
5-
AlignConsecutiveAssignments: Consecutive
6-
AlignConsecutiveDeclarations: Consecutive
7-
AlignEscapedNewlines: true
8-
AlignOperands: Align
9-
AllowShortIfStatementsOnASingleLine: AllIfsAndElse
10-
ColumnLimit: 150
11-
ReflowComments: false
12-
CommentPragmas: 'TESTARGS'
13-
DerivePointerAlignment: false
14-
IncludeBlocks: Preserve
3+
4+
AlignAfterOpenBracket: true
5+
BreakAfterOpenBracketBracedList: true
6+
BreakBeforeCloseBracketBracedList: true
7+
AlignArrayOfStructures: Left
8+
AlignConsecutiveAssignments: Consecutive
9+
AlignConsecutiveDeclarations: Consecutive
10+
AlignEscapedNewlines: true
11+
AlignOperands: Align
12+
AllowShortIfStatementsOnASingleLine: WithoutElse
13+
ColumnLimit: 150
14+
PenaltyBreakOpenParenthesis: 100
15+
ReflowComments: false
16+
CommentPragmas: 'TESTARGS'
17+
DerivePointerAlignment: false
18+
IncludeBlocks: Preserve
1519
IncludeCategories:
16-
- Regex: '^<ceed/.*\.h>'
17-
Priority: 2
18-
- Regex: '^<ceed.*\.h>'
19-
Priority: 1
20-
- Regex: '^<.*/.*\.h>'
21-
Priority: 5
22-
- Regex: '^<.*\.h>'
23-
Priority: 4
24-
- Regex: '^<.*>'
25-
Priority: 3
26-
- Regex: '^".*"'
27-
Priority: 6
28-
- Regex: '.*'
29-
Priority: 7
20+
- Regex: '^<ceed/.*\.h>'
21+
Priority: 2
22+
- Regex: '^<ceed.*\.h>'
23+
Priority: 1
24+
- Regex: '^<.*/.*\.h>'
25+
Priority: 5
26+
- Regex: '^<.*\.h>'
27+
Priority: 4
28+
- Regex: '^<.*>'
29+
Priority: 3
30+
- Regex: '^".*"'
31+
Priority: 6
32+
- Regex: '.*'
33+
Priority: 7
3034
PointerAlignment: Right
31-
TabWidth: 4
35+
IndentWidth: 2
3236
UseTab: Never
3337
StatementMacros: [CeedPragmaOptimizeOn, CeedPragmaOptimizeOff]

.clang-tidy-fix

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
Checks: "-*,readability-inconsistent-declaration-parameter-name,readability-braces-around-statements"
2+
CheckOptions:
3+
- key: readability-braces-around-statements.ShortStatementLines
4+
value: '1'

.codecov.yml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,11 @@ codecov:
22
branch: main
33

44
fixes:
5-
- "build/backends/::backends/"
5+
- "build/interface/::interface/"
66
- "build/gallery/::gallery/"
7+
- "build/backends/::backends/"
8+
- "build/t*/::tests/t*"
9+
- "build/ex*/::examples/ceed/ex*"
710

811
ignore:
912
- "julia/LibCEED.jl/src/generated/*.jl"
@@ -37,6 +40,7 @@ flags:
3740
gallery:
3841
paths:
3942
- gallery/
43+
- include/ceed/jit-source/gallery/
4044
backends:
4145
paths:
4246
- backends/

.github/pull_request_template.md

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
Purpose:
2+
3+
Describe the purpose of the PR here.
4+
5+
Closes: #ISSUE_NUMBER
6+
7+
LLM/GenAI Disclosure:
8+
9+
Describe any LLM and GenAI usage here.
10+
11+
By submitting this PR, the author certifies to its contents as described by the [Developer's Certificate of Origin](https://developercertificate.org/).
12+
Please follow the [Contributing Guidelines](https://github.com/CEED/libCEED/blob/main/CONTRIBUTING.md) for all PRs.

.github/workflows/c-fortan-test-ppc64le.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919

2020
steps:
2121
- name: Environment setup
22-
uses: actions/checkout@v4
22+
uses: actions/checkout@v5
2323
- name: Hardware setup and test libCEED
2424
uses: uraimo/run-on-arch-action@v3
2525
env:

.github/workflows/c-fortran-test-arm64.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717

1818
steps:
1919
- name: Environment setup
20-
uses: actions/checkout@v4
20+
uses: actions/checkout@v5
2121
- name: Build and test libCEED
2222
env:
2323
CC: ${{ matrix.compiler }}

.github/workflows/c-fortran-test-icc.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
runs-on: ${{ matrix.os }}
2020

2121
steps:
22-
- uses: actions/checkout@v4
22+
- uses: actions/checkout@v5
2323
- name: Install Intel compilers
2424
uses: rscohn2/setup-oneapi@v0
2525
with:

.github/workflows/c-fortran-test-linux-osx.yml

Lines changed: 27 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,15 +12,40 @@ jobs:
1212
matrix:
1313
os: [ubuntu-24.04, macos-15]
1414
compiler: [gcc, clang]
15+
include:
16+
- os: macos-15
17+
compiler: apple-clang
1518

1619
runs-on: ${{ matrix.os }}
1720

1821
steps:
1922
- name: Environment setup
20-
uses: actions/checkout@v4
23+
uses: actions/checkout@v5
24+
- name: Set compiler
25+
run: |
26+
case "${{ matrix.compiler }}" in
27+
gcc)
28+
if [[ "${{ matrix.os }}" == macos-* ]]; then
29+
echo "CC=gcc-15" >> $GITHUB_ENV
30+
else
31+
echo "CC=gcc" >> $GITHUB_ENV
32+
fi
33+
;;
34+
clang)
35+
if [[ "${{ matrix.os }}" == macos-* ]]; then
36+
echo "CC=$(brew --prefix llvm@18)/bin/clang" >> $GITHUB_ENV
37+
else
38+
echo "CC=clang" >> $GITHUB_ENV
39+
fi
40+
;;
41+
apple-clang)
42+
echo "CC=clang" >> $GITHUB_ENV
43+
;;
44+
esac
45+
- name: Show compiler version
46+
run: $CC --version | head -1
2147
- name: Build and test libCEED
2248
env:
23-
CC: ${{ matrix.compiler }}
2449
FC: gfortran-14
2550
run: |
2651
make info

.github/workflows/c-fortran-test-style.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,16 +17,16 @@ jobs:
1717

1818
steps:
1919
- name: Environment setup
20-
uses: actions/checkout@v4
20+
uses: actions/checkout@v5
2121
- name: Install clang-format
2222
run: |
2323
wget -O- https://apt.llvm.org/llvm-snapshot.gpg.key | sudo apt-key add -
24-
sudo add-apt-repository 'deb http://apt.llvm.org/noble/ llvm-toolchain-noble-19 main'
25-
sudo apt update && sudo apt install clang-format-19
24+
sudo add-apt-repository 'deb http://apt.llvm.org/noble/ llvm-toolchain-noble-22 main'
25+
sudo apt update && sudo apt install clang-format-22
2626
- name: C style
2727
env:
2828
CC: ${{ matrix.compiler }}
2929
FC: gfortran
3030
run: |
3131
make info
32-
make format-c -j CLANG_FORMAT=clang-format-19 && git diff --exit-code
32+
make format-c -j CLANG_FORMAT=clang-format-22 && git diff --exit-code

.github/workflows/julia-documentation.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
build:
1212
runs-on: ubuntu-24.04
1313
steps:
14-
- uses: actions/checkout@v4
14+
- uses: actions/checkout@v5
1515
- uses: julia-actions/setup-julia@latest
1616
- name: Install dependencies
1717
run: |

0 commit comments

Comments
 (0)