Skip to content

Update macOS TPL qualification and tool discovery #364

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
victorapm merged 10 commits into from
Sep 13, 2026
Merged

Update macOS TPL qualification and tool discovery #364

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
85fe47a
Update macOS TPL qualification and tool discovery
rrsettgast Sep 4, 2026
08d448a
undo unrequired changes
rrsettgast Sep 4, 2026
38b7479
Update Uberenv compiler mixing policy
rrsettgast Sep 4, 2026
a47ded1
Several fixes
victorapm Sep 4, 2026
7dc263c
Merge branch 'fix/macOSbuild' of github.com:GEOS-DEV/thirdPartyLibs i…
victorapm Sep 4, 2026
a4d63e1
revert uberenv changes
rrsettgast Sep 4, 2026
9abbb15
Merge branch 'fix/macOSbuild' of github.com:GEOS-DEV/thirdPartyLibs i…
rrsettgast Sep 4, 2026
603315c
update lc tpl scripts
rrsettgast Sep 5, 2026
34d030d
Merge branch 'master' into fix/macOSbuild
victorapm Sep 11, 2026
7039c7a
Update checkout action
victorapm Sep 11, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/docker_build_tpls.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,7 +175,7 @@ jobs:

steps:
- name: Checkout
uses: actions/checkout@v6
uses: actions/checkout@v7
with:
submodules: true
lfs: true
Expand Down
3 changes: 2 additions & 1 deletion .uberenv_config.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,6 @@
"spack_commit_note": "v1.2.2 (Jul 20th 2026)",
"spack_packages_commit": "9bb5e217dd9f9233991e0b4ceb407849588a0fa4",
"spack_packages_note": "Aug 20th 2026",
"spack_setup_clingo": 0
"spack_setup_clingo": 0,
"spack_allow_compiler_mixing": true
}
12 changes: 6 additions & 6 deletions scripts/setupLC-TPL-uberenv.bash
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,23 +88,23 @@ function launch_jobs() {
# Note: The max time allowed on the debug queue is 1h. If we need more, switch to pbatch
case "$machine" in
dane)
ALLOC_CMD="srun -N 1 --exclusive -p pdebug -t 60 -A chemmech"
# "${UBERENV_HELPER}" "$INSTALL_DIR" dane gcc-12 "+docs %%gcc-12 ${COMMON}" "${ALLOC_CMD}" "$@" &
# "${UBERENV_HELPER}" "$INSTALL_DIR" dane gcc-13 "+docs %%gcc-13 ${COMMON}" "${ALLOC_CMD}" "$@" &
ALLOC_CMD="srun -N 1 --exclusive -t 60 -A vortex"
"${UBERENV_HELPER}" "$INSTALL_DIR" dane gcc-12 "+docs %%gcc-12 ${COMMON}" "${ALLOC_CMD}" "$@" &
"${UBERENV_HELPER}" "$INSTALL_DIR" dane gcc-13 "+docs %%gcc-13 ${COMMON}" "${ALLOC_CMD}" "$@" &
"${UBERENV_HELPER}" "$INSTALL_DIR" dane llvm-14 "+docs %%clang-14 ${COMMON}" "${ALLOC_CMD}" "$@" &
# "${UBERENV_HELPER}" "$INSTALL_DIR" dane llvm-19 "+docs %%clang-19 ${COMMON}" "${ALLOC_CMD}" "$@" &
"${UBERENV_HELPER}" "$INSTALL_DIR" dane llvm-19 "+docs %%clang-19 ${COMMON}" "${ALLOC_CMD}" "$@" &
;;

matrix)
ALLOC_CMD="srun -N 1 --exclusive -p pdebug -t 60 -A guests"
ALLOC_CMD="srun -N 1 -G 1 -p pdebug -t 60 -A vortex"
"${UBERENV_HELPER}" "$INSTALL_DIR" matrix gcc-12-cuda-12.6 "+cuda ~uncrustify cuda_arch=90 %%gcc-12 ^cuda@12.6.0+allow-unsupported-compilers ${COMMON}" "${ALLOC_CMD}" "$@" &
"${UBERENV_HELPER}" "$INSTALL_DIR" matrix gcc-13-cuda-12.9 "+cuda ~uncrustify cuda_arch=90 %%gcc-13 ^cuda@12.9.1+allow-unsupported-compilers ${COMMON}" "${ALLOC_CMD}" "$@" &
"${UBERENV_HELPER}" "$INSTALL_DIR" matrix llvm-14-cuda-12.6 "+cuda ~uncrustify cuda_arch=90 %%clang-14 ^cuda@12.6.0+allow-unsupported-compilers ${COMMON}" "${ALLOC_CMD}" "$@" &
"${UBERENV_HELPER}" "$INSTALL_DIR" matrix llvm-19-cuda-12.9 "+cuda ~uncrustify cuda_arch=90 %%clang-19 ^cuda@12.9.1+allow-unsupported-compilers ${COMMON}" "${ALLOC_CMD}" "$@" &
;;

tuo|tuolumne)
ALLOC_CMD="salloc -N 1 --exclusive -p pdebug -t 60 -A chemmech"
ALLOC_CMD="salloc -N 1 --exclusive -p pdebug -t 60 -A vortex"
"${UBERENV_HELPER}" "$INSTALL_DIR" tuolumne cce-20-rocm-6.4.3 "+rocm~pygeosx~trilinos~petsc~docs amdgpu_target=gfx942 %%cce-20 ${COMMON}" "${ALLOC_CMD}" "$@" &
"${UBERENV_HELPER}" "$INSTALL_DIR" tuolumne llvm-amdgpu-6.4.3 "+rocm~pygeosx~trilinos~petsc~docs amdgpu_target=gfx942 %%llvm-amdgpu_6_4_3 ${COMMON}" "${ALLOC_CMD}" "$@" &
;;
Expand Down
Loading
Loading