Skip to content

Commit ea51581

Browse files
bmhan12bmhan12
authored
Merge pull request #916 from LLNL/v0.7.0-rc
V0.7.0 rc
2 parents ee240d3 + 551e1ea commit ea51581

File tree

1,078 files changed

+57291
-17533
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,078 files changed

+57291
-17533
lines changed

‎.github/workflows/docker_build_tpls.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
name: Builds a docker image and extracts generated hostconfigs
1212
strategy:
1313
matrix:
14-
compiler: [clang-10, gcc-8]
14+
compiler: [clang-10, gcc-11]
1515
env:
1616
REPO: axom/tpls
1717
HOSTCONFIG_LOC: /home/axom/export_hostconfig

‎.github/workflows/test_windows_tpls.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,10 @@ jobs:
2222
include:
2323
- arch: "x64"
2424
triplet: "x64-windows"
25-
msvc: "201964"
25+
msvc: "202264"
2626
- arch: "x86"
2727
triplet: "x86-windows"
28-
msvc: "2019"
28+
msvc: "2022"
2929

3030
steps:
3131
- name: Checkout repo w/ submodules

‎.gitignore‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
12
build-
23
install-
34
.cproject
@@ -17,3 +18,5 @@ tpl_dirs_summary.json
1718
uberenv_libs
1819
*_build*
1920
.idea
21+
*.opendb
22+
scripts/make_local_branch_from_fork_pr.sh

‎.gitlab-ci.yml‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright (c) 2017-2021, Lawrence Livermore National Security, LLC and
1+
# Copyright (c) 2017-2022, Lawrence Livermore National Security, LLC and
22
# other Axom Project Developers. See the top-level LICENSE file for details.
33
#
44
# SPDX-License-Identifier: (BSD-3-Clause)
@@ -32,7 +32,7 @@ stages:
3232
- ASSIGN_ID=$(if [[ -n "${JOBID}" ]]; then echo "--jobid=${JOBID}"; fi)
3333
# BUILD + TEST
3434
- echo -e "\e[0Ksection_start:$(date +%s):src_build_and_test\r\e[0KSource Build and Test ${CI_PROJECT_NAME}"
35-
- ${ALLOC_COMMAND} ${ASSIGN_ID} python3 scripts/llnl_scripts/build_src.py -v --host-config ${HOST_CONFIG} --extra-cmake-options '-DENABLE_DOCS=OFF ${EXTRA_CMAKE_OPTIONS}' --build-type ${BUILD_TYPE:-Debug}
35+
- ${ALLOC_COMMAND} ${ASSIGN_ID} python3 scripts/llnl_scripts/build_src.py -v --host-config ${HOST_CONFIG} --extra-cmake-options '-DENABLE_DOCS=OFF ${EXTRA_CMAKE_OPTIONS}' --build-type ${BUILD_TYPE:-Debug} ${EXTRA_OPTIONS}
3636
- echo -e "\e[0Ksection_end:$(date +%s):src_build_and_test\r\e[0K"
3737
artifacts:
3838
paths:
@@ -57,3 +57,4 @@ stages:
5757
include:
5858
- local: .gitlab/build_ruby.yml
5959
- local: .gitlab/build_lassen.yml
60+
- local: .gitlab/build_tioga.yml

‎.gitlab/build_lassen.yml‎

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright (c) 2017-2021, Lawrence Livermore National Security, LLC and
1+
# Copyright (c) 2017-2022, Lawrence Livermore National Security, LLC and
22
# other Axom Project Developers. See the top-level LICENSE file for details.
33
#
44
# SPDX-License-Identifier: (BSD-3-Clause)
@@ -19,7 +19,7 @@
1919
# Load required CUDA module
2020
.with_cuda:
2121
before_script:
22-
- module load cuda/10.1.243
22+
- module load cuda/11.0.2
2323

2424
####
2525
# Template
@@ -39,15 +39,15 @@
3939

4040
####
4141
# PR Build jobs
42-
lassen-clang_8_0_1_nvcc_xlf-src:
42+
lassen-clang_8_0_1_cuda-src:
4343
variables:
44-
COMPILER: "clang@8.0.1_nvcc_xlf"
44+
COMPILER: "clang@8.0.1_cuda"
4545
HOST_CONFIG: "lassen-blueos_3_ppc64le_ib_p9-${COMPILER}.cmake"
4646
extends: [.src_build_on_lassen, .with_cuda]
4747

48-
lassen-clang_9_0_0_upstream_xlf-src:
48+
lassen-clang_9_0_0-src:
4949
variables:
50-
COMPILER: "clang@9.0.0_upstream_xlf"
50+
COMPILER: "clang@9.0.0"
5151
HOST_CONFIG: "lassen-blueos_3_ppc64le_ib_p9-${COMPILER}.cmake"
5252
extends: [.src_build_on_lassen]
5353

@@ -57,31 +57,31 @@ lassen-gcc_7_3_1-src:
5757
HOST_CONFIG: "lassen-blueos_3_ppc64le_ib_p9-${COMPILER}.cmake"
5858
extends: [.src_build_on_lassen]
5959

60-
lassen-xl_16_1_1-src:
60+
lassen-xl_16_1_1_11_cuda-src:
6161
variables:
62-
COMPILER: "xl@16.1.1_coral"
62+
COMPILER: "xl@16.1.1.11_cuda"
6363
HOST_CONFIG: "lassen-blueos_3_ppc64le_ib_p9-${COMPILER}.cmake"
6464
extends: [.src_build_on_lassen]
6565

66-
lassen-xl_16_1_1_nvcc-src:
66+
lassen-xl_16_1_1_12-src:
6767
variables:
68-
COMPILER: "xl@16.1.1_nvcc"
68+
COMPILER: "xl@16.1.1.12"
6969
HOST_CONFIG: "lassen-blueos_3_ppc64le_ib_p9-${COMPILER}.cmake"
7070
extends: [.src_build_on_lassen, .with_cuda]
7171

7272

7373
####
7474
# Full Build jobs
75-
lassen-clang_8_0_1_nvcc_xlf-full:
75+
lassen-clang_8_0_1_cuda-full:
7676
variables:
77-
COMPILER: "clang@8.0.1_nvcc_xlf"
77+
COMPILER: "clang@8.0.1"
7878
SPEC: "%${COMPILER}+mfem+cuda~openmp"
7979
EXTRA_SPEC: "cuda_arch=70"
8080
extends: [.full_build_on_lassen, .with_cuda]
8181

82-
lassen-clang_9_0_0_upstream_xlf-full:
82+
lassen-clang_9_0_0-full:
8383
variables:
84-
COMPILER: "clang@9.0.0_upstream_xlf"
84+
COMPILER: "clang@9.0.0"
8585
SPEC: "%${COMPILER}+mfem~openmp"
8686
extends: [.full_build_on_lassen]
8787

@@ -91,15 +91,15 @@ lassen-gcc_7_3_1-full:
9191
SPEC: "%${COMPILER}+mfem"
9292
extends: [.full_build_on_lassen]
9393

94-
lassen-xl_16_1_1_coral-full:
94+
lassen-xl_16_1_1_11_cuda-full:
9595
variables:
96-
COMPILER: "xl@16.1.1_coral"
97-
SPEC: "%${COMPILER}+mfem~openmp~cpp14"
98-
extends: [.full_build_on_lassen]
99-
100-
lassen-xl_16_1_1_nvcc-full:
101-
variables:
102-
COMPILER: "xl@16.1.1_nvcc"
96+
COMPILER: "xl@16.1.1.11"
10397
SPEC: "%${COMPILER}+mfem+cuda~openmp~cpp14"
10498
EXTRA_SPEC: "cuda_arch=70"
10599
extends: [.full_build_on_lassen, .with_cuda]
100+
101+
lassen-xl_16_1_1_12-full:
102+
variables:
103+
COMPILER: "xl@16.1.1.12"
104+
SPEC: "%${COMPILER}+mfem~openmp~cpp14"
105+
extends: [.full_build_on_lassen]

‎.gitlab/build_ruby.yml‎

Lines changed: 10 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright (c) 2017-2021, Lawrence Livermore National Security, LLC and
1+
# Copyright (c) 2017-2022, Lawrence Livermore National Security, LLC and
22
# other Axom Project Developers. See the top-level LICENSE file for details.
33
#
44
# SPDX-License-Identifier: (BSD-3-Clause)
@@ -77,25 +77,18 @@ ruby-clang_9_0_0-src:
7777
HOST_CONFIG: "ruby-toss_3_x86_64_ib-${COMPILER}.cmake"
7878
extends: .src_build_on_ruby
7979

80-
ruby-gcc_8_1_0-src:
80+
ruby-gcc_8_3_1-src:
8181
variables:
82-
COMPILER: "gcc@8.1.0"
82+
COMPILER: "gcc@8.3.1"
8383
HOST_CONFIG: "ruby-toss_3_x86_64_ib-${COMPILER}.cmake"
8484
extends: .src_build_on_ruby
8585

86-
ruby-gcc_8_1_no_fortran-src:
86+
ruby-gcc_8_1_0_no_fortran-src:
8787
variables:
88-
COMPILER: "gcc@8.1_no_fortran"
89-
HOST_CONFIG: "ruby-toss_3_x86_64_ib-${COMPILER}.cmake"
88+
COMPILER: "gcc@8.1.0"
89+
HOST_CONFIG: "ruby-toss_3_x86_64_ib-${COMPILER}_nofortran.cmake"
9090
extends: .src_build_on_ruby
9191

92-
# disabled due to time limit
93-
# ruby-intel_18_0_2-src:
94-
# variables:
95-
# COMPILER: "intel@18.0.2"
96-
# HOST_CONFIG: "ruby-toss_3_x86_64_ib-${COMPILER}.cmake"
97-
# extends: .src_build_on_ruby
98-
9992
# disabled due to time limit
10093
# ruby-intel_19_0_4-src:
10194
# variables:
@@ -118,24 +111,18 @@ ruby-clang_9_0_0-full:
118111
SPEC: "%${COMPILER}+mfem"
119112
extends: .full_build_on_ruby
120113

121-
ruby-gcc_8_1_0-full:
114+
ruby-gcc_8_3_1-full:
122115
variables:
123-
COMPILER: "gcc@8.1.0"
116+
COMPILER: "gcc@8.3.1"
124117
SPEC: "%${COMPILER}+mfem"
125118
extends: .full_build_on_ruby
126119

127-
ruby-gcc_8_1_no_fortran-full:
120+
ruby-gcc_8_1_0_no_fortran-full:
128121
variables:
129-
COMPILER: "gcc@8.1_no_fortran"
122+
COMPILER: "gcc@8.1.0"
130123
SPEC: "%${COMPILER}~fortran+mfem"
131124
extends: .full_build_on_ruby
132125

133-
ruby-intel_18_0_2-full:
134-
variables:
135-
COMPILER: "intel@18.0.2"
136-
SPEC: "%${COMPILER}+mfem~cpp14"
137-
extends: .full_build_on_ruby
138-
139126
ruby-intel_19_0_4-full:
140127
variables:
141128
COMPILER: "intel@19.0.4"

‎.gitlab/build_rzansel.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright (c) 2017-2021, Lawrence Livermore National Security, LLC and
1+
# Copyright (c) 2017-2022, Lawrence Livermore National Security, LLC and
22
# other Axom Project Developers. See the top-level LICENSE file for details.
33
#
44
# SPDX-License-Identifier: (BSD-3-Clause)

‎.gitlab/build_rzgenie.yml‎

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright (c) 2017-2021, Lawrence Livermore National Security, LLC and
1+
# Copyright (c) 2017-2022, Lawrence Livermore National Security, LLC and
22
# other Axom Project Developers. See the top-level LICENSE file for details.
33
#
44
# SPDX-License-Identifier: (BSD-3-Clause)
@@ -43,13 +43,6 @@ rzgenie-gcc_8_1_0-src:
4343
HOST_CONFIG: "rzgenie-toss_3_x86_64_ib-${COMPILER}.cmake"
4444
extends: .src_build_on_rzgenie
4545

46-
# disabled due to time limit
47-
# rzgenie-intel_18_0_2-src:
48-
# variables:
49-
# COMPILER: "intel@18.0.2"
50-
# HOST_CONFIG: "rzgenie-toss_3_x86_64_ib-${COMPILER}.cmake"
51-
# extends: .src_build_on_rzgenie
52-
5346
rzgenie-intel_19_0_4-src:
5447
variables:
5548
COMPILER: "intel@19.0.4"
@@ -83,12 +76,6 @@ rzgenie-gcc_8_1_no_fortran-full:
8376
SPEC: "%${COMPILER}~fortran+mfem"
8477
extends: .full_build_on_rzgenie
8578

86-
rzgenie-intel_18_0_2-full:
87-
variables:
88-
COMPILER: "intel@18.0.2"
89-
SPEC: "%${COMPILER}+mfem~cpp14"
90-
extends: .full_build_on_rzgenie
91-
9279
rzgenie-intel_19_0_4-full:
9380
variables:
9481
COMPILER: "intel@19.0.4"

‎.gitlab/build_tioga.yml‎

Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
1+
# Copyright (c) 2017-2022, Lawrence Livermore National Security, LLC and
2+
# other Axom Project Developers. See the top-level LICENSE file for details.
3+
#
4+
# SPDX-License-Identifier: (BSD-3-Clause)
5+
6+
####
7+
# This is the shared configuration of jobs for tioga
8+
.on_tioga:
9+
tags:
10+
- shell
11+
- tioga
12+
rules:
13+
- if: '$CI_COMMIT_BRANCH =~ /_qnone/ || $ON_TIOGA == "OFF"' #run except if ...
14+
when: never
15+
- when: on_success
16+
17+
####
18+
# Template
19+
.src_build_on_tioga:
20+
stage: build
21+
variables:
22+
ALLOC_COMMAND: "srun -p pdebug -t 25 -N 1 "
23+
EXTRA_OPTIONS: "--test-serial"
24+
extends: [.src_build_script, .on_tioga, .src_workflow]
25+
needs: []
26+
27+
.full_build_on_tioga:
28+
stage: build
29+
variables:
30+
ALLOC_COMMAND: "srun -p pbatch -t 60 -N 1 "
31+
extends: [.full_build_script, .on_tioga, .full_workflow]
32+
needs: []
33+
34+
####
35+
# PR Build jobs
36+
tioga-clang_14_0_0_hip-src:
37+
variables:
38+
COMPILER: "clang@14.0.0_hip"
39+
HOST_CONFIG: "tioga-toss_4_x86_64_ib_cray-${COMPILER}.cmake"
40+
extends: .src_build_on_tioga
41+
allow_failure: true
42+
43+
####
44+
# Full Build jobs
45+
tioga-clang_14_0_0_hip-full:
46+
variables:
47+
COMPILER: "clang@14.0.0_hip"
48+
SPEC: "%${COMPILER}~openmp+rocm+mfem+c2c"
49+
EXTRASPEC: "amdgpu_target=gfx90a ^raja~openmp+rocm ^umpire~openmp+rocm"
50+
extends: .full_build_on_tioga
51+
allow_failure: true

‎.mailmap‎

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,16 @@ Benjamin Curtice Corbett <corbett5@llnl.gov> Benjamin Corbett <corbett5@llnl.
1515
Benjamin Curtice Corbett <corbett5@llnl.gov> Ben Corbett <32752943+corbett5@users.noreply.github.com>
1616
Brian Manh Hien Han <han12@llnl.gov> Brian Han <han12@llnl.gov>
1717
Brian Manh Hien Han <han12@llnl.gov> Brian Manh Hien Han <han12@rzansel19.coral.llnl.gov>
18+
Brian T.N. Gunney <gunney1@llnl.gov> Brian Gunney <45609916+gunney1@users.noreply.github.com>
1819
Chris White <white238@llnl.gov> Christopher A. White <white238@llnl.gov>
1920
Cyrus D. Harrison <harrison37@llnl.gov> Cyrus Harrison <cyrush@llnl.gov>
2021
Cyrus D. Harrison <harrison37@llnl.gov> Cyrus Harrison <harrison37@llnl.gov>
2122
Cyrus D. Harrison <harrison37@llnl.gov> Cyrus <cyrush@llnl.gov>
23+
Daniel Taller <taller1@llnl.gov> Danny Taller <66029857+dtaller@users.noreply.github.com>
2224
Esteban Pauli <pauli2@llnl.gov> Esteban Pauli <40901502+estebanpauli@users.noreply.github.com>
2325
Evan Taylor Desantola <desantola1@llnl.gov> Evan Taylor DeSantola <desantola1@llnl.gov>
2426
George Zagaris <zagaris2@llnl.gov> George Zagaris <george.zagaris@gmail.com>
27+
Jacob Spainhour <spainhour1@llnl.gov> jcs15c <Jacob.Spainhour@colorado.edu>
2528
Joe Hennis <hennis1@llnl.gov> Hennis <hennis1@luz.llnl.gov>
2629
Joe Hennis <hennis1@llnl.gov> hennis1 <73615573+hennis1@users.noreply.github.com>
2730
Josh Essman <essman1@llnl.gov> Josh Essman <68349992+joshessman-llnl@users.noreply.github.com>
@@ -36,19 +39,26 @@ Lee A. Taylor <taylor16@llnl.gov> Lee A. Taylor <taylor@cab688.lln
3639
Lee A. Taylor <taylor16@llnl.gov> Lee Taylor <ltaylor@llnl.gov>
3740
Lee A. Taylor <taylor16@llnl.gov> Lee Taylor <taylor16@llnl.gov>
3841
Lee A. Taylor <taylor16@llnl.gov> Lee Taylor <31938638+ltaylor16@users.noreply.github.com>
39-
Matt Larsen <larsen30@llnl.gov> mclarsen <larsen30@llnl.gov>
42+
Matt Larsen <larsen30@llnl.gov> mclarsen <larsen30@llnl.gov>
43+
Max Yang <yang39@llnl.gov> kanye-quest <yang39@llnl.gov>
44+
Misha Zakharchanka <mishaz@llnl.gov> Misha Zakharchanka <35752952+MishaZakharchanka@users.noreply.github.com>
45+
Misha Zakharchanka <mishaz@llnl.gov> MishaZakharchanka <mishaz@rzgenie16.llnl.gov>
4046
Noah S. Elliott <elliott22@llnl.gov> Noah Elliott <elliott22@llnl.gov>
4147
Punita P. Sinha <sinha2@llnl.gov> Punita P. Sinha <sinha2@cab687.llnl.gov>
4248
Punita P. Sinha <sinha2@llnl.gov> Punita P. Sinha <sinha2@cab669.llnl.gov>
4349
Punita P. Sinha <sinha2@llnl.gov> Punita P. Sinha <sinha2@cab670.llnl.gov>
4450
Punita P. Sinha <sinha2@llnl.gov> Punita Sinha <sinha2@llnl.gov>
45-
Raine Yeh <yeh14@llnl.gov> Yo-Sing Yeh <yeh14@llnl.gov>
51+
Raine Yeh <raine.yeh@gmail.com> Yo-Sing Yeh <yeh14@llnl.gov>
52+
Raine Yeh <raine.yeh@gmail.com> Raine Yeh <yeh14@llnl.gov>
53+
Raine Yeh <raine.yeh@gmail.com> Raine <raine.yeh@gmail.com>
4654
Randolph Settgast <settgast1@llnl.gov> Randolph R. Settgast <rrsettgast@gmail.com>
4755
Randolph Settgast <settgast1@llnl.gov> Randolph R. Settgast <settgast1@llnl.gov>
4856
Randolph Settgast <settgast1@llnl.gov> Randy Settgast <settgast1@llnl.gov>
4957
Richard D. Hornung <hornung1@llnl.gov> Rich Hornung <hornung1@llnl.gov>
5058
Robert Carson <rac428@cornell.edu> Robert <rac428@cornell.edu>
5159
Robert Carson <rac428@cornell.edu> rcarson3 <rac428@cornell.edu>
60+
Robert Cohn <robert.s.cohn@intel.com> rscohn2 <rscohn2@gmail.com>
61+
Samuel P. Mish <mish2@llnl.gov> samuelpmishLLNL <61714427+samuelpmishLLNL@users.noreply.github.com>
5262

5363
Axom Shared User <axom-dev@llnl.gov> Asctoolkit Shared User <axom-dev@llnl.gov>
5464
Axom Shared User <axom-dev@llnl.gov> Asctoolkit Shared User <atk@cab687.llnl.gov>

0 commit comments

Comments
 (0)