Skip to content

fix issues with spack on mac #342

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
rrsettgast merged 11 commits into from
Apr 24, 2026
Merged

fix issues with spack on mac #342

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
8e1686e
fix issues with spack on mac
rrsettgast Mar 3, 2026
d688f83
Removing gcc-runtime due to missing files on TTE/pine (#341)
sushma-4 Mar 4, 2026
d78583f
fix batch error
rrsettgast Mar 4, 2026
e5ade51
Merge branch 'bugfix/spackOnMac' of github.com:GEOS-DEV/thirdPartyLib…
rrsettgast Mar 4, 2026
b358470
fix scheduling commands again
rrsettgast Mar 4, 2026
d1e5ef1
Fix scheduling command (final)
rrsettgast Apr 2, 2026
69ebba7
Merge branch 'master' into bugfix/spackOnMac
rrsettgast Apr 23, 2026
2661e9a
fix tuolumne builds
rrsettgast Apr 23, 2026
2944100
Merge branch 'bugfix/spackOnMac' of github.com:GEOSX/thirdPartyLibs i…
rrsettgast Apr 24, 2026
2fbdac8
fix mac build again
rrsettgast Apr 24, 2026
9271eaf
Update Docker root image reference in workflow
rrsettgast Apr 24, 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
6 changes: 3 additions & 3 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="salloc -N 1 --exclusive -p pdebug -t 60 -A vortex"
ALLOC_CMD="srun -N 1 --exclusive -p pdebug -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}" "$@" &
;;

matrix)
ALLOC_CMD="salloc -N 1 --exclusive -p pdebug -t 60 -A vortex"
ALLOC_CMD="srun -N 1 --exclusive -p pdebug -t 60 -A vortex"
Comment thread
rrsettgast marked this conversation as resolved.
Outdated
"${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 vortex"
ALLOC_CMD="flux run -N 1 -x -t 60m --bank=vortex"
Comment thread
rrsettgast marked this conversation as resolved.
Outdated
"${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
17 changes: 17 additions & 0 deletions scripts/spack_configs/macOS/spack.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,13 @@ spack:
operating_system: sequoia
target: aarch64
modules: []
environment:
set:
PATH: /usr/bin:/bin:/usr/sbin:/sbin:/opt/homebrew/bin:/opt/homebrew/sbin
AR: /usr/bin/ar
RANLIB: /usr/bin/ranlib
CMAKE_AR: /usr/bin/ar
CMAKE_RANLIB: /usr/bin/ranlib
extra_rpaths: []
- compiler:
spec: apple-clang@17.0.0
Expand All @@ -45,6 +52,13 @@ spack:
operating_system: sequoia
target: aarch64
modules: []
environment:
set:
PATH: /usr/bin:/bin:/usr/sbin:/sbin:/opt/homebrew/bin:/opt/homebrew/sbin
AR: /usr/bin/ar
RANLIB: /usr/bin/ranlib
CMAKE_AR: /usr/bin/ar
CMAKE_RANLIB: /usr/bin/ranlib
extra_rpaths: []

packages:
Expand All @@ -57,6 +71,9 @@ spack:
lapack: [openblas]
variants: "~openmp"

geosx:
variants: "+addr2line"

openblas:
buildable: False
externals:
Expand Down
13 changes: 7 additions & 6 deletions scripts/spack_configs/pine/spack.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# This is a Spack Environment file for Pine (Spack 1.0.2)
# Run command from the top-level of the repository:
# ./scripts/uberenv/uberenv.py \
# --spec "~openmp~pygeosx~docs" \
# --spec "~openmp~pygeosx~docs %gcc-11" \
# --spack-env-file=scripts/spack_configs/pine/spack.yaml \
# --project-json=.uberenv_config.json \
# --prefix ${GEOS_TPL_DIR}
Expand Down Expand Up @@ -78,11 +78,12 @@ spack:
extra_rpaths: []
buildable: false

gcc-runtime:
buildable: false
externals:
- spec: gcc-runtime@11.4.1
prefix: /usr/lib/gcc/x86_64-redhat-linux/11
# libgcc_s.so.1 is missing in /usr/lib/gcc/x86_64-redhat-linux/11 so removing it for now
# gcc-runtime:
# buildable: false
# externals:
# - spec: gcc-runtime@11.4.1
# prefix: /usr/lib/gcc/x86_64-redhat-linux/11

gmp:
externals:
Expand Down
5 changes: 4 additions & 1 deletion scripts/spack_packages/packages/geosx/package.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,6 +177,7 @@ class Geosx(CMakePackage, CudaPackage, ROCmPackage):
with when("+trilinos"):
trilinos_packages = '+aztec+stratimikos~amesos2~anasazi~belos~ifpack2~muelu~sacado+thyra+zoltan'
depends_on("trilinos@16.1.0 cflags='-fPIC' cxxflags='-fPIC -include cstdint' fflags='-fPIC'" + trilinos_packages)
depends_on("trilinos fflags='-fsecond-underscore'", when="platform=darwin")
depends_on("trilinos~openmp", when="~openmp")
depends_on("trilinos+openmp", when="+openmp")

Expand Down Expand Up @@ -213,6 +214,7 @@ class Geosx(CMakePackage, CudaPackage, ROCmPackage):
#
depends_on("mathpresso cxxflags='-fPIC'", when='+mathpresso')
depends_on('grpc', when='+grpc')
depends_on('addr2line', when='+addr2line')

# SPHINX_END_DEPENDS

Expand Down Expand Up @@ -647,7 +649,7 @@ def geos_hostconfig(self, spec, prefix, py_site_pkgs_dir=None):
cfg.write('# addr2line\n')
cfg.write('#{0}\n\n'.format('-' * 80))
cfg.write(cmake_cache_option('ENABLE_ADDR2LINE', True))
cfg.write(cmake_cache_entry('ADDR2LINE_EXEC ', '/usr/bin/addr2line'))
cfg.write(cmake_cache_entry('ADDR2LINE_EXEC', os.path.join(spec['addr2line'].prefix.bin, 'addr2line')))

cfg.write('#{0}\n'.format('-' * 80))
cfg.write('# Other\n')
Expand Down Expand Up @@ -842,6 +844,7 @@ def lvarray_hostconfig(self, spec, prefix, py_site_pkgs_dir=None):
cfg.write('# addr2line\n')
cfg.write('#{0}\n\n'.format('-' * 80))
cfg.write(cmake_cache_option('ENABLE_ADDR2LINE', True))
cfg.write(cmake_cache_entry('ADDR2LINE_EXEC', os.path.join(spec['addr2line'].prefix.bin, 'addr2line')))

def cmake_args(self):
pass
Expand Down