Skip to content

Commit 65287dc

Browse files
rhornung67rhornung67
authored
Merge pull request #697 from LLNL/v0.6.0-RC
V0.6.0 rc
2 parents db13734 + 718bc45 commit 65287dc

File tree

556 files changed

+47907
-18906
lines changed

Some content is hidden

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

556 files changed

+47907
-18906
lines changed

‎.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -16,3 +16,4 @@ tpl_dirs_summary.json
1616
*.vscode*
1717
uberenv_libs
1818
*_build*
19+
.idea

‎.gitlab-ci.yml

+6-7
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ variables:
88
PROJECT_ALLOC_NAME: ${CI_PROJECT_NAME}_ci_${CI_PIPELINE_ID}
99
BUILD_ROOT: ${CI_PROJECT_DIR}
1010
FULL_BUILD_ROOT: ${CI_BUILDS_DIR}/axom/${CI_JOB_NAME}
11+
SLURM_OVERLAP: 1
1112

1213
stages:
1314
- allocate
@@ -30,10 +31,9 @@ stages:
3031
- JOBID=$(if [[ "$SYS_TYPE" == "toss_3_x86_64_ib" ]]; then squeue -h --name=${PROJECT_ALLOC_NAME} --format=%A; fi)
3132
- ASSIGN_ID=$(if [[ -n "${JOBID}" ]]; then echo "--jobid=${JOBID}"; fi)
3233
# BUILD + TEST
33-
- echo -e "section_start:$(date +%s):src_build_and_test\r\e[0K
34-
Source Build and Test ${CI_PROJECT_NAME}"
35-
- ${ALLOC_COMMAND} python3 scripts/llnl_scripts/build_src.py -v --host-config ${HOST_CONFIG} --extra-cmake-options -DENABLE_DOCS=OFF
36-
- echo -e "section_end:$(date +%s):src_build_and_test\r\e[0K"
34+
- 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
36+
- echo -e "\e[0Ksection_end:$(date +%s):src_build_and_test\r\e[0K"
3737
artifacts:
3838
paths:
3939
- _axom_build_and_test_*/output.log*.txt
@@ -43,10 +43,9 @@ stages:
4343

4444
.full_build_script:
4545
script:
46-
- echo -e "section_start:$(date +%s):full_build_and_test\r\e[0K
47-
Full Build and Test ${CI_PROJECT_NAME}"
46+
- echo -e "\e[0Ksection_start:$(date +%s):full_build_and_test\r\e[0KFull Build and Test ${CI_PROJECT_NAME}"
4847
- ${ALLOC_COMMAND} python3 scripts/llnl_scripts/build_tpls.py -v --spec="${SPEC} ${EXTRA_SPEC}" --directory=${FULL_BUILD_ROOT}
49-
- echo -e "section_end:$(date +%s):full_build_and_test\r\e[0K"
48+
- echo -e "\e[0Ksection_end:$(date +%s):full_build_and_test\r\e[0K"
5049
artifacts:
5150
paths:
5251
- ${FULL_BUILD_ROOT}/${SYS_TYPE}/*/_axom_build_and_test_*/output.log*.txt

‎.gitlab/build_ruby.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -44,14 +44,14 @@ ruby_release:
4444
.src_build_on_ruby:
4545
stage: build
4646
variables:
47-
ALLOC_COMMAND: "srun -p pdebug -t 30 -N 1 ${ASSIGN_ID}"
47+
ALLOC_COMMAND: "srun -p pdebug -t 60 -N 1 "
4848
extends: [.src_build_script, .on_ruby, .src_workflow]
4949
needs: [ruby_allocate]
5050

5151
.full_build_on_ruby:
5252
stage: build
5353
variables:
54-
ALLOC_COMMAND: "srun -p pdebug -t 60 -N 1"
54+
ALLOC_COMMAND: "srun -p pdebug -t 60 -N 1 "
5555
extends: [.full_build_script, .on_ruby, .full_workflow]
5656
needs: []
5757

‎.gitlab/build_rzansel.yml

+103
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,103 @@
1+
# Copyright (c) 2017-2021, 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 share configuration of jobs for rzansel
8+
.on_rzansel:
9+
variables:
10+
tags:
11+
- shell
12+
- rzansel
13+
before_script:
14+
- module load cmake/3.14.5
15+
16+
####
17+
# Load required CUDA module
18+
.with_cuda:
19+
before_script:
20+
- module load cuda/10.1.243
21+
22+
####
23+
# Template
24+
.src_build_on_rzansel:
25+
stage: build
26+
variables:
27+
ALLOC_COMMAND: "lalloc 1 -W 25 -q pdebug"
28+
extends: [.src_build_script, .on_rzansel, .src_workflow]
29+
needs: []
30+
31+
.full_build_on_rzansel:
32+
stage: build
33+
variables:
34+
ALLOC_COMMAND: "lalloc 1 -W 45 -q pdebug"
35+
extends: [.full_build_script, .on_rzansel, .full_workflow]
36+
needs: []
37+
38+
####
39+
# PR Build jobs
40+
rzansel-clang_8_0_1_nvcc_xlf-src:
41+
variables:
42+
COMPILER: "[email protected]_nvcc_xlf"
43+
HOST_CONFIG: "rzansel-klee-${COMPILER}.cmake"
44+
extends: [.src_build_on_rzansel, .with_cuda]
45+
46+
rzansel-clang_9_0_0_upstream_xlf-src:
47+
variables:
48+
COMPILER: "[email protected]_upstream_xlf"
49+
HOST_CONFIG: "rzansel-blueos_3_ppc64le_ib_p9-${COMPILER}.cmake"
50+
extends: [.src_build_on_rzansel]
51+
52+
rzansel-gcc_7_3_1-src:
53+
variables:
54+
COMPILER: "[email protected]"
55+
HOST_CONFIG: "rzansel-blueos_3_ppc64le_ib_p9-${COMPILER}.cmake"
56+
extends: [.src_build_on_rzansel]
57+
58+
rzansel-xl_16_1_1-src:
59+
variables:
60+
COMPILER: "[email protected]_coral"
61+
HOST_CONFIG: "rzansel-blueos_3_ppc64le_ib_p9-${COMPILER}.cmake"
62+
extends: [.src_build_on_rzansel]
63+
64+
rzansel-xl_16_1_1_nvcc-src:
65+
variables:
66+
COMPILER: "[email protected]_nvcc"
67+
HOST_CONFIG: "rzansel-blueos_3_ppc64le_ib_p9-${COMPILER}.cmake"
68+
extends: [.src_build_on_rzansel, .with_cuda]
69+
70+
71+
####
72+
# Full Build jobs
73+
rzansel-clang_8_0_1_nvcc_xlf-full:
74+
variables:
75+
COMPILER: "[email protected]_nvcc_xlf"
76+
SPEC: "%${COMPILER}+mfem+cuda~openmp"
77+
EXTRA_SPEC: "cuda_arch=70"
78+
extends: [.full_build_on_rzansel, .with_cuda]
79+
80+
rzansel-clang_9_0_0_upstream_xlf-full:
81+
variables:
82+
COMPILER: "[email protected]_upstream_xlf"
83+
SPEC: "%${COMPILER}+mfem~openmp"
84+
extends: [.full_build_on_rzansel]
85+
86+
rzansel-gcc_7_3_1-full:
87+
variables:
88+
COMPILER: "[email protected]"
89+
SPEC: "%${COMPILER}+mfem"
90+
extends: [.full_build_on_rzansel]
91+
92+
rzansel-xl_16_1_1_coral-full:
93+
variables:
94+
COMPILER: "[email protected]_coral"
95+
SPEC: "%${COMPILER}+mfem~openmp~cpp14"
96+
extends: [.full_build_on_rzansel]
97+
98+
rzansel-xl_16_1_1_nvcc-full:
99+
variables:
100+
COMPILER: "[email protected]_nvcc"
101+
SPEC: "%${COMPILER}+mfem+cuda~openmp~cpp14"
102+
EXTRA_SPEC: "cuda_arch=70"
103+
extends: [.full_build_on_rzansel, .with_cuda]

‎.gitlab/build_rzgenie.yml

+96
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,96 @@
1+
# Copyright (c) 2017-2021, 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 rzgenie
8+
.on_rzgenie:
9+
tags:
10+
- shell
11+
- rzgenie
12+
before_script:
13+
- module load cmake/3.14.5
14+
15+
16+
####
17+
# Template
18+
.src_build_on_rzgenie:
19+
stage: build
20+
variables:
21+
ALLOC_COMMAND: "salloc -p pdebug -t 30 -N 1 -n36 srun --interactive -n1"
22+
extends: [.src_build_script, .on_rzgenie, .src_workflow]
23+
needs: []
24+
25+
.full_build_on_rzgenie:
26+
stage: build
27+
variables:
28+
ALLOC_COMMAND: "srun -p pdebug -t 60 -N 1 -n 1"
29+
extends: [.full_build_script, .on_rzgenie, .full_workflow]
30+
needs: []
31+
32+
####
33+
# PR Build jobs
34+
rzgenie-clang_10_0_0-src:
35+
variables:
36+
COMPILER: "[email protected]"
37+
HOST_CONFIG: "[email protected]"
38+
extends: .src_build_on_rzgenie
39+
40+
rzgenie-gcc_8_1_0-src:
41+
variables:
42+
COMPILER: "[email protected]"
43+
HOST_CONFIG: "rzgenie-toss_3_x86_64_ib-${COMPILER}.cmake"
44+
extends: .src_build_on_rzgenie
45+
46+
# disabled due to time limit
47+
# rzgenie-intel_18_0_2-src:
48+
# variables:
49+
# COMPILER: "[email protected]"
50+
# HOST_CONFIG: "rzgenie-toss_3_x86_64_ib-${COMPILER}.cmake"
51+
# extends: .src_build_on_rzgenie
52+
53+
rzgenie-intel_19_0_4-src:
54+
variables:
55+
COMPILER: "[email protected]"
56+
HOST_CONFIG: "rzgenie-toss_3_x86_64_ib-${COMPILER}.cmake"
57+
extends: .src_build_on_rzgenie
58+
59+
60+
####
61+
# Full Build jobs
62+
rzgenie-clang_10_0_0-full:
63+
variables:
64+
COMPILER: "[email protected]"
65+
SPEC: "%${COMPILER}+mfem"
66+
extends: .full_build_on_rzgenie
67+
68+
rzgenie-clang_9_0_0-full:
69+
variables:
70+
COMPILER: "[email protected]"
71+
SPEC: "%${COMPILER}+mfem"
72+
extends: .full_build_on_rzgenie
73+
74+
rzgenie-gcc_8_1_0-full:
75+
variables:
76+
COMPILER: "[email protected]"
77+
SPEC: "%${COMPILER}+mfem"
78+
extends: .full_build_on_rzgenie
79+
80+
rzgenie-gcc_8_1_no_fortran-full:
81+
variables:
82+
COMPILER: "[email protected]_no_fortran"
83+
SPEC: "%${COMPILER}~fortran+mfem"
84+
extends: .full_build_on_rzgenie
85+
86+
rzgenie-intel_18_0_2-full:
87+
variables:
88+
COMPILER: "[email protected]"
89+
SPEC: "%${COMPILER}+mfem~cpp14"
90+
extends: .full_build_on_rzgenie
91+
92+
rzgenie-intel_19_0_4-full:
93+
variables:
94+
COMPILER: "[email protected]"
95+
SPEC: "%${COMPILER}+mfem~cpp14"
96+
extends: .full_build_on_rzgenie

‎.mailmap

+4
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
Aaron Black <[email protected]> Aaron C. Black <[email protected]>
22
Adam J. Kunen <[email protected]> Adam J. Kunen <[email protected]>
3+
Adrien M. Bernede <[email protected]> Adrien Bernede <[email protected]>
34
Aesha Parekh <[email protected]> Aesha Parekh <[email protected]>
45
Arlie Capps <[email protected]> Arlie Capps <[email protected]>
56
Arlie Capps <[email protected]> Arlie Capps <[email protected]>
@@ -24,6 +25,7 @@ George Zagaris <[email protected]> George Zagaris <george.zagaris@g
2425
Joe Hennis <[email protected]> Hennis <[email protected]>
2526
Joe Hennis <[email protected]> hennis1 <[email protected]>
2627
Josh Essman <[email protected]> Josh Essman <[email protected]>
28+
Kae Suarez <[email protected]> Kae S <[email protected]>
2729
Kenneth Weiss <[email protected]> Kenneth Weiss <[email protected]>
2830
Kenneth Weiss <[email protected]> Kenny Weiss <[email protected]>
2931
Kenneth Weiss <[email protected]> Kenny Weiss <[email protected]>
@@ -45,6 +47,8 @@ Randolph Settgast <[email protected]> Randolph R. Settgast <rrsettgast
4547
Randolph Settgast <[email protected]> Randolph R. Settgast <[email protected]>
4648
Randolph Settgast <[email protected]> Randy Settgast <[email protected]>
4749
Richard D. Hornung <[email protected]> Rich Hornung <[email protected]>
50+
Robert Carson <[email protected]> Robert <[email protected]>
51+
Robert Carson <[email protected]> rcarson3 <[email protected]>
4852

4953
Axom Shared User <[email protected]> Asctoolkit Shared User <[email protected]>
5054
Axom Shared User <[email protected]> Asctoolkit Shared User <[email protected]>

‎.readthedocs.yml

+2
Original file line numberDiff line numberDiff line change
@@ -15,3 +15,5 @@ formats: all
1515
# Optionally set the version of Python and requirements required to build your docs
1616
python:
1717
version: 3.7
18+
install:
19+
- requirements: src/docs/requirements.txt

‎.uberenv_config.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@
44
"package_final_phase": "initconfig",
55
"package_source_dir": "../..",
66
"spack_url": "https://github.com/spack/spack",
7-
"spack_commit": "764c17053041a65f684ce565a2598d705b04a16b",
7+
"spack_commit": "d19105f76165857ca5f25ddb7e63a45a31b2ee92",
88
"spack_configs_path": "scripts/spack/configs",
99
"spack_packages_path": "scripts/spack/packages",
1010
"vcpkg_url": "https://github.com/microsoft/vcpkg",
11-
"vcpkg_commit": "b79f7675aaa82eb6c5a96ae764fb1ce379a9d5d6",
11+
"vcpkg_commit": "5568f110b509a9fd90711978a7cb76bae75bb092",
1212
"vcpkg_triplet": "x64-windows",
1313
"vcpkg_ports_path": "scripts/vcpkg_ports"
1414
}

‎CITATION.cff

+43
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
cff-version: 1.2.0
2+
message: "If you use Axom, please cite it as follows."
3+
title: "Axom: CS infrastructure components for HPC applications"
4+
doi: 10.11578/dc.20210915.2
5+
url: https://github.com/llnl/axom
6+
license: BSD-3-Clause
7+
authors:
8+
- family-names: Capps
9+
given-names: Arlie
10+
- family-names: Carson
11+
given-names: Robert
12+
- family-names: Corbett
13+
given-names: Benjamin
14+
- family-names: Elliott
15+
given-names: Noah
16+
- family-names: Essman
17+
given-names: Josh
18+
- family-names: Han
19+
given-names: Brian
20+
- family-names: Harrison
21+
given-names: Cyrus
22+
- family-names: Hornung
23+
given-names: Richard
24+
- family-names: Larsen
25+
given-names: Matthew
26+
- family-names: Moody
27+
given-names: Adam
28+
- family-names: Pauli
29+
given-names: Esteban
30+
- family-names: Settgast
31+
given-names: Randolph
32+
- family-names: Taylor
33+
given-names: Lee
34+
- family-names: Weiss
35+
given-names: Kenneth
36+
orcid: "https://orcid.org/0000-0001-6649-8022"
37+
- family-names: White
38+
given-names: Christopher
39+
- family-names: Yang
40+
given-names: Max
41+
- family-names: Zagaris
42+
given-names: George
43+

‎RELEASE

+10-2
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,30 @@
11
*******************************************************************************
22

3-
Axom: ................................, version 0.5.0
3+
Axom: ................................, version 0.6.0
44

55
Copyright (c) 2017-2021, Lawrence Livermore National Security, LLC.
66
Produced at the Lawrence Livermore National Laboratory.
77
All rights reserved. See details in the file axom/LICENSE.
88

9+
Current open source release information:
10+
Unclassified/Open Source - BSD Distribution
11+
LLNL-CODE-825966
12+
CP02462
13+
14+
Previous open source releases:
915
Unlimited Open Source - BSD Distribution
1016
LLNL-CODE-741217
1117
OCEC-17-187
1218

1319
The Axom development team is comprised of:
1420

15-
Rich Hornung ([email protected])
1621
Arlie Capps ([email protected])
1722
Noah Elliott ([email protected])
23+
Josh Essman ([email protected])
1824
Brian Han ([email protected])
1925
Cyrus Harrison ([email protected])
26+
Rich Hornung ([email protected])
27+
Esteban Pauli ([email protected])
2028
Lee Taylor ([email protected])
2129
Kenny Weiss ([email protected])
2230
Chris White ([email protected])

0 commit comments

Comments
 (0)