diff --git a/host-configs/other/firion-macos_sonoma_aarch64-llvm@19.1.7.cmake b/host-configs/other/firion-macos_sonoma_aarch64-llvm@19.1.7.cmake index 543904ac03..7c9c42b991 100644 --- a/host-configs/other/firion-macos_sonoma_aarch64-llvm@19.1.7.cmake +++ b/host-configs/other/firion-macos_sonoma_aarch64-llvm@19.1.7.cmake @@ -4,28 +4,28 @@ # CMake executable path: /opt/homebrew/bin/cmake #------------------------------------------------------------------------------ -set(CMAKE_PREFIX_PATH "/Users/chapman39/dev/smith/smith_tpls/macos_sonoma_aarch64/2026-09-17/llvm-19.1.7/axom-0.14.0.2-bzs2ciibxnofli3ophalkuf5d3w2yteb;/Users/chapman39/dev/smith/smith_tpls/macos_sonoma_aarch64/2026-09-17/llvm-19.1.7/caliper-2.15.0-goi3yedzgn5o5yipbvcuxvkhmng6yzts;/Users/chapman39/dev/smith/smith_tpls/macos_sonoma_aarch64/2026-09-17/llvm-19.1.7/conduit-0.9.6-ez5gqycklgo2witliglfllmo7y6uqher;/Users/chapman39/dev/smith/smith_tpls/macos_sonoma_aarch64/2026-09-17/llvm-19.1.7/mfem-4.10.0.1-bai7y2x3ihpyl4canakucd457o7c4wvy;/Users/chapman39/dev/smith/smith_tpls/macos_sonoma_aarch64/2026-09-17/llvm-19.1.7/raja-2025.12.2-cwryzt2vapj5pu2a42apnqayrxmin24w;/Users/chapman39/dev/smith/smith_tpls/macos_sonoma_aarch64/2026-09-17/llvm-19.1.7/umpire-2025.12.0-xmo2sz55fhzgripmdzwbcqi5bya4ugbb;/Users/chapman39/dev/smith/smith_tpls/macos_sonoma_aarch64/2026-09-17/llvm-19.1.7/adiak-0.4.1-qqcpoohnn3monrl6e4uzl4bsau3a36wb;/Users/chapman39/dev/smith/smith_tpls/macos_sonoma_aarch64/2026-09-17/llvm-19.1.7/enzyme-0.0.266-fopgibnelwnzmpinf7ynmwx672ajvp26;/Users/chapman39/dev/smith/smith_tpls/macos_sonoma_aarch64/2026-09-17/llvm-19.1.7/netcdf-c-4.10.0-vwitn4ohichuztuvk7b7bt4kpe3qxag3;/Users/chapman39/dev/smith/smith_tpls/macos_sonoma_aarch64/2026-09-17/llvm-19.1.7/slepc-3.23.3-kpg7lepbf6oahvqcnchkbfjg3bg4jszu;/Users/chapman39/dev/smith/smith_tpls/macos_sonoma_aarch64/2026-09-17/llvm-19.1.7/sundials-7.7.0-ar6wvwn3xdcwxy7gyio4cjrz3ujsv7g3;/Users/chapman39/dev/smith/smith_tpls/macos_sonoma_aarch64/2026-09-17/llvm-19.1.7/superlu-dist-8.1.2-25367qmxpjhedp5hdflvz5pdpf6fdot4;/Users/chapman39/dev/smith/smith_tpls/macos_sonoma_aarch64/2026-09-17/llvm-19.1.7/hdf5-1.8.23-ymxz4oxij23g5wjb5lpqfkv2vlg23iz7;/Users/chapman39/dev/smith/smith_tpls/macos_sonoma_aarch64/2026-09-17/llvm-19.1.7/arpack-ng-3.9.1-vetg4xcblvmvemd5j5sdxto6mfvpvwhj;/Users/chapman39/dev/smith/smith_tpls/macos_sonoma_aarch64/2026-09-17/llvm-19.1.7/petsc-3.23.7-jvn5habrz2s6pcuqeke6mupmlnu6e3ol;/Users/chapman39/dev/smith/smith_tpls/macos_sonoma_aarch64/2026-09-17/llvm-19.1.7/hypre-2.33.0-m4wte5x62275yghwdl627ao5b5vzhpdr;/Users/chapman39/dev/smith/smith_tpls/macos_sonoma_aarch64/2026-09-17/llvm-19.1.7/strumpack-8.0.0-zikxwxvvy7jy7vdi22njvr2266m7554p;/Users/chapman39/dev/smith/smith_tpls/macos_sonoma_aarch64/2026-09-17/llvm-19.1.7/netlib-scalapack-2.2.3-d3nvytypyxsdhhq627taqb4vcozldoys;/Users/chapman39/dev/smith/smith_tpls/macos_sonoma_aarch64/2026-09-17/llvm-19.1.7/parmetis-4.0.3-farnwsnm2l4bo475kjfzee64qheyh4it;/Users/chapman39/dev/smith/smith_tpls/macos_sonoma_aarch64/2026-09-17/llvm-19.1.7/camp-2025.12.0-c7qszovshpbbsqlc6yo2sffg4n25x2t7;/Users/chapman39/dev/smith/smith_tpls/macos_sonoma_aarch64/2026-09-17/none-none/compiler-wrapper-1.1.0-jti6zxsq6fb27aex57hfcgypopiojtpf;/Users/chapman39/dev/smith/smith_tpls/macos_sonoma_aarch64/2026-09-17/none-none/gcc-runtime-16.2.0-hm6va2qccjxiotkd6r7lreug6vi2fpup;/Users/chapman39/dev/smith/smith_tpls/macos_sonoma_aarch64/2026-09-17/llvm-19.1.7/metis-5.1.0-tr4a3i2qoyxpamviajyeo4zwrx4as4bx;/Users/chapman39/dev/smith/smith_tpls/macos_sonoma_aarch64/2026-09-17/llvm-19.1.7/fmt-12.1.0-qqfkcv74nvbgnu5mcyurjmsqns4nqsb5;/Users/chapman39/dev/smith/venv;/opt/homebrew;/opt/homebrew;/opt/homebrew;/opt/homebrew/opt/gcc@16;/opt/homebrew/opt/llvm@19;/opt/homebrew;/opt/homebrew;/opt/homebrew;/Users/chapman39/dev/smith/venv;/opt/homebrew/opt/zlib" CACHE STRING "") +set(CMAKE_PREFIX_PATH "/Users/chapman39/dev/smith/smith_tpls/macos_sonoma_aarch64/2026-10-19/llvm-19.1.7/axom-0.14.0.2-b6spqepgv7wehpt7e7ttyskfaybbr6xw;/Users/chapman39/dev/smith/smith_tpls/macos_sonoma_aarch64/2026-10-19/llvm-19.1.7/caliper-2.15.0-5a2h57bny7nmwl5rmhx6s55grui6lyfv;/Users/chapman39/dev/smith/smith_tpls/macos_sonoma_aarch64/2026-10-19/llvm-19.1.7/conduit-0.9.6-5gftyrjewhxzlk2i3sulnxxxks5fzjsq;/Users/chapman39/dev/smith/smith_tpls/macos_sonoma_aarch64/2026-10-19/llvm-19.1.7/mfem-4.10.0.1-vnixcafnagxgh6xjj7g5fgj4bj4dpokr;/Users/chapman39/dev/smith/smith_tpls/macos_sonoma_aarch64/2026-10-19/llvm-19.1.7/raja-2025.12.2-3bxul56mle33izh254g6vscl2b2p3gfc;/Users/chapman39/dev/smith/smith_tpls/macos_sonoma_aarch64/2026-10-19/llvm-19.1.7/umpire-2025.12.0-w2ppndhnmfb5or3xcv7nieldi3yrxbq2;/Users/chapman39/dev/smith/smith_tpls/macos_sonoma_aarch64/2026-10-19/llvm-19.1.7/adiak-0.4.1-i66ms2botbmxg3jxvxbk2uespia2ngpm;/Users/chapman39/dev/smith/smith_tpls/macos_sonoma_aarch64/2026-10-19/llvm-19.1.7/enzyme-0.0.266-zwtd5d5cwsddw4pb3vhpyozhkqn6654j;/Users/chapman39/dev/smith/smith_tpls/macos_sonoma_aarch64/2026-10-19/llvm-19.1.7/netcdf-c-4.10.0-owumvskdmy54zvwsxpo7jogubgszqdf6;/Users/chapman39/dev/smith/smith_tpls/macos_sonoma_aarch64/2026-10-19/llvm-19.1.7/slepc-3.23.3-tasrpzkbmh755ocpvlpv6hwgapfjsvfx;/Users/chapman39/dev/smith/smith_tpls/macos_sonoma_aarch64/2026-10-19/llvm-19.1.7/sundials-7.7.0-vg3gejfnoyl7gqfg5bb5mzkctgmnkprq;/Users/chapman39/dev/smith/smith_tpls/macos_sonoma_aarch64/2026-10-19/llvm-19.1.7/superlu-dist-8.1.2-j5vz3h6ptk6oqz3gy5wxdlvllp7iug6x;/Users/chapman39/dev/smith/smith_tpls/macos_sonoma_aarch64/2026-10-19/llvm-19.1.7/hdf5-1.8.23-qh4lxewrntxjq5v7jys7z45h2ta4gsnc;/Users/chapman39/dev/smith/smith_tpls/macos_sonoma_aarch64/2026-10-19/llvm-19.1.7/arpack-ng-3.9.1-wrrvun7wfh5vgxmotjfz2snmhojwm45m;/Users/chapman39/dev/smith/smith_tpls/macos_sonoma_aarch64/2026-10-19/llvm-19.1.7/petsc-3.23.7-evxw6ubnfdw2ioszdmufvp7bktvfvz72;/Users/chapman39/dev/smith/smith_tpls/macos_sonoma_aarch64/2026-10-19/llvm-19.1.7/hypre-2.33.0-v7kly2ttccjpwhftaeav426hvcr2ktjc;/Users/chapman39/dev/smith/smith_tpls/macos_sonoma_aarch64/2026-10-19/llvm-19.1.7/strumpack-8.0.0-wixxh5bbx23h4zeugsssafo3i5qqjor4;/Users/chapman39/dev/smith/smith_tpls/macos_sonoma_aarch64/2026-10-19/llvm-19.1.7/netlib-scalapack-2.2.3-gq5a64gar3q5dod3jl774236gkmrnpbg;/Users/chapman39/dev/smith/smith_tpls/macos_sonoma_aarch64/2026-10-19/llvm-19.1.7/parmetis-4.0.3-dwbhimvd7fyrnbtyhdww7trgeoce4zv3;/Users/chapman39/dev/smith/smith_tpls/macos_sonoma_aarch64/2026-10-19/llvm-19.1.7/camp-2025.12.0-utf7d25kmawgxlee6uw5fr3bxwlbagxt;/Users/chapman39/dev/smith/smith_tpls/macos_sonoma_aarch64/2026-10-19/none-none/compiler-wrapper-1.1.0-jti6zxsq6fb27aex57hfcgypopiojtpf;/Users/chapman39/dev/smith/smith_tpls/macos_sonoma_aarch64/2026-10-19/none-none/gcc-runtime-16.2.0-hm6va2qccjxiotkd6r7lreug6vi2fpup;/Users/chapman39/dev/smith/smith_tpls/macos_sonoma_aarch64/2026-10-19/llvm-19.1.7/metis-5.1.0-ysc7rqvzfeu372sap5bogn7uifh3v2ku;/Users/chapman39/dev/smith/smith_tpls/macos_sonoma_aarch64/2026-10-19/llvm-19.1.7/fmt-12.1.0-jlweyqjd3gtvwbq76bvrtsqel56rp2xi;/Users/chapman39/dev/smith/venv;/opt/homebrew;/opt/homebrew;/opt/homebrew;/opt/homebrew/opt/gcc@16;/opt/homebrew/opt/llvm@19;/opt/homebrew;/opt/homebrew;/opt/homebrew;/Users/chapman39/dev/smith/venv;/opt/homebrew/opt/lapack;/opt/homebrew/opt/zlib" CACHE STRING "") set(CMAKE_INSTALL_RPATH_USE_LINK_PATH "ON" CACHE STRING "") -set(CMAKE_BUILD_RPATH "/Users/chapman39/dev/smith/smith_tpls/macos_sonoma_aarch64/2026-09-17/llvm-19.1.7/smith-develop-dfduvzzkbqxa56glyjyqwy5r7enwrh6z/lib;/Users/chapman39/dev/smith/smith_tpls/macos_sonoma_aarch64/2026-09-17/llvm-19.1.7/smith-develop-dfduvzzkbqxa56glyjyqwy5r7enwrh6z/lib64;;/opt/homebrew/Cellar/gcc/16.2.0/lib/gcc/current/gcc/aarch64-apple-darwin25/16;/opt/homebrew/Cellar/gcc/16.2.0/lib/gcc/current" CACHE STRING "") +set(CMAKE_BUILD_RPATH "/Users/chapman39/dev/smith/smith_tpls/macos_sonoma_aarch64/2026-10-19/llvm-19.1.7/smith-develop-xpeh77wkr5kk5yvaaz5rx4rsnhd3kdco/lib;/Users/chapman39/dev/smith/smith_tpls/macos_sonoma_aarch64/2026-10-19/llvm-19.1.7/smith-develop-xpeh77wkr5kk5yvaaz5rx4rsnhd3kdco/lib64;;/opt/homebrew/Cellar/gcc/16.2.0/lib/gcc/current/gcc/aarch64-apple-darwin25/16;/opt/homebrew/Cellar/gcc/16.2.0/lib/gcc/current" CACHE STRING "") -set(CMAKE_INSTALL_RPATH "/Users/chapman39/dev/smith/smith_tpls/macos_sonoma_aarch64/2026-09-17/llvm-19.1.7/smith-develop-dfduvzzkbqxa56glyjyqwy5r7enwrh6z/lib;/Users/chapman39/dev/smith/smith_tpls/macos_sonoma_aarch64/2026-09-17/llvm-19.1.7/smith-develop-dfduvzzkbqxa56glyjyqwy5r7enwrh6z/lib64;;/opt/homebrew/Cellar/gcc/16.2.0/lib/gcc/current/gcc/aarch64-apple-darwin25/16;/opt/homebrew/Cellar/gcc/16.2.0/lib/gcc/current" CACHE STRING "") +set(CMAKE_INSTALL_RPATH "/Users/chapman39/dev/smith/smith_tpls/macos_sonoma_aarch64/2026-10-19/llvm-19.1.7/smith-develop-xpeh77wkr5kk5yvaaz5rx4rsnhd3kdco/lib;/Users/chapman39/dev/smith/smith_tpls/macos_sonoma_aarch64/2026-10-19/llvm-19.1.7/smith-develop-xpeh77wkr5kk5yvaaz5rx4rsnhd3kdco/lib64;;/opt/homebrew/Cellar/gcc/16.2.0/lib/gcc/current/gcc/aarch64-apple-darwin25/16;/opt/homebrew/Cellar/gcc/16.2.0/lib/gcc/current" CACHE STRING "") set(CMAKE_BUILD_TYPE "Release" CACHE STRING "") #------------------------------------------------------------------------------ # Compilers #------------------------------------------------------------------------------ -# Compiler Spec: llvm@19.1.7/zssbcvkxoeunz4qtlg5jjvtoldbdgasr +# Compiler Spec: llvm@19.1.7/6h55k64ep5ae77tx2wiw354zscxrkvu2 #------------------------------------------------------------------------------ if(DEFINED ENV{SPACK_CC}) - set(CMAKE_C_COMPILER "/Users/chapman39/dev/smith/smith_tpls/macos_sonoma_aarch64/2026-09-17/none-none/compiler-wrapper-1.1.0-jti6zxsq6fb27aex57hfcgypopiojtpf/libexec/spack/clang/clang" CACHE PATH "") + set(CMAKE_C_COMPILER "/Users/chapman39/dev/smith/smith_tpls/macos_sonoma_aarch64/2026-10-19/none-none/compiler-wrapper-1.1.0-jti6zxsq6fb27aex57hfcgypopiojtpf/libexec/spack/clang/clang" CACHE PATH "") - set(CMAKE_CXX_COMPILER "/Users/chapman39/dev/smith/smith_tpls/macos_sonoma_aarch64/2026-09-17/none-none/compiler-wrapper-1.1.0-jti6zxsq6fb27aex57hfcgypopiojtpf/libexec/spack/clang/clang++" CACHE PATH "") + set(CMAKE_CXX_COMPILER "/Users/chapman39/dev/smith/smith_tpls/macos_sonoma_aarch64/2026-10-19/none-none/compiler-wrapper-1.1.0-jti6zxsq6fb27aex57hfcgypopiojtpf/libexec/spack/clang/clang++" CACHE PATH "") - set(CMAKE_Fortran_COMPILER "/Users/chapman39/dev/smith/smith_tpls/macos_sonoma_aarch64/2026-09-17/none-none/compiler-wrapper-1.1.0-jti6zxsq6fb27aex57hfcgypopiojtpf/libexec/spack/gcc/gfortran" CACHE PATH "") + set(CMAKE_Fortran_COMPILER "/Users/chapman39/dev/smith/smith_tpls/macos_sonoma_aarch64/2026-10-19/none-none/compiler-wrapper-1.1.0-jti6zxsq6fb27aex57hfcgypopiojtpf/libexec/spack/gcc/gfortran" CACHE PATH "") else() @@ -37,8 +37,18 @@ else() endif() +set(CMAKE_C_FLAGS "-I/opt/homebrew/opt/libomp/include" CACHE STRING "") + +set(CMAKE_CXX_FLAGS "-I/opt/homebrew/opt/libomp/include" CACHE STRING "") + set(CMAKE_Fortran_FLAGS "-fPIC" CACHE STRING "") +set(CMAKE_EXE_LINKER_FLAGS "-L/opt/homebrew/opt/libomp/lib -Wl,-rpath,/opt/homebrew/opt/libomp/lib" CACHE STRING "") + +set(CMAKE_MODULE_LINKER_FLAGS "-L/opt/homebrew/opt/libomp/lib -Wl,-rpath,/opt/homebrew/opt/libomp/lib" CACHE STRING "") + +set(CMAKE_SHARED_LINKER_FLAGS "-L/opt/homebrew/opt/libomp/lib -Wl,-rpath,/opt/homebrew/opt/libomp/lib" CACHE STRING "") + #------------------------------------------------------------------------------ # MPI #------------------------------------------------------------------------------ @@ -59,57 +69,61 @@ set(ENABLE_MPI ON CACHE BOOL "") # Hardware #------------------------------------------------------------------------------ -set(ENABLE_OPENMP OFF CACHE BOOL "") +#------------------------------------------------ +# OpenMP +#------------------------------------------------ + +set(ENABLE_OPENMP ON CACHE BOOL "") #------------------------------------------------------------------------------ # TPLs #------------------------------------------------------------------------------ -set(TPL_ROOT "/Users/chapman39/dev/smith/smith_tpls/macos_sonoma_aarch64/2026-09-17/llvm-19.1.7" CACHE PATH "") +set(TPL_ROOT "/Users/chapman39/dev/smith/smith_tpls/macos_sonoma_aarch64/2026-10-19/llvm-19.1.7" CACHE PATH "") -set(AXOM_DIR "${TPL_ROOT}/axom-0.14.0.2-bzs2ciibxnofli3ophalkuf5d3w2yteb" CACHE PATH "") +set(AXOM_DIR "${TPL_ROOT}/axom-0.14.0.2-b6spqepgv7wehpt7e7ttyskfaybbr6xw" CACHE PATH "") -set(CAMP_DIR "${TPL_ROOT}/camp-2025.12.0-c7qszovshpbbsqlc6yo2sffg4n25x2t7" CACHE PATH "") +set(CAMP_DIR "${TPL_ROOT}/camp-2025.12.0-utf7d25kmawgxlee6uw5fr3bxwlbagxt" CACHE PATH "") -set(CONDUIT_DIR "${TPL_ROOT}/conduit-0.9.6-ez5gqycklgo2witliglfllmo7y6uqher" CACHE PATH "") +set(CONDUIT_DIR "${TPL_ROOT}/conduit-0.9.6-5gftyrjewhxzlk2i3sulnxxxks5fzjsq" CACHE PATH "") set(LUA_DIR "/opt/homebrew" CACHE PATH "") -set(MFEM_DIR "${TPL_ROOT}/mfem-4.10.0.1-bai7y2x3ihpyl4canakucd457o7c4wvy" CACHE PATH "") +set(MFEM_DIR "${TPL_ROOT}/mfem-4.10.0.1-vnixcafnagxgh6xjj7g5fgj4bj4dpokr" CACHE PATH "") -set(HDF5_DIR "${TPL_ROOT}/hdf5-1.8.23-ymxz4oxij23g5wjb5lpqfkv2vlg23iz7" CACHE PATH "") +set(HDF5_DIR "${TPL_ROOT}/hdf5-1.8.23-qh4lxewrntxjq5v7jys7z45h2ta4gsnc" CACHE PATH "") -set(HYPRE_DIR "${TPL_ROOT}/hypre-2.33.0-m4wte5x62275yghwdl627ao5b5vzhpdr" CACHE PATH "") +set(HYPRE_DIR "${TPL_ROOT}/hypre-2.33.0-v7kly2ttccjpwhftaeav426hvcr2ktjc" CACHE PATH "") -set(METIS_DIR "${TPL_ROOT}/metis-5.1.0-tr4a3i2qoyxpamviajyeo4zwrx4as4bx" CACHE PATH "") +set(METIS_DIR "${TPL_ROOT}/metis-5.1.0-ysc7rqvzfeu372sap5bogn7uifh3v2ku" CACHE PATH "") -set(PARMETIS_DIR "${TPL_ROOT}/parmetis-4.0.3-farnwsnm2l4bo475kjfzee64qheyh4it" CACHE PATH "") +set(PARMETIS_DIR "${TPL_ROOT}/parmetis-4.0.3-dwbhimvd7fyrnbtyhdww7trgeoce4zv3" CACHE PATH "") -set(NETCDF_DIR "${TPL_ROOT}/netcdf-c-4.10.0-vwitn4ohichuztuvk7b7bt4kpe3qxag3" CACHE PATH "") +set(NETCDF_DIR "${TPL_ROOT}/netcdf-c-4.10.0-owumvskdmy54zvwsxpo7jogubgszqdf6" CACHE PATH "") -set(SUPERLUDIST_DIR "${TPL_ROOT}/superlu-dist-8.1.2-25367qmxpjhedp5hdflvz5pdpf6fdot4" CACHE PATH "") +set(SUPERLUDIST_DIR "${TPL_ROOT}/superlu-dist-8.1.2-j5vz3h6ptk6oqz3gy5wxdlvllp7iug6x" CACHE PATH "") -set(ARPACK_DIR "${TPL_ROOT}/arpack-ng-3.9.1-vetg4xcblvmvemd5j5sdxto6mfvpvwhj" CACHE PATH "") +set(ARPACK_DIR "${TPL_ROOT}/arpack-ng-3.9.1-wrrvun7wfh5vgxmotjfz2snmhojwm45m" CACHE PATH "") -set(ADIAK_DIR "${TPL_ROOT}/adiak-0.4.1-qqcpoohnn3monrl6e4uzl4bsau3a36wb" CACHE PATH "") +set(ADIAK_DIR "${TPL_ROOT}/adiak-0.4.1-i66ms2botbmxg3jxvxbk2uespia2ngpm" CACHE PATH "") # AMGX not built -set(CALIPER_DIR "${TPL_ROOT}/caliper-2.15.0-goi3yedzgn5o5yipbvcuxvkhmng6yzts" CACHE PATH "") +set(CALIPER_DIR "${TPL_ROOT}/caliper-2.15.0-5a2h57bny7nmwl5rmhx6s55grui6lyfv" CACHE PATH "") -set(ENZYME_DIR "${TPL_ROOT}/enzyme-0.0.266-fopgibnelwnzmpinf7ynmwx672ajvp26" CACHE PATH "") +set(ENZYME_DIR "${TPL_ROOT}/enzyme-0.0.266-zwtd5d5cwsddw4pb3vhpyozhkqn6654j" CACHE PATH "") -set(PETSC_DIR "${TPL_ROOT}/petsc-3.23.7-jvn5habrz2s6pcuqeke6mupmlnu6e3ol" CACHE PATH "") +set(PETSC_DIR "${TPL_ROOT}/petsc-3.23.7-evxw6ubnfdw2ioszdmufvp7bktvfvz72" CACHE PATH "") -set(RAJA_DIR "${TPL_ROOT}/raja-2025.12.2-cwryzt2vapj5pu2a42apnqayrxmin24w" CACHE PATH "") +set(RAJA_DIR "${TPL_ROOT}/raja-2025.12.2-3bxul56mle33izh254g6vscl2b2p3gfc" CACHE PATH "") -set(SLEPC_DIR "${TPL_ROOT}/slepc-3.23.3-kpg7lepbf6oahvqcnchkbfjg3bg4jszu" CACHE PATH "") +set(SLEPC_DIR "${TPL_ROOT}/slepc-3.23.3-tasrpzkbmh755ocpvlpv6hwgapfjsvfx" CACHE PATH "") -set(STRUMPACK_DIR "${TPL_ROOT}/strumpack-8.0.0-zikxwxvvy7jy7vdi22njvr2266m7554p" CACHE PATH "") +set(STRUMPACK_DIR "${TPL_ROOT}/strumpack-8.0.0-wixxh5bbx23h4zeugsssafo3i5qqjor4" CACHE PATH "") -set(SUNDIALS_DIR "${TPL_ROOT}/sundials-7.7.0-ar6wvwn3xdcwxy7gyio4cjrz3ujsv7g3" CACHE PATH "") +set(SUNDIALS_DIR "${TPL_ROOT}/sundials-7.7.0-vg3gejfnoyl7gqfg5bb5mzkctgmnkprq" CACHE PATH "") -set(UMPIRE_DIR "${TPL_ROOT}/umpire-2025.12.0-xmo2sz55fhzgripmdzwbcqi5bya4ugbb" CACHE PATH "") +set(UMPIRE_DIR "${TPL_ROOT}/umpire-2025.12.0-w2ppndhnmfb5or3xcv7nieldi3yrxbq2" CACHE PATH "") # TRIBOL not built diff --git a/scripts/spack/configs/macos_sonoma_aarch64/spack.yaml b/scripts/spack/configs/macos_tahoe_aarch64/spack.yaml similarity index 87% rename from scripts/spack/configs/macos_sonoma_aarch64/spack.yaml rename to scripts/spack/configs/macos_tahoe_aarch64/spack.yaml index 9ce84fc8c3..89a80df1b2 100644 --- a/scripts/spack/configs/macos_sonoma_aarch64/spack.yaml +++ b/scripts/spack/configs/macos_tahoe_aarch64/spack.yaml @@ -43,8 +43,20 @@ spack: compilers: c: /opt/homebrew/opt/llvm@19/bin/clang cxx: /opt/homebrew/opt/llvm@19/bin/clang++ + # _macos_openmp_start + # Homebrew installs the OpenMP runtime separately from LLVM. + # CMake's verbose compiler probes bypass Spack's normal flag injection, + # so expose the search paths through the compiler environment as well. + environment: + prepend_path: + CPATH: /opt/homebrew/opt/libomp/include + LIBRARY_PATH: /opt/homebrew/opt/libomp/lib flags: fflags: -fPIC + cflags: -I/opt/homebrew/opt/libomp/include + cxxflags: -I/opt/homebrew/opt/libomp/include + ldflags: -L/opt/homebrew/opt/libomp/lib -Wl,-rpath,/opt/homebrew/opt/libomp/lib + # _macos_openmp_end # Providers mpi: diff --git a/scripts/spack/specs.json b/scripts/spack/specs.json index 3daac1d97a..e81e1c9981 100644 --- a/scripts/spack/specs.json +++ b/scripts/spack/specs.json @@ -26,6 +26,6 @@ "matrix": [ "+devtools+adiak+caliper~enzyme cuda_arch=90 %clang_19" ], - "macos_sonoma_aarch64": - [ "+devtools+adiak+caliper+enzyme~openmp %clang_19" ] + "macos_tahoe_aarch64": + [ "+devtools+adiak+caliper+enzyme+openmp %clang_19" ] } diff --git a/src/docs/sphinx/build_guide/setup_system/setup_macos.rst b/src/docs/sphinx/build_guide/setup_system/setup_macos.rst index babee29977..6186c1ba2c 100644 --- a/src/docs/sphinx/build_guide/setup_system/setup_macos.rst +++ b/src/docs/sphinx/build_guide/setup_system/setup_macos.rst @@ -18,7 +18,7 @@ To start, install the following packages using Homebrew. .. code-block:: bash - $ brew install autoconf automake bzip2 clingo cmake diffutils fmt gcc gettext gnu-sed graphviz hwloc lapack libx11 llvm@19 m4 make ninja open-mpi openblas pkg-config readline zlib + $ brew install autoconf automake bzip2 clingo cmake diffutils fmt gcc gettext gnu-sed graphviz hwloc lapack libomp libx11 llvm@19 m4 make ninja open-mpi openblas pkg-config readline zlib If you plan to install the developer tools, you should also run: @@ -43,11 +43,32 @@ This is also useful for a few additional packages: .. note:: - We provide a basic MacOS Spack environment file that - may work for most people. If you want to try using that, skip to :ref:`build_tpls-label` - below and use this command line option instead ``--spack-env-file=scripts/spack/configs/darwin/spack.yaml``. You will likely - need to update the versions of packages to match the versions installed by Homebrew. The versions for all installed packages can be listed via - the command ``brew list --versions``. + We provide a MacOS Spack environment file that can be used as a starting point: + ``./scripts/spack/configs/macos_tahoe_aarch64/spack.yaml``. However, you should create your own based on your OS, + system architecture, and the versions of packages installed on your machine. The versions for all installed packages + can be listed via the command ``brew list --versions``. + +Homebrew installs LLVM's OpenMP runtime in the separate ``libomp`` package. +The provided Apple Silicon Spack configuration adds its header and library paths +to the external LLVM compiler: + +.. literalinclude:: ../../../../../scripts/spack/configs/macos_tahoe_aarch64/spack.yaml + :language: yaml + :start-after: _macos_openmp_start + :end-before: _macos_openmp_end + +These paths are needed during CMake's verbose OpenMP detection and PETSc's +configuration, including probes that bypass Spack's normal compiler flag +injection. The compiler's ``cflags``, ``cxxflags``, and ``ldflags`` entries also +include these paths and a runtime library search path so generated CMake +host-configs work outside the Spack build environment. + +For Intel Macs or a custom Homebrew prefix, update all ``libomp`` paths in your +Spack configuration using the directory printed by ``brew --prefix libomp``. +If you have already concretized an environment with different compiler settings, +use a fresh environment with ``concretizer: {reuse: false}`` when generating the +new dependency specification. This prevents reuse of old external compiler +metadata that omits the OpenMP paths. Optionally, you can install the developer tools via ``pip``. This step is only required if you wish to use Smith's developer tools. In order to use Python devtools, you will need to create a Python venv. This is much more reliable than having Spack install 20+ Python packages.