Skip to content

Commit 5f53159

Browse files
authored
Merge pull request #1296 from LLNL/v0.9.0-rc
v0.9.0 release candidate
2 parents 0da8a5b + 1dda8f1 commit 5f53159

File tree

1,078 files changed

+26484
-12891
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

+26484
-12891
lines changed

.gitlab-ci.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and
1+
# Copyright (c) 2017-2024, 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)
@@ -36,6 +36,7 @@ stages:
3636
- ${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}
3737
- echo -e "\e[0Ksection_end:$(date +%s):src_build_and_test\r\e[0K"
3838
artifacts:
39+
expire_in: 2 weeks
3940
paths:
4041
- _axom_build_and_test_*/output.log*.txt
4142
- _axom_build_and_test_*/build-*/output.log*.txt
@@ -48,6 +49,7 @@ stages:
4849
- ${ALLOC_COMMAND} python3 scripts/llnl_scripts/build_tpls.py -v --spec="${SPEC} ${EXTRA_SPEC}" --directory=${FULL_BUILD_ROOT}
4950
- echo -e "\e[0Ksection_end:$(date +%s):full_build_and_test\r\e[0K"
5051
artifacts:
52+
expire_in: 2 weeks
5153
paths:
5254
- ${FULL_BUILD_ROOT}/${SYS_TYPE}/*/_axom_build_and_test_*/output.log*.txt
5355
- ${FULL_BUILD_ROOT}/${SYS_TYPE}/*/_axom_build_and_test_*/build-*/output.log*.txt

.gitlab/build_lassen.yml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
1-
# Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and
1+
# Copyright (c) 2017-2024, 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)
55

66
####
77
# This is the share configuration of jobs for lassen
88
.on_lassen:
9-
variables:
109
tags:
1110
- shell
1211
- lassen
@@ -23,14 +22,14 @@
2322
.src_build_on_lassen:
2423
stage: build
2524
variables:
26-
ALLOC_COMMAND: "lalloc 1 -W 25 -q pdebug -alloc_flags atsdisable"
25+
ALLOC_COMMAND: "lalloc 1 -W 25 -q pci -alloc_flags atsdisable"
2726
extends: [.src_build_script, .on_lassen, .src_workflow]
2827
needs: []
2928

3029
.full_build_on_lassen:
3130
stage: build
3231
variables:
33-
ALLOC_COMMAND: "lalloc 1 -W 45 -q pdebug -alloc_flags atsdisable"
32+
ALLOC_COMMAND: "lalloc 1 -W 45 -q pci -alloc_flags atsdisable"
3433
extends: [.full_build_script, .on_lassen, .full_workflow]
3534
needs: []
3635

.gitlab/build_quartz.yml

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and
1+
# Copyright (c) 2017-2024, 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)
@@ -10,7 +10,7 @@
1010
- shell
1111
- quartz
1212
rules:
13-
- if: '$CI_COMMIT_BRANCH =~ /_qnone/ || $ON_RUBY == "OFF"' #run except if ...
13+
- if: '$CI_COMMIT_BRANCH =~ /_qnone/ || $ON_QUARTZ == "OFF"' #run except if ...
1414
when: never
1515
- if: '$CI_JOB_NAME =~ /quartz_release/'
1616
when: always
@@ -26,9 +26,7 @@ quartz_allocate:
2626
extends: [.on_quartz, .src_workflow]
2727
stage: allocate
2828
script:
29-
# Use when ellastic ci is on quartz or we go back to ruby
30-
#- salloc --reservation=ci --qos=ci_ruby -N 1 -c 36 -t 60 --no-shell --job-name=${PROJECT_ALLOC_NAME}
31-
- salloc -N 1 -c 36 -t 60 -p pdebug --no-shell --job-name=${PROJECT_ALLOC_NAME}
29+
- salloc -N 1 -c 36 -t 60 --res=ci --no-shell --job-name=${PROJECT_ALLOC_NAME}
3230
needs: []
3331

3432
####
@@ -48,17 +46,13 @@ quartz_release:
4846
.src_build_on_quartz:
4947
stage: build
5048
variables:
51-
# Use when ellastic ci is on quartz or we go back to ruby
52-
# ALLOC_COMMAND: "srun --reservation=ci --qos=ci_ruby -t 60 -N 1 "
5349
ALLOC_COMMAND: "srun -t 60 -N 1 -p pdebug"
5450
extends: [.src_build_script, .on_quartz, .src_workflow]
5551
needs: [quartz_allocate]
5652

5753
.full_build_on_quartz:
5854
stage: build
5955
variables:
60-
# Use when ellastic ci is on quartz or we go back to ruby
61-
# ALLOC_COMMAND: "srun --reservation=ci --qos=ci_ruby -t 60 -N 1 "
6256
ALLOC_COMMAND: "srun -t 60 -N 1 -p pdebug"
6357
extends: [.full_build_script, .on_quartz, .full_workflow]
6458
needs: []

.gitlab/build_rzansel.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and
1+
# Copyright (c) 2017-2024, 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)
@@ -12,7 +12,7 @@
1212
- rzansel
1313
before_script:
1414
- module load cuda/11.2.0
15-
- module load cmake/3.18.0
15+
- module load cmake/3.21.1
1616

1717
####
1818
# Template

.gitlab/build_rzgenie.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and
1+
# Copyright (c) 2017-2024, 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_tioga.yml

Lines changed: 3 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and
1+
# Copyright (c) 2017-2024, 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)
@@ -21,14 +21,14 @@
2121
.src_build_on_tioga:
2222
stage: build
2323
variables:
24-
ALLOC_COMMAND: "flux mini run --exclusive --time-limit=30m --nodes=1"
24+
ALLOC_COMMAND: "flux run --queue pci --exclusive --time-limit=30m --nodes=1"
2525
extends: [.src_build_script, .on_tioga, .src_workflow]
2626
needs: []
2727

2828
.full_build_on_tioga:
2929
stage: build
3030
variables:
31-
ALLOC_COMMAND: "flux mini run --exclusive --time-limit=60m --nodes=1"
31+
ALLOC_COMMAND: "flux run --queue pci --exclusive --time-limit=60m --nodes=1"
3232
extends: [.full_build_script, .on_tioga, .full_workflow]
3333
needs: []
3434

@@ -39,14 +39,6 @@ tioga-clang_16_0_0_hip_5_6_0-src:
3939
COMPILER: "clang@16.0.0_hip"
4040
HOST_CONFIG: "tioga-toss_4_x86_64_ib_cray-${COMPILER}.cmake"
4141
extends: .src_build_on_tioga
42-
allow_failure: true
43-
44-
tioga-cce_15_0_1_hip_5_4_3-src:
45-
variables:
46-
COMPILER: "cce@15.0.1_hip"
47-
HOST_CONFIG: "tioga-toss_4_x86_64_ib_cray-${COMPILER}.cmake"
48-
extends: .src_build_on_tioga
49-
allow_failure: true
5042

5143
####
5244
# Full Build jobs
@@ -56,12 +48,3 @@ tioga-clang_16_0_0_hip_5_6_0-full:
5648
SPEC: "%${COMPILER}~openmp+rocm+mfem+c2c"
5749
EXTRASPEC: "amdgpu_target=gfx90a ^hip@5.6.0 ^hsa-rocr-dev@5.6.0 ^llvm-amdgpu@5.6.0 ^raja~openmp+rocm ^umpire~openmp+rocm ^hdf5 cflags=-Wno-int-conversion"
5850
extends: .full_build_on_tioga
59-
allow_failure: true
60-
61-
tioga-cce_15_0_1_hip_5_4_3-full:
62-
variables:
63-
COMPILER: "cce@15.0.1_hip"
64-
SPEC: "%${COMPILER}~openmp+rocm+mfem+c2c"
65-
EXTRASPEC: "amdgpu_target=gfx90a ^hip@5.4.3 ^hsa-rocr-dev@5.4.3 ^llvm-amdgpu@5.4.3 ^raja~openmp+rocm ^umpire~openmp+rocm ^hdf5 cflags=-Wno-int-conversion"
66-
extends: .full_build_on_tioga
67-
allow_failure: true

.mailmap

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ Aaron Black <black27@llnl.gov> Aaron C. Black <black27@llnl.gov
22
Adam J. Kunen <kunen1@llnl.gov> Adam J. Kunen <kunen1@sierra1626.llnl.gov>
33
Adrien M. Bernede <bernede1@llnl.gov> Adrien Bernede <51493078+adrienbernede@users.noreply.github.com>
44
Aesha Parekh <aeshabparekh@gmail.com> Aesha Parekh <29237123+aeshapar@users.noreply.github.com>
5+
Alan Dayton <dayton8@llnl.gov> Alan Dayton <6393677+adayton1@users.noreply.github.com>
56
Arlie Capps <capps2@llnl.gov> Arlie Capps <capps2@cab669.llnl.gov>
67
Arlie Capps <capps2@llnl.gov> Arlie Capps <capps2@cab689.llnl.gov>
78
Arlie Capps <capps2@llnl.gov> Arlie Capps <48997041+agcapps@users.noreply.github.com>
@@ -13,6 +14,7 @@ Benjamin Curtice Corbett <corbett5@llnl.gov> Benjamin Curtice Corbett <corbet
1314
Benjamin Curtice Corbett <corbett5@llnl.gov> Ben Corbett <corbett5@llnl.gov>
1415
Benjamin Curtice Corbett <corbett5@llnl.gov> Benjamin Corbett <corbett5@llnl.gov>
1516
Benjamin Curtice Corbett <corbett5@llnl.gov> Ben Corbett <32752943+corbett5@users.noreply.github.com>
17+
Brad J. Whitlock <whitlock2@llnl.gov> Brad Whitlock <whitlock2@llnl.gov>
1618
Brian Manh Hien Han <han12@llnl.gov> Brian Han <han12@llnl.gov>
1719
Brian Manh Hien Han <han12@llnl.gov> Brian Manh Hien Han <han12@rzansel19.coral.llnl.gov>
1820
Brian T.N. Gunney <gunney1@llnl.gov> Brian Gunney <45609916+gunney1@users.noreply.github.com>
@@ -24,7 +26,10 @@ Daniel Taller <taller1@llnl.gov> Danny Taller <66029857+dtaller@u
2426
Esteban Pauli <pauli2@llnl.gov> Esteban Pauli <40901502+estebanpauli@users.noreply.github.com>
2527
Evan Taylor Desantola <desantola1@llnl.gov> Evan Taylor DeSantola <desantola1@llnl.gov>
2628
George Zagaris <zagaris2@llnl.gov> George Zagaris <george.zagaris@gmail.com>
27-
Jacob Spainhour <spainhour1@llnl.gov> jcs15c <Jacob.Spainhour@colorado.edu>
29+
Jacob Spainhour <Jacob.Spainhour@colorado.edu> jcs15c <Jacob.Spainhour@colorado.edu>
30+
Jacob Spainhour <Jacob.Spainhour@colorado.edu> Jacob Spainhour <jcs15c@my.fsu.edu>
31+
Jacob Spainhour <Jacob.Spainhour@colorado.edu> Jacob Spainhour <spainhour1@llnl.gov>
32+
Jamie A. Bramwell <bramwell1@llnl.gov> Jamie Bramwell <bramwell1@llnl.gov>
2833
Joe Hennis <hennis1@llnl.gov> Hennis <hennis1@luz.llnl.gov>
2934
Joe Hennis <hennis1@llnl.gov> hennis1 <73615573+hennis1@users.noreply.github.com>
3035
Josh Essman <essman1@llnl.gov> Josh Essman <68349992+joshessman-llnl@users.noreply.github.com>
@@ -59,7 +64,6 @@ Robert Carson <rac428@cornell.edu> Robert <rac428@cornell.edu>
5964
Robert Carson <rac428@cornell.edu> rcarson3 <rac428@cornell.edu>
6065
Robert Cohn <robert.s.cohn@intel.com> rscohn2 <rscohn2@gmail.com>
6166
Samuel P. Mish <mish2@llnl.gov> samuelpmishLLNL <61714427+samuelpmishLLNL@users.noreply.github.com>
62-
Brad J. Whitlock <whitlock2@llnl.gov> Brad Whitlock <whitlock2@llnl.gov>
6367

6468
Axom Shared User <axom-dev@llnl.gov> Asctoolkit Shared User <axom-dev@llnl.gov>
6569
Axom Shared User <axom-dev@llnl.gov> Asctoolkit Shared User <atk@cab687.llnl.gov>

.readthedocs.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,10 @@ build:
1010
os: ubuntu-22.04
1111
tools:
1212
python: "3.11"
13+
apt_packages:
14+
- ghostscript
15+
- graphviz
16+
- texlive-full
1317

1418
# Build documentation in the docs/ directory with Sphinx
1519
sphinx:

.uberenv_config.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@
44
"package_final_phase": "initconfig",
55
"package_source_dir": "../..",
66
"spack_url": "https://github.com/spack/spack.git",
7-
"spack_commit": "44f0708af424cb12dd05dd761de1cdae986ea5cf",
7+
"spack_commit": "0d92b07dbd30b41bc6f50a61f26bc0056dca5e44",
88
"spack_configs_path": "scripts/spack/configs",
99
"spack_packages_path": ["scripts/spack/radiuss-spack-configs/packages", "scripts/spack/packages"],
1010
"spack_concretizer": "clingo",
1111
"vcpkg_url": "https://github.com/microsoft/vcpkg",
12-
"vcpkg_commit": "6f7ffeb18f99796233b958aaaf14ec7bd4fb64b2",
12+
"vcpkg_commit": "c8696863d371ab7f46e213d8f5ca923c4aef2a00",
1313
"vcpkg_triplet": "x64-windows",
1414
"vcpkg_ports_path": "scripts/vcpkg_ports"
1515
}

LICENSE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC.
1+
Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC.
22
All rights reserved.
33

44
Redistribution and use in source and binary forms, with or without

0 commit comments

Comments
 (0)