Skip to content

Commit 2975440

Browse files
rhornung67rhornung67
authored
Merge pull request #1680 from LLNL/v0.12.0-RC
v0.12.0 release candidate
2 parents 6859604 + 4d29d8b commit 2975440

File tree

1,085 files changed

+69845
-52298
lines changed

Some content is hidden

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

1,085 files changed

+69845
-52298
lines changed

‎.git-blame-ignore-revs‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
a1288e9fba56d695aa9dc15d515b636561085727
2+
ab83d637a0ac3eb1d3203c7f2ed820eb5ba293df
3+
519eab38b795cdc61d498a9329c744d9d4106130
4+
a725111d42a4f51ca51b3e1d30cdd42291d5cff5
5+
a0dde39b696ef2f85fa7e49bf4433e1c4aa20d69
6+
dfc9021ed2b3b1c64ed5d884e17465179cad0e8f
7+
9a5ad48d45712c953b77fd89b26d26cad3789016
8+
86125f463ce3c2ff763a90447f538372c240ceb5
9+
898692427a737bfecb6741629214790b9c8df268
10+
477af8a69602a1e305650c176fe922833ac19b47
11+
d80d13729d398270eb2d2b8caabb690808b93898
12+

‎.github/actions/apply-style/Dockerfile‎

Lines changed: 0 additions & 7 deletions
This file was deleted.

‎.github/actions/apply-style/entrypoint.sh‎

Lines changed: 0 additions & 68 deletions
This file was deleted.

‎.github/workflows/apply-style.yml‎

Lines changed: 0 additions & 28 deletions
This file was deleted.

‎.github/workflows/ci-tests.yml‎

Lines changed: 192 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,192 @@
1+
name: CI Tests
2+
3+
on:
4+
pull_request:
5+
push:
6+
branches:
7+
- develop
8+
9+
# Cancel previous jobs if an update has been made to the pull request
10+
concurrency:
11+
group: ${{ github.workflow }}-${{ github.ref }}
12+
cancel-in-progress: ${{ github.ref != 'refs/heads/develop' }}
13+
14+
env:
15+
CLANG_DOCKER_IMAGE: axom/tpls:clang-14_09-29-25_18h-36m
16+
GCC_DOCKER_IMAGE: axom/tpls:gcc-13_09-29-25_18h-26m
17+
18+
jobs:
19+
# Hacky solution to reference env variables outside of `run` steps https://stackoverflow.com/a/74217028
20+
set_image_vars:
21+
runs-on: ubuntu-latest
22+
steps:
23+
- name: Do Nothing
24+
run: echo
25+
outputs:
26+
clang_docker_image: ${{ env.CLANG_DOCKER_IMAGE }}
27+
gcc_docker_image: ${{ env.GCC_DOCKER_IMAGE }}
28+
build_and_test:
29+
runs-on: ubuntu-22.04
30+
needs:
31+
- set_image_vars
32+
strategy:
33+
fail-fast: true
34+
matrix:
35+
build_type: [ Debug, Release ]
36+
config:
37+
- job_name: [email protected], shared, benchmarks
38+
host_config: [email protected]
39+
compiler_image: ${{ needs.set_image_vars.outputs.gcc_docker_image }}
40+
cmake_opts: '-DBUILD_SHARED_LIBS=ON -DAXOM_ENABLE_MFEM_SIDRE_DATACOLLECTION:BOOL=ON -DENABLE_BENCHMARKS:BOOL=ON'
41+
do_build: 'yes'
42+
do_benchmarks: 'yes'
43+
- job_name: [email protected], shared, 64bit
44+
host_config: [email protected]
45+
compiler_image: ${{ needs.set_image_vars.outputs.gcc_docker_image }}
46+
cmake_opts: '-DBUILD_SHARED_LIBS=ON -DBLT_CXX_STD=c++20 -DAXOM_USE_64BIT_INDEXTYPE:BOOL=ON'
47+
do_build: 'yes'
48+
do_benchmarks: 'no'
49+
- job_name: [email protected], shared, benchmarks, quest regression
50+
host_config: [email protected]
51+
compiler_image: ${{ needs.set_image_vars.outputs.clang_docker_image }}
52+
cmake_opts: '-DBUILD_SHARED_LIBS=ON -DAXOM_QUEST_ENABLE_EXTRA_REGRESSION_TESTS:BOOL=ON -DENABLE_BENCHMARKS:BOOL=ON'
53+
do_build: 'yes'
54+
do_benchmarks: 'yes'
55+
include:
56+
- build_type: Debug
57+
config:
58+
job_name: [email protected], shared, no raja
59+
host_config: [email protected]
60+
compiler_image: ${{ needs.set_image_vars.outputs.clang_docker_image }}
61+
cmake_opts: '-DBUILD_SHARED_LIBS=ON -DAXOM_QUEST_ENABLE_EXTRA_REGRESSION_TESTS:BOOL=ON -DAXOM_ENABLE_MIR:BOOL=OFF -DAXOM_ENABLE_BUMP:BOOL=OFF -U RAJA_DIR'
62+
do_build: 'yes'
63+
do_benchmarks: 'no'
64+
- build_type: Debug
65+
config:
66+
job_name: [email protected], shared, no umpire
67+
host_config: [email protected]
68+
compiler_image: ${{ needs.set_image_vars.outputs.clang_docker_image }}
69+
cmake_opts: '-DBUILD_SHARED_LIBS=ON -DAXOM_QUEST_ENABLE_EXTRA_REGRESSION_TESTS:BOOL=ON -U UMPIRE_DIR'
70+
do_build: 'yes'
71+
do_benchmarks: 'no'
72+
- build_type: Debug
73+
config:
74+
job_name: [email protected], shared, no raja and umpire
75+
host_config: [email protected]
76+
compiler_image: ${{ needs.set_image_vars.outputs.clang_docker_image }}
77+
cmake_opts: '-DBUILD_SHARED_LIBS=ON -DAXOM_QUEST_ENABLE_EXTRA_REGRESSION_TESTS:BOOL=ON -DAXOM_ENABLE_MIR:BOOL=OFF -DAXOM_ENABLE_BUMP:BOOL=OFF -U RAJA_DIR -U UMPIRE_DIR'
78+
do_build: 'yes'
79+
do_benchmarks: 'no'
80+
- build_type: Debug
81+
config:
82+
job_name: [email protected], shared, no profiling
83+
host_config: [email protected]
84+
compiler_image: ${{ needs.set_image_vars.outputs.clang_docker_image }}
85+
cmake_opts: '-DBUILD_SHARED_LIBS=ON -DAXOM_QUEST_ENABLE_EXTRA_REGRESSION_TESTS:BOOL=ON -U CALIPER_DIR -U ADIAK_DIR'
86+
do_build: 'yes'
87+
do_benchmarks: 'no'
88+
name: ${{ matrix.build_type }} - ${{ matrix.config.job_name }}
89+
container:
90+
image: ${{ matrix.config.compiler_image }}
91+
volumes:
92+
- /home/axom/axom
93+
steps:
94+
- name: Checkout Axom
95+
uses: actions/checkout@v4
96+
with:
97+
submodules: recursive
98+
- name: Print Matrix Variables
99+
run: |
100+
echo "build_type ${{ matrix.build_type }}"
101+
echo "cmake_opts ${{ matrix.config.cmake_opts }}"
102+
echo "compiler_image ${{ matrix.config.compiler_image }}"
103+
echo "host_config ${{ matrix.config.host_config }}"
104+
- name: Build and Test ${{ matrix.build_type }} - ${{ matrix.config.job_name }}
105+
timeout-minutes: 80
106+
run: |
107+
DO_BUILD=${{ matrix.config.do_build }} \
108+
DO_BENCHMARKS=${{ matrix.config.do_benchmarks }} \
109+
HOST_CONFIG=${{ matrix.config.host_config }} \
110+
CMAKE_EXTRA_FLAGS=" ${{ matrix.config.cmake_opts }} " \
111+
BUILD_TYPE=${{ matrix.build_type }} \
112+
./scripts/github-actions/linux-build_and_test.sh
113+
- name: Upload Test Results
114+
uses: actions/upload-artifact@v4
115+
with:
116+
name: Test Results ${{ matrix.build_type }} - ${{ matrix.config.job_name }}
117+
path: "**/Test.xml"
118+
windows_build_and_test:
119+
runs-on: windows-latest
120+
strategy:
121+
# If any of checks (e.g. style) fail, allow other jobs to continue running.
122+
fail-fast: false
123+
env:
124+
CMAKE_EXTRA_FLAGS: '-DAXOM_ENABLE_SIDRE:BOOL=OFF -DAXOM_ENABLE_INLET:BOOL=OFF -DAXOM_ENABLE_KLEE:BOOL=OFF -DAXOM_ENABLE_SINA:BOOL=OFF -DAXOM_ENABLE_MIR:BOOL=OFF -DAXOM_ENABLE_BUMP:BOOL=OFF'
125+
steps:
126+
- name: Checkout Axom
127+
uses: actions/checkout@v4
128+
with:
129+
submodules: recursive
130+
- name: Windows - CMake
131+
run: |
132+
cmake ${{ env.CMAKE_EXTRA_FLAGS }} -B build -S src
133+
shell: pwsh
134+
- name: Windows - Build
135+
run: |
136+
cmake --build build
137+
shell: pwsh
138+
- name: Windows - Test
139+
run: |
140+
cd build
141+
ctest -C Debug -T Test --output-on-failure -V
142+
shell: pwsh
143+
macos_build_and_test:
144+
runs-on: macos-latest
145+
strategy:
146+
# If any of checks (e.g. style) fail, allow other jobs to continue running.
147+
fail-fast: false
148+
env:
149+
CMAKE_EXTRA_FLAGS: '-DAXOM_ENABLE_SIDRE:BOOL=OFF -DAXOM_ENABLE_INLET:BOOL=OFF -DAXOM_ENABLE_KLEE:BOOL=OFF -DAXOM_ENABLE_SINA:BOOL=OFF -DAXOM_ENABLE_MIR:BOOL=OFF -DAXOM_ENABLE_BUMP:BOOL=OFF'
150+
steps:
151+
- name: Checkout Axom
152+
uses: actions/checkout@v4
153+
with:
154+
submodules: recursive
155+
- name: macOS - CMake
156+
run: |
157+
cmake ${{ env.CMAKE_EXTRA_FLAGS }} -B build -S src
158+
shell: bash
159+
- name: macOS - Build
160+
run: |
161+
cmake --build build
162+
shell: bash
163+
- name: macOS - Test
164+
run: |
165+
cd build
166+
ctest -T Test --output-on-failure -V
167+
shell: bash
168+
check_code:
169+
runs-on: ubuntu-22.04
170+
needs:
171+
- set_image_vars
172+
strategy:
173+
# If any of checks (e.g. style) fail, allow other jobs to continue running.
174+
fail-fast: false
175+
matrix:
176+
check_type: [style]
177+
container:
178+
image: ${{ needs.set_image_vars.outputs.clang_docker_image }}
179+
volumes:
180+
- /home/axom/axom
181+
env:
182+
CHECK_TYPE: ${{ matrix.check_type }}
183+
HOST_CONFIG: [email protected]
184+
steps:
185+
- name: Checkout Axom
186+
uses: actions/checkout@v4
187+
with:
188+
submodules: recursive
189+
- name: Check ${{ matrix.check_type }}
190+
run: ./scripts/github-actions/linux-check.sh
191+
192+

‎.gitlab-ci.yml‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,9 +49,10 @@ variables:
4949

5050
# This is where jobs are included
5151
include:
52-
- local: .gitlab/build_ruby.yml
53-
- local: .gitlab/build_lassen.yml
52+
- local: .gitlab/build_dane.yml
53+
#- local: .gitlab/build_lassen.yml
5454
- local: .gitlab/build_tioga.yml
55+
- local: .gitlab/build_tuolumne.yml
5556
# ID token requirement for Gitlab 17.0+
5657
- project: 'lc-templates/id_tokens'
5758
file: 'id_tokens.yml'

0 commit comments

Comments
 (0)