Skip to content

Commit

Permalink
Merge branch 'main' into sycl/main-update
Browse files Browse the repository at this point in the history
  • Loading branch information
kris-rowe committed Oct 10, 2023
2 parents 8013861 + 851646d commit b5f4136
Show file tree
Hide file tree
Showing 526 changed files with 17,592 additions and 12,300 deletions.
2 changes: 2 additions & 0 deletions .clang-format
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ AlignOperands: Align
AllowShortIfStatementsOnASingleLine: AllIfsAndElse
ColumnLimit: 150
CommentPragmas: 'TESTARGS'
DerivePointerAlignment: false
IncludeBlocks: Preserve
IncludeCategories:
- Regex: '^<ceed/.*\.h>'
Expand All @@ -25,6 +26,7 @@ IncludeCategories:
Priority: 6
- Regex: '.*'
Priority: 7
PointerAlignment: Right
TabWidth: 4
UseTab: Never
StatementMacros: [CeedPragmaOptimizeOn, CeedPragmaOptimizeOff]
1 change: 1 addition & 0 deletions .github/workflows/c-fortran-test-icc.sh
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ source /opt/intel/oneapi/setvars.sh

# run tests
export CC=icc CXX=icc FC=ifort
export OPENMP=1
make info
make -j2
PROVE_OPTS=-v make prove -j2
2 changes: 1 addition & 1 deletion .github/workflows/c-fortran-test-icc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ on:

env:
LINUX_CPP_COMPONENTS: intel-oneapi-compiler-dpcpp-cpp-and-cpp-classic
LINUX_FORTRAN_COMPONENTS: intel-oneapi-ifort
LINUX_FORTRAN_COMPONENTS: intel-oneapi-compiler-fortran

jobs:
test:
Expand Down
7 changes: 5 additions & 2 deletions .github/workflows/c-fortran-test-style.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,14 @@ jobs:
- name: Environment setup
uses: actions/checkout@v3
- name: Install clang-format
run: sudo apt update && sudo apt install clang-format-15
run: |
wget -O- https://apt.llvm.org/llvm-snapshot.gpg.key | sudo apt-key add -
sudo add-apt-repository 'deb http://apt.llvm.org/bullseye/ llvm-toolchain-bullseye-16 main'
sudo apt update && sudo apt install clang-format-16
- name: C style
env:
CC: ${{ matrix.compiler }}
FC: gfortran-11
run: |
make info
make format-c -j2 CLANG_FORMAT=clang-format-15 && git diff --exit-code
make format-c -j2 CLANG_FORMAT=clang-format-16 && git diff --exit-code
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -61,8 +61,10 @@ doc/sphinx/source/examples/
*.mp4
*.msh
*.ogv
*.pbin
*.vtu
*.webm
*.xmf
*.xz
*.zstd
perf.data
Expand Down
12 changes: 6 additions & 6 deletions .gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ noether-cpu:
- rm -f .SUCCESS
# libCEED
- make configure OPT='-O -march=native -ffp-contract=fast'
- BACKENDS_CPU=$(make info-backends-all | grep -o '/cpu[^ ]*')
- BACKENDS_CPU=$(make info-backends-all | grep -o '/cpu[^ ]*' | tr '\n' ' ')
- echo "-------------- libCEED -------------" && make info
- echo "-------------- BACKENDS_CPU --------" && echo $BACKENDS_CPU
- OCCA_DIR= PEDANTIC=1 make -j$NPROC_CPU
Expand Down Expand Up @@ -97,8 +97,8 @@ noether-rocm:
script:
- rm -f .SUCCESS
# libCEED
- make configure ROCM_DIR=/opt/rocm-5.5.0 OPT='-O -march=native -ffp-contract=fast'
- BACKENDS_CPU=$(make info-backends-all | grep -o '/cpu[^ ]*') && BACKENDS_GPU=$(make info-backends | grep -o '/gpu[^ ]*')
- make configure ROCM_DIR=/opt/rocm-5.6.0 OPT='-O -march=native -ffp-contract=fast'
- BACKENDS_CPU=$(make info-backends-all | grep -o '/cpu[^ ]*' | tr '\n' ' ') && BACKENDS_GPU=$(make info-backends | grep -o '/gpu[^ ]*' | tr '\n' ' ')
- echo "-------------- libCEED -------------" && make info
- echo "-------------- BACKENDS_GPU --------" && echo $BACKENDS_GPU
- make -j$NPROC_CPU
Expand Down Expand Up @@ -171,8 +171,8 @@ noether-float:
# Change to single precision
- sed -i 's/ceed-f64/ceed-f32/1' include/ceed/types.h
# Build libCEED
- make configure ROCM_DIR=/opt/rocm-5.5.0 OPT='-O -march=native -ffp-contract=fast'
- BACKENDS_CPU=$(make info-backends-all | grep -o '/cpu[^ ]*') && BACKENDS_GPU=$(make info-backends | grep -o '/gpu[^ ]*')
- make configure ROCM_DIR=/opt/rocm-5.6.0 OPT='-O -march=native -ffp-contract=fast'
- BACKENDS_CPU=$(make info-backends-all | grep -o '/cpu[^ ]*' | tr '\n' ' ') && BACKENDS_GPU=$(make info-backends | grep -o '/gpu[^ ]*' | tr '\n' ' ')
- echo "-------------- libCEED -------------" && make info
- echo "-------------- BACKENDS_CPU --------" && echo $BACKENDS_CPU
- echo "-------------- BACKENDS_GPU --------" && echo $BACKENDS_GPU
Expand Down Expand Up @@ -223,7 +223,7 @@ noether-cuda:
# libCEED
- make configure OPT='-O -march=native -ffp-contract=fast' CUDA_DIR=/usr
- echo "-------------- libCEED -------------" && make info
- BACKENDS_GPU=$(make info-backends | grep -o '/gpu[^ ]*')
- BACKENDS_GPU=$(make info-backends | grep -o '/gpu[^ ]*' | tr '\n' ' ')
- echo "-------------- BACKENDS_GPU --------" && echo $BACKENDS_GPU
- PEDANTIC=1 make -k -j$NPROC_CPU -l$NPROC_CPU
# -- libCEED only tests
Expand Down
1 change: 1 addition & 0 deletions AUTHORS
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ Jean-Sylvain Camier
Veselin Dobrev
Yohann Dudouit
Leila Ghaffari
Sebastian Grimberg
Tzanio Kolev
David Medina
Will Pazner
Expand Down
Loading

0 comments on commit b5f4136

Please sign in to comment.