From 1e59b15a430834a2b1a77e1398796b18f4ba127b Mon Sep 17 00:00:00 2001 From: Randolph Settgast Date: Thu, 17 Apr 2025 10:26:00 -0700 Subject: [PATCH 01/19] update TPL tag --- .devcontainer/devcontainer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index 51bb8ade5db..87981e942aa 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -2,7 +2,7 @@ "build": { "dockerfile": "Dockerfile", "args": { - "GEOS_TPL_TAG": "303-658" + "GEOS_TPL_TAG": "306-673" } }, "runArgs": [ From 5bd05c0f524bbd50452ebe1bea317451ec5e07b0 Mon Sep 17 00:00:00 2001 From: "Randolph R. Settgast" Date: Thu, 17 Apr 2025 12:37:22 -0700 Subject: [PATCH 02/19] add modified hostconfigs --- .../dane-toss_4_x86_64_ib-gcc@12.1.1.cmake | 46 +++--- ...c64le_ib_p9-clang@10.0.1-cuda@11.8.0.cmake | 40 ++--- ...c64le_ib_p9-clang@13.0.1-cuda@11.8.0.cmake | 40 ++--- ...64le_ib_p9-clang@13.0.1-cuda@12.2.2.cmake} | 42 ++--- ..._ppc64le_ib_p9-gcc@8.3.1-cuda@11.8.0.cmake | 40 ++--- .../ruby-toss_4_x86_64_ib-clang@14.0.6.cmake | 46 +++--- .../ruby-toss_4_x86_64_ib-gcc@12.1.1.cmake | 46 +++--- .../ruby-toss_4_x86_64_ib-gcc@12noAVX.cmake | 46 +++--- src/coreComponents/schema/schema.xsd | 4 +- src/coreComponents/schema/schema.xsd.other | 146 +++++++++--------- 10 files changed, 248 insertions(+), 248 deletions(-) rename host-configs/LLNL/{lassen-blueos_3_ppc64le_ib_p9-clang@13.0.1-cuda@12.0.0.cmake => lassen-blueos_3_ppc64le_ib_p9-clang@13.0.1-cuda@12.2.2.cmake} (61%) diff --git a/host-configs/LLNL/dane-toss_4_x86_64_ib-gcc@12.1.1.cmake b/host-configs/LLNL/dane-toss_4_x86_64_ib-gcc@12.1.1.cmake index 8fb2b58d0e8..538fc738a1d 100644 --- a/host-configs/LLNL/dane-toss_4_x86_64_ib-gcc@12.1.1.cmake +++ b/host-configs/LLNL/dane-toss_4_x86_64_ib-gcc@12.1.1.cmake @@ -58,15 +58,15 @@ set(ENABLE_CUDA OFF CACHE BOOL "") set(ENABLE_CHAI ON CACHE BOOL "") -set(CHAI_DIR "/usr/gapps/GEOSX/thirdPartyLibs/2025-04-03_spack/dane-gcc-12_tpls/gcc-12.1.1/chai-git.4b9060b18b9bec1167026cfb3132bd540c4bd56b_develop-uq6ogpe5shfs5s5ifayx27gvzm3n3xcf" CACHE PATH "") +set(CHAI_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2025-04-16/dane-gcc-12_tpls/gcc-12.1.1/chai-git.4b9060b18b9bec1167026cfb3132bd540c4bd56b_develop-2xob7j63ysxxm5msqcs5akk53ox36rrq" CACHE PATH "") -set(RAJA_DIR "/usr/gapps/GEOSX/thirdPartyLibs/2025-04-03_spack/dane-gcc-12_tpls/gcc-12.1.1/raja-git.1d70abf171474d331f1409908bdf1b1c3fe19222_develop-37yxlbkfjq4ww4iw46u3a3d52oi6pul4" CACHE PATH "") +set(RAJA_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2025-04-16/dane-gcc-12_tpls/gcc-12.1.1/raja-git.1d70abf171474d331f1409908bdf1b1c3fe19222_develop-w6d3vfhqea67jtrl5kgsf7yfdmw53sws" CACHE PATH "") set(ENABLE_UMPIRE ON CACHE BOOL "") -set(UMPIRE_DIR "/usr/gapps/GEOSX/thirdPartyLibs/2025-04-03_spack/dane-gcc-12_tpls/gcc-12.1.1/umpire-git.1ed0669c57f041baa1f1070693991c3a7a43e7ee_develop-tymd742qkyap4m2m3kcnlx4mqnikk4pw" CACHE PATH "") +set(UMPIRE_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2025-04-16/dane-gcc-12_tpls/gcc-12.1.1/umpire-git.1ed0669c57f041baa1f1070693991c3a7a43e7ee_develop-h4gry4jg4nfbhrh55hecfdzzy3awxq2x" CACHE PATH "") -set(CAMP_DIR "/usr/gapps/GEOSX/thirdPartyLibs/2025-04-03_spack/dane-gcc-12_tpls/gcc-12.1.1/camp-git.ee0a3069a7ae72da8bcea63c06260fad34901d43_main-wtxnzy3oakj4hdtuj5vpwpdtymqmyt4s" CACHE PATH "") +set(CAMP_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2025-04-16/dane-gcc-12_tpls/gcc-12.1.1/camp-git.ee0a3069a7ae72da8bcea63c06260fad34901d43_main-7avauujxf75odfjvsunfgz34wkzen3hb" CACHE PATH "") #-------------------------------------------------------------------------------- # IO TPLs @@ -74,21 +74,21 @@ set(CAMP_DIR "/usr/gapps/GEOSX/thirdPartyLibs/2025-04-03_spack/dane-gcc-12_tpls/ set(ENABLE_CALIPER ON CACHE BOOL "") -set(CALIPER_DIR "/usr/gapps/GEOSX/thirdPartyLibs/2025-04-03_spack/dane-gcc-12_tpls/gcc-12.1.1/caliper-git.287b7f3ad2d12f520aad04268d44f353cd05403c_2.12.0-bno6d6qyyvivznkozzdh27ljrj3yqbv2" CACHE PATH "") +set(CALIPER_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2025-04-16/dane-gcc-12_tpls/gcc-12.1.1/caliper-git.287b7f3ad2d12f520aad04268d44f353cd05403c_2.12.0-xolotrctq2ml5kcg4dminlshg6vzagor" CACHE PATH "") -set(adiak_DIR "/usr/gapps/GEOSX/thirdPartyLibs/2025-04-03_spack/dane-gcc-12_tpls/gcc-12.1.1/adiak-0.4.0-dimwte7ij4naho6hhcqowidlxnespn7e/lib/cmake/adiak" CACHE PATH "") +set(adiak_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2025-04-16/dane-gcc-12_tpls/gcc-12.1.1/adiak-0.4.0-bz6cshrbl4zpowg6uvhdo7ki7ss2tgjr/lib/cmake/adiak" CACHE PATH "") -set(HDF5_DIR "/usr/gapps/GEOSX/thirdPartyLibs/2025-04-03_spack/dane-gcc-12_tpls/gcc-12.1.1/hdf5-1.12.1-ijx73yvfrhxnjls4acfy2sdqtiekvyec" CACHE PATH "") +set(HDF5_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2025-04-16/dane-gcc-12_tpls/gcc-12.1.1/hdf5-1.12.1-oghlibs4dsel6eqrwu2xp2gvg4pjz2md" CACHE PATH "") -set(CONDUIT_DIR "/usr/gapps/GEOSX/thirdPartyLibs/2025-04-03_spack/dane-gcc-12_tpls/gcc-12.1.1/conduit-git.ad86e316ad56a75c099d30ca5ce75cff275b5924_develop-jwijeuulb6xfflmsmh4snh6qvmmvenve" CACHE PATH "") +set(CONDUIT_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2025-04-16/dane-gcc-12_tpls/gcc-12.1.1/conduit-git.ad86e316ad56a75c099d30ca5ce75cff275b5924_develop-37y7d7y2e735gaelsdl2ub7itkak6a77" CACHE PATH "") -set(SILO_DIR "/usr/gapps/GEOSX/thirdPartyLibs/2025-04-03_spack/dane-gcc-12_tpls/gcc-12.1.1/silo-4.11.1-bsd-nrzzqos7534qy74dk5anmp3pvsgdovrq" CACHE PATH "") +set(SILO_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2025-04-16/dane-gcc-12_tpls/gcc-12.1.1/silo-4.11.1-bsd-c4eskt44znon3uq54ozahcwpq6y4uusl" CACHE PATH "") -set(PUGIXML_DIR "/usr/gapps/GEOSX/thirdPartyLibs/2025-04-03_spack/dane-gcc-12_tpls/gcc-12.1.1/pugixml-1.13-7v6zhre6pi7ibnief5tqhmqxowllqo2w" CACHE PATH "") +set(PUGIXML_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2025-04-16/dane-gcc-12_tpls/gcc-12.1.1/pugixml-1.13-hsfh2l3cmzc7piwx4ex3azvz5tk75tfs" CACHE PATH "") -set(VTK_DIR "/usr/gapps/GEOSX/thirdPartyLibs/2025-04-03_spack/dane-gcc-12_tpls/gcc-12.1.1/vtk-9.3.1-6rs7wpfvmzw7pdsdl6mifdrg7nhuidqd" CACHE PATH "") +set(VTK_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2025-04-16/dane-gcc-12_tpls/gcc-12.1.1/vtk-9.4.2-4cf6y4amgebrzyhnhasmgjghmciuola7" CACHE PATH "") -set(FMT_DIR "/usr/gapps/GEOSX/thirdPartyLibs/2025-04-03_spack/dane-gcc-12_tpls/gcc-12.1.1/fmt-10.0.0-4wcnmovbi74zd66vdk6xhjo6hefdbxbp" CACHE PATH "") +set(FMT_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2025-04-16/dane-gcc-12_tpls/gcc-12.1.1/fmt-10.0.0-e7nurcfb4jtbpu75wmofg7hdurzjaf5n" CACHE PATH "") #-------------------------------------------------------------------------------- # System Math Libraries @@ -98,7 +98,7 @@ set(ENABLE_MKL ON CACHE BOOL "") set(MKL_INCLUDE_DIRS "/usr/tce/packages/mkl/mkl-2022.1.0/include" CACHE PATH "") -set(MKL_LIBRARIES /usr/tce/packages/mkl/mkl-2022.1.0/mkl/2022.1.0/lib/intel64/libmkl_gf_lp64.so +set(MKL_LIBRARIES /usr/tce/packages/mkl/mkl-2022.1.0/mkl/2022.1.0/lib/intel64/libmkl_intel_lp64.so /usr/tce/packages/mkl/mkl-2022.1.0/mkl/2022.1.0/lib/intel64/libmkl_gnu_thread.so /usr/tce/packages/mkl/mkl-2022.1.0/mkl/2022.1.0/lib/intel64/libmkl_core.so /lib/../lib64/libomp.so @@ -110,19 +110,19 @@ set(MKL_LIBRARIES /usr/tce/packages/mkl/mkl-2022.1.0/mkl/2022.1.0/lib/intel64/li # Math TPLs #-------------------------------------------------------------------------------- -set(METIS_DIR "/usr/gapps/GEOSX/thirdPartyLibs/2025-04-03_spack/dane-gcc-12_tpls/gcc-12.1.1/metis-5.1.0-jrpyyvbvi5zzxt3mraydgurmfk7pjj77" CACHE PATH "") +set(METIS_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2025-04-16/dane-gcc-12_tpls/gcc-12.1.1/metis-5.1.0-b2tyegtpk5zhjutrvdsgukfjuzfl35bg" CACHE PATH "") -set(PARMETIS_DIR "/usr/gapps/GEOSX/thirdPartyLibs/2025-04-03_spack/dane-gcc-12_tpls/gcc-12.1.1/parmetis-4.0.3-i2lkaqn2onxsvx3rcssafh7zkgv4xgcb" CACHE PATH "") +set(PARMETIS_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2025-04-16/dane-gcc-12_tpls/gcc-12.1.1/parmetis-4.0.3-wc7b6rp7ap6mtmu2zuucl7dwd3d72giq" CACHE PATH "") -set(SCOTCH_DIR "/usr/gapps/GEOSX/thirdPartyLibs/2025-04-03_spack/dane-gcc-12_tpls/gcc-12.1.1/scotch-7.0.3-fl625kpmhevzvzmuotssykvvhaqovqk3" CACHE PATH "") +set(SCOTCH_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2025-04-16/dane-gcc-12_tpls/gcc-12.1.1/scotch-7.0.3-4cuy5tv2ffzzryghy4dt5jqjkacyjxtp" CACHE PATH "") -set(SUPERLU_DIST_DIR "/usr/gapps/GEOSX/thirdPartyLibs/2025-04-03_spack/dane-gcc-12_tpls/gcc-12.1.1/superlu-dist-git.0f6efc377df2440c235452d13d28d2c717f832a1_6.3.0-git.8-kul235x6jkdwxbdntczlhho7h6x65pwh" CACHE PATH "") +set(SUPERLU_DIST_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2025-04-16/dane-gcc-12_tpls/gcc-12.1.1/superlu-dist-git.0f6efc377df2440c235452d13d28d2c717f832a1_6.3.0-git.8-djdmeegz4s2liz2wlvcvkrld2ynpw3in" CACHE PATH "") -set(SUITESPARSE_DIR "/usr/gapps/GEOSX/thirdPartyLibs/2025-04-03_spack/dane-gcc-12_tpls/gcc-12.1.1/suite-sparse-5.10.1-fbm7gbwba72t4ggduvynvnbcr43uxxs4" CACHE PATH "") +set(SUITESPARSE_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2025-04-16/dane-gcc-12_tpls/gcc-12.1.1/suite-sparse-5.10.1-spsprgn677h4meayroocuyd3rct34jv2" CACHE PATH "") -set(TRILINOS_DIR "/usr/gapps/GEOSX/thirdPartyLibs/2025-04-03_spack/dane-gcc-12_tpls/gcc-12.1.1/trilinos-16.0.0-pouamvqn7cggh62ew6ahy5qfomipu6g3" CACHE PATH "") +set(TRILINOS_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2025-04-16/dane-gcc-12_tpls/gcc-12.1.1/trilinos-16.1.0-ijnjoqaod6dricu5elrcaqsclw4lsxqg" CACHE PATH "") -set(HYPRE_DIR "/usr/gapps/GEOSX/thirdPartyLibs/2025-04-03_spack/dane-gcc-12_tpls/gcc-12.1.1/hypre-git.21e5953ddc6daaa24699236108866afa597a415c_2.32.0-git.33-xccozj6hzrschhug3bip57vvbxwdhdmw" CACHE PATH "") +set(HYPRE_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2025-04-16/dane-gcc-12_tpls/gcc-12.1.1/hypre-git.21e5953ddc6daaa24699236108866afa597a415c_2.32.0-git.33-5ff7umsj522hosraqhenhvb3lvvjdrb4" CACHE PATH "") set(ENABLE_PETSC OFF CACHE BOOL "") @@ -146,7 +146,7 @@ set(ENABLE_PYGEOSX ON CACHE BOOL "") set(SPHINX_EXECUTABLE "/usr/gapps/GEOSX/thirdPartyLibs/python/quartz-gcc-python/python/bin/sphinx-build" CACHE PATH "") -set(DOXYGEN_EXECUTABLE "/usr/gapps/GEOSX/thirdPartyLibs/2025-04-03_spack/dane-gcc-12_tpls/gcc-12.1.1/doxygen-1.8.20-hbxmvlkrwmpt5mvibhths6cdo5rlor3s/bin/doxygen" CACHE PATH "") +set(DOXYGEN_EXECUTABLE "/usr/WS1/GEOS/GEOSX/TPLs_2025-04-16/dane-gcc-12_tpls/gcc-12.1.1/doxygen-1.8.20-rbsdp6mktuvtbdx5pfi2y2kmeivgumrk/bin/doxygen" CACHE PATH "") #-------------------------------------------------------------------------------- # Development tools @@ -154,7 +154,7 @@ set(DOXYGEN_EXECUTABLE "/usr/gapps/GEOSX/thirdPartyLibs/2025-04-03_spack/dane-gc set(ENABLE_UNCRUSTIFY ON CACHE BOOL "") -set(UNCRUSTIFY_EXECUTABLE "/usr/gapps/GEOSX/thirdPartyLibs/2025-04-03_spack/dane-gcc-12_tpls/gcc-12.1.1/uncrustify-git.401a4098bce9dcc47e024987403f2d59d9ba7bd2_0.70.1-git.319-bsad7cne3ccgu3munuxms52yxxhxeob5/bin/uncrustify" CACHE PATH "") +set(UNCRUSTIFY_EXECUTABLE "/usr/WS1/GEOS/GEOSX/TPLs_2025-04-16/dane-gcc-12_tpls/gcc-12.1.1/uncrustify-git.401a4098bce9dcc47e024987403f2d59d9ba7bd2_0.70.1-git.319-66zegvv2c4odtesul4gfg65p2hgukmw7/bin/uncrustify" CACHE PATH "") #-------------------------------------------------------------------------------- # addr2line @@ -170,7 +170,7 @@ set(ADDR2LINE_EXEC "/usr/bin/addr2line" CACHE PATH "") set(ENABLE_MATHPRESSO ON CACHE BOOL "") -set(MATHPRESSO_DIR "/usr/gapps/GEOSX/thirdPartyLibs/2025-04-03_spack/dane-gcc-12_tpls/gcc-12.1.1/mathpresso-geos-duhbqwijvovnk2drgvvh2fs647mqitjj" CACHE PATH "") +set(MATHPRESSO_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2025-04-16/dane-gcc-12_tpls/gcc-12.1.1/mathpresso-geos-pmas5poag5egtkkogmkxzbowtlsnhznm" CACHE PATH "") set(ENABLE_XML_UPDATES ON CACHE BOOL "") diff --git a/host-configs/LLNL/lassen-blueos_3_ppc64le_ib_p9-clang@10.0.1-cuda@11.8.0.cmake b/host-configs/LLNL/lassen-blueos_3_ppc64le_ib_p9-clang@10.0.1-cuda@11.8.0.cmake index f84d09a9f19..4096312632b 100644 --- a/host-configs/LLNL/lassen-blueos_3_ppc64le_ib_p9-clang@10.0.1-cuda@11.8.0.cmake +++ b/host-configs/LLNL/lassen-blueos_3_ppc64le_ib_p9-clang@10.0.1-cuda@11.8.0.cmake @@ -77,15 +77,15 @@ set(CMAKE_CUDA_FLAGS_DEBUG "-g -G -O0 -Xcompiler -O0" CACHE STRING "") set(ENABLE_CHAI ON CACHE BOOL "") -set(CHAI_DIR "/usr/gapps/GEOSX/thirdPartyLibs/2025-04-03_spack/lassen-clang-10-cuda-11_tpls/clang-10.0.1/chai-git.4b9060b18b9bec1167026cfb3132bd540c4bd56b_develop-77slff2jnddra4feyt64f23fza2x6eeh" CACHE PATH "") +set(CHAI_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2025-04-03_spack/lassen-clang-10-cuda-11_tpls/clang-10.0.1/chai-git.4b9060b18b9bec1167026cfb3132bd540c4bd56b_develop-77slff2jnddra4feyt64f23fza2x6eeh" CACHE PATH "") -set(RAJA_DIR "/usr/gapps/GEOSX/thirdPartyLibs/2025-04-03_spack/lassen-clang-10-cuda-11_tpls/clang-10.0.1/raja-git.1d70abf171474d331f1409908bdf1b1c3fe19222_develop-4g4qjxcaas7stqgc5ilday63r5557jf2" CACHE PATH "") +set(RAJA_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2025-04-03_spack/lassen-clang-10-cuda-11_tpls/clang-10.0.1/raja-git.1d70abf171474d331f1409908bdf1b1c3fe19222_develop-4g4qjxcaas7stqgc5ilday63r5557jf2" CACHE PATH "") set(ENABLE_UMPIRE ON CACHE BOOL "") -set(UMPIRE_DIR "/usr/gapps/GEOSX/thirdPartyLibs/2025-04-03_spack/lassen-clang-10-cuda-11_tpls/clang-10.0.1/umpire-git.1ed0669c57f041baa1f1070693991c3a7a43e7ee_develop-oxerfmieb5y5mu6mutrl2syxmo3jxwsa" CACHE PATH "") +set(UMPIRE_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2025-04-03_spack/lassen-clang-10-cuda-11_tpls/clang-10.0.1/umpire-git.1ed0669c57f041baa1f1070693991c3a7a43e7ee_develop-oxerfmieb5y5mu6mutrl2syxmo3jxwsa" CACHE PATH "") -set(CAMP_DIR "/usr/gapps/GEOSX/thirdPartyLibs/2025-04-03_spack/lassen-clang-10-cuda-11_tpls/clang-10.0.1/camp-git.ee0a3069a7ae72da8bcea63c06260fad34901d43_main-qaxwkoxoc7xcuz6zdzjobll4mst7ia4a" CACHE PATH "") +set(CAMP_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2025-04-03_spack/lassen-clang-10-cuda-11_tpls/clang-10.0.1/camp-git.ee0a3069a7ae72da8bcea63c06260fad34901d43_main-qaxwkoxoc7xcuz6zdzjobll4mst7ia4a" CACHE PATH "") #-------------------------------------------------------------------------------- # IO TPLs @@ -93,21 +93,21 @@ set(CAMP_DIR "/usr/gapps/GEOSX/thirdPartyLibs/2025-04-03_spack/lassen-clang-10-c set(ENABLE_CALIPER ON CACHE BOOL "") -set(CALIPER_DIR "/usr/gapps/GEOSX/thirdPartyLibs/2025-04-03_spack/lassen-clang-10-cuda-11_tpls/clang-10.0.1/caliper-git.287b7f3ad2d12f520aad04268d44f353cd05403c_2.12.0-xiwon23mamhn2tkcnqks5crznnqaovjt" CACHE PATH "") +set(CALIPER_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2025-04-03_spack/lassen-clang-10-cuda-11_tpls/clang-10.0.1/caliper-git.287b7f3ad2d12f520aad04268d44f353cd05403c_2.12.0-xiwon23mamhn2tkcnqks5crznnqaovjt" CACHE PATH "") -set(adiak_DIR "/usr/gapps/GEOSX/thirdPartyLibs/2025-04-03_spack/lassen-clang-10-cuda-11_tpls/clang-10.0.1/adiak-0.4.0-tp3jxzzp7ifbreg2erbvusm34w64jau7/lib/cmake/adiak" CACHE PATH "") +set(adiak_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2025-04-03_spack/lassen-clang-10-cuda-11_tpls/clang-10.0.1/adiak-0.4.0-tp3jxzzp7ifbreg2erbvusm34w64jau7/lib/cmake/adiak" CACHE PATH "") -set(HDF5_DIR "/usr/gapps/GEOSX/thirdPartyLibs/2025-04-03_spack/lassen-clang-10-cuda-11_tpls/clang-10.0.1/hdf5-1.12.1-ga44aabjnhf34hg5ns7kwkt4wkamofpl" CACHE PATH "") +set(HDF5_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2025-04-03_spack/lassen-clang-10-cuda-11_tpls/clang-10.0.1/hdf5-1.12.1-ga44aabjnhf34hg5ns7kwkt4wkamofpl" CACHE PATH "") -set(CONDUIT_DIR "/usr/gapps/GEOSX/thirdPartyLibs/2025-04-03_spack/lassen-clang-10-cuda-11_tpls/clang-10.0.1/conduit-git.ad86e316ad56a75c099d30ca5ce75cff275b5924_develop-kukbdfbxcpyabdugeewvpaaifiyysdhu" CACHE PATH "") +set(CONDUIT_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2025-04-03_spack/lassen-clang-10-cuda-11_tpls/clang-10.0.1/conduit-git.ad86e316ad56a75c099d30ca5ce75cff275b5924_develop-kukbdfbxcpyabdugeewvpaaifiyysdhu" CACHE PATH "") -set(SILO_DIR "/usr/gapps/GEOSX/thirdPartyLibs/2025-04-03_spack/lassen-clang-10-cuda-11_tpls/clang-10.0.1/silo-4.11.1-bsd-ah6h4u6ukx3kyxgknlx75bk65uscgnft" CACHE PATH "") +set(SILO_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2025-04-03_spack/lassen-clang-10-cuda-11_tpls/clang-10.0.1/silo-4.11.1-bsd-ah6h4u6ukx3kyxgknlx75bk65uscgnft" CACHE PATH "") -set(PUGIXML_DIR "/usr/gapps/GEOSX/thirdPartyLibs/2025-04-03_spack/lassen-clang-10-cuda-11_tpls/clang-10.0.1/pugixml-1.13-k4ydpdk7vsgycnj72t3u5dbdean33tql" CACHE PATH "") +set(PUGIXML_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2025-04-03_spack/lassen-clang-10-cuda-11_tpls/clang-10.0.1/pugixml-1.13-k4ydpdk7vsgycnj72t3u5dbdean33tql" CACHE PATH "") -set(VTK_DIR "/usr/gapps/GEOSX/thirdPartyLibs/2025-04-03_spack/lassen-clang-10-cuda-11_tpls/clang-10.0.1/vtk-9.3.1-6y4upz33jg7xl3vzbaerb6ztsqjxgkva" CACHE PATH "") +set(VTK_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2025-04-03_spack/lassen-clang-10-cuda-11_tpls/clang-10.0.1/vtk-9.3.1-6y4upz33jg7xl3vzbaerb6ztsqjxgkva" CACHE PATH "") -set(FMT_DIR "/usr/gapps/GEOSX/thirdPartyLibs/2025-04-03_spack/lassen-clang-10-cuda-11_tpls/clang-10.0.1/fmt-10.0.0-jp5lqtjl4bhgqr5k6dmb3sae5zpbxjl6" CACHE PATH "") +set(FMT_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2025-04-03_spack/lassen-clang-10-cuda-11_tpls/clang-10.0.1/fmt-10.0.0-jp5lqtjl4bhgqr5k6dmb3sae5zpbxjl6" CACHE PATH "") #-------------------------------------------------------------------------------- # System Math Libraries @@ -127,19 +127,19 @@ set(FORTRAN_MANGLE_NO_UNDERSCORE ON CACHE BOOL "") # Math TPLs #-------------------------------------------------------------------------------- -set(METIS_DIR "/usr/gapps/GEOSX/thirdPartyLibs/2025-04-03_spack/lassen-clang-10-cuda-11_tpls/clang-10.0.1/metis-5.1.0-ni6dg7mhgm7nurp5iucvzkbg27c6ouaz" CACHE PATH "") +set(METIS_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2025-04-03_spack/lassen-clang-10-cuda-11_tpls/clang-10.0.1/metis-5.1.0-ni6dg7mhgm7nurp5iucvzkbg27c6ouaz" CACHE PATH "") -set(PARMETIS_DIR "/usr/gapps/GEOSX/thirdPartyLibs/2025-04-03_spack/lassen-clang-10-cuda-11_tpls/clang-10.0.1/parmetis-4.0.3-xqqcnael7oe72dansvr5umz7zn236th4" CACHE PATH "") +set(PARMETIS_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2025-04-03_spack/lassen-clang-10-cuda-11_tpls/clang-10.0.1/parmetis-4.0.3-xqqcnael7oe72dansvr5umz7zn236th4" CACHE PATH "") -set(SCOTCH_DIR "/usr/gapps/GEOSX/thirdPartyLibs/2025-04-03_spack/lassen-clang-10-cuda-11_tpls/clang-10.0.1/scotch-7.0.3-lrv7gmab4ehvykob3lu2ytszjv3gae2d" CACHE PATH "") +set(SCOTCH_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2025-04-03_spack/lassen-clang-10-cuda-11_tpls/clang-10.0.1/scotch-7.0.3-lrv7gmab4ehvykob3lu2ytszjv3gae2d" CACHE PATH "") -set(SUPERLU_DIST_DIR "/usr/gapps/GEOSX/thirdPartyLibs/2025-04-03_spack/lassen-clang-10-cuda-11_tpls/clang-10.0.1/superlu-dist-git.0f6efc377df2440c235452d13d28d2c717f832a1_6.3.0-git.8-oy253csfiumkubsj7gebdv534f6z4z3d" CACHE PATH "") +set(SUPERLU_DIST_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2025-04-03_spack/lassen-clang-10-cuda-11_tpls/clang-10.0.1/superlu-dist-git.0f6efc377df2440c235452d13d28d2c717f832a1_6.3.0-git.8-oy253csfiumkubsj7gebdv534f6z4z3d" CACHE PATH "") -set(SUITESPARSE_DIR "/usr/gapps/GEOSX/thirdPartyLibs/2025-04-03_spack/lassen-clang-10-cuda-11_tpls/clang-10.0.1/suite-sparse-5.10.1-pi4hfahsc4gez74vd5rcgxbjbtzoxe32" CACHE PATH "") +set(SUITESPARSE_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2025-04-03_spack/lassen-clang-10-cuda-11_tpls/clang-10.0.1/suite-sparse-5.10.1-pi4hfahsc4gez74vd5rcgxbjbtzoxe32" CACHE PATH "") -set(TRILINOS_DIR "/usr/gapps/GEOSX/thirdPartyLibs/2025-04-03_spack/lassen-clang-10-cuda-11_tpls/clang-10.0.1/trilinos-16.0.0-y5prgnz22qkhximrxaounp35ewzu3w2w" CACHE PATH "") +set(TRILINOS_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2025-04-03_spack/lassen-clang-10-cuda-11_tpls/clang-10.0.1/trilinos-16.0.0-y5prgnz22qkhximrxaounp35ewzu3w2w" CACHE PATH "") -set(HYPRE_DIR "/usr/gapps/GEOSX/thirdPartyLibs/2025-04-03_spack/lassen-clang-10-cuda-11_tpls/clang-10.0.1/hypre-git.21e5953ddc6daaa24699236108866afa597a415c_2.32.0-git.33-emk2rmmd2b66z4fn7ruokkdtand3bejk" CACHE PATH "") +set(HYPRE_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2025-04-03_spack/lassen-clang-10-cuda-11_tpls/clang-10.0.1/hypre-git.21e5953ddc6daaa24699236108866afa597a415c_2.32.0-git.33-emk2rmmd2b66z4fn7ruokkdtand3bejk" CACHE PATH "") set(ENABLE_HYPRE_DEVICE "CUDA" CACHE STRING "") @@ -187,7 +187,7 @@ set(ADDR2LINE_EXEC "/usr/bin/addr2line" CACHE PATH "") set(ENABLE_MATHPRESSO ON CACHE BOOL "") -set(MATHPRESSO_DIR "/usr/gapps/GEOSX/thirdPartyLibs/2025-04-03_spack/lassen-clang-10-cuda-11_tpls/clang-10.0.1/mathpresso-geos-5rryysdxznig37z7gsm2wfs5arla7wcy" CACHE PATH "") +set(MATHPRESSO_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2025-04-03_spack/lassen-clang-10-cuda-11_tpls/clang-10.0.1/mathpresso-geos-5rryysdxznig37z7gsm2wfs5arla7wcy" CACHE PATH "") set(ENABLE_XML_UPDATES ON CACHE BOOL "") diff --git a/host-configs/LLNL/lassen-blueos_3_ppc64le_ib_p9-clang@13.0.1-cuda@11.8.0.cmake b/host-configs/LLNL/lassen-blueos_3_ppc64le_ib_p9-clang@13.0.1-cuda@11.8.0.cmake index 109396d0448..cdbb3fac2a0 100644 --- a/host-configs/LLNL/lassen-blueos_3_ppc64le_ib_p9-clang@13.0.1-cuda@11.8.0.cmake +++ b/host-configs/LLNL/lassen-blueos_3_ppc64le_ib_p9-clang@13.0.1-cuda@11.8.0.cmake @@ -77,15 +77,15 @@ set(CMAKE_CUDA_FLAGS_DEBUG "-g -G -O0 -Xcompiler -O0" CACHE STRING "") set(ENABLE_CHAI ON CACHE BOOL "") -set(CHAI_DIR "/usr/gapps/GEOSX/thirdPartyLibs/2025-04-03_spack/lassen-clang-13-cuda-11_tpls/clang-13.0.1/chai-git.4b9060b18b9bec1167026cfb3132bd540c4bd56b_develop-lz73muq6zmypwpywbnpqqdnywhsidjqm" CACHE PATH "") +set(CHAI_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2025-04-16/lassen-clang-13-cuda-11_tpls/clang-13.0.1/chai-git.4b9060b18b9bec1167026cfb3132bd540c4bd56b_develop-zwl7d7ul275ekiip7csk5sjf3roz2wcx" CACHE PATH "") -set(RAJA_DIR "/usr/gapps/GEOSX/thirdPartyLibs/2025-04-03_spack/lassen-clang-13-cuda-11_tpls/clang-13.0.1/raja-git.1d70abf171474d331f1409908bdf1b1c3fe19222_develop-3foeh6gkykzpt3kejqctn2npqwv2wqvy" CACHE PATH "") +set(RAJA_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2025-04-16/lassen-clang-13-cuda-11_tpls/clang-13.0.1/raja-git.1d70abf171474d331f1409908bdf1b1c3fe19222_develop-5mwp6jujh2tavtyiuauhjqstxfq4miou" CACHE PATH "") set(ENABLE_UMPIRE ON CACHE BOOL "") -set(UMPIRE_DIR "/usr/gapps/GEOSX/thirdPartyLibs/2025-04-03_spack/lassen-clang-13-cuda-11_tpls/clang-13.0.1/umpire-git.1ed0669c57f041baa1f1070693991c3a7a43e7ee_develop-dwxqiqok2v7es3aw3orqzy77egrl6w37" CACHE PATH "") +set(UMPIRE_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2025-04-16/lassen-clang-13-cuda-11_tpls/clang-13.0.1/umpire-git.1ed0669c57f041baa1f1070693991c3a7a43e7ee_develop-f4ozs5gipwf54bv5aovczaok2rtdq7tj" CACHE PATH "") -set(CAMP_DIR "/usr/gapps/GEOSX/thirdPartyLibs/2025-04-03_spack/lassen-clang-13-cuda-11_tpls/clang-13.0.1/camp-git.ee0a3069a7ae72da8bcea63c06260fad34901d43_main-pzehynwfhbfuscddfvttoqedvx4wcxjl" CACHE PATH "") +set(CAMP_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2025-04-16/lassen-clang-13-cuda-11_tpls/clang-13.0.1/camp-git.ee0a3069a7ae72da8bcea63c06260fad34901d43_main-gjvfxw2t34kvtla624thcshjac3pqt7i" CACHE PATH "") #-------------------------------------------------------------------------------- # IO TPLs @@ -93,21 +93,21 @@ set(CAMP_DIR "/usr/gapps/GEOSX/thirdPartyLibs/2025-04-03_spack/lassen-clang-13-c set(ENABLE_CALIPER ON CACHE BOOL "") -set(CALIPER_DIR "/usr/gapps/GEOSX/thirdPartyLibs/2025-04-03_spack/lassen-clang-13-cuda-11_tpls/clang-13.0.1/caliper-git.287b7f3ad2d12f520aad04268d44f353cd05403c_2.12.0-4gu3btnlno2sbv56vhd3ux2uvgoupkgi" CACHE PATH "") +set(CALIPER_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2025-04-16/lassen-clang-13-cuda-11_tpls/clang-13.0.1/caliper-git.287b7f3ad2d12f520aad04268d44f353cd05403c_2.12.0-tesiolnzznhyhjti5asvuqoth4mvtw5j" CACHE PATH "") -set(adiak_DIR "/usr/gapps/GEOSX/thirdPartyLibs/2025-04-03_spack/lassen-clang-13-cuda-11_tpls/clang-13.0.1/adiak-0.4.0-hqwcvthhjo5zs4b3u52glnlcxk5bp34n/lib/cmake/adiak" CACHE PATH "") +set(adiak_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2025-04-16/lassen-clang-13-cuda-11_tpls/clang-13.0.1/adiak-0.4.0-3sckh7wgjjjp4ic37qxfvskkzmoyspdt/lib/cmake/adiak" CACHE PATH "") -set(HDF5_DIR "/usr/gapps/GEOSX/thirdPartyLibs/2025-04-03_spack/lassen-clang-13-cuda-11_tpls/clang-13.0.1/hdf5-1.12.1-dycb4qq65jod3vakmo4jfcknwbba4qp5" CACHE PATH "") +set(HDF5_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2025-04-16/lassen-clang-13-cuda-11_tpls/clang-13.0.1/hdf5-1.12.1-p46tov6mdj4ktcmczqzncjr6yuw4k4ni" CACHE PATH "") -set(CONDUIT_DIR "/usr/gapps/GEOSX/thirdPartyLibs/2025-04-03_spack/lassen-clang-13-cuda-11_tpls/clang-13.0.1/conduit-git.ad86e316ad56a75c099d30ca5ce75cff275b5924_develop-7nrioisimbmm3mqcl7uenprhkz36og6u" CACHE PATH "") +set(CONDUIT_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2025-04-16/lassen-clang-13-cuda-11_tpls/clang-13.0.1/conduit-git.ad86e316ad56a75c099d30ca5ce75cff275b5924_develop-rt7jq72frzj3cmzpam5cu37oqdguzzen" CACHE PATH "") -set(SILO_DIR "/usr/gapps/GEOSX/thirdPartyLibs/2025-04-03_spack/lassen-clang-13-cuda-11_tpls/clang-13.0.1/silo-4.11.1-bsd-bdktrlhcoynsflkrcgumryqbtu45gezb" CACHE PATH "") +set(SILO_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2025-04-16/lassen-clang-13-cuda-11_tpls/clang-13.0.1/silo-4.11.1-bsd-nqi4f3piubcsooovttbv23g3toynvlvh" CACHE PATH "") -set(PUGIXML_DIR "/usr/gapps/GEOSX/thirdPartyLibs/2025-04-03_spack/lassen-clang-13-cuda-11_tpls/clang-13.0.1/pugixml-1.13-dn3wo74qjiclno55tao7i6q3qsmmtbmm" CACHE PATH "") +set(PUGIXML_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2025-04-16/lassen-clang-13-cuda-11_tpls/clang-13.0.1/pugixml-1.13-rmadiq4y3vab4ov7mlqqapchtradducc" CACHE PATH "") -set(VTK_DIR "/usr/gapps/GEOSX/thirdPartyLibs/2025-04-03_spack/lassen-clang-13-cuda-11_tpls/clang-13.0.1/vtk-9.3.1-hjvim2htouza4aw6laupkeluggn7vzzl" CACHE PATH "") +set(VTK_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2025-04-16/lassen-clang-13-cuda-11_tpls/clang-13.0.1/vtk-9.4.2-r4mvurbxit6rjojurl57gmwfsxrhgkro" CACHE PATH "") -set(FMT_DIR "/usr/gapps/GEOSX/thirdPartyLibs/2025-04-03_spack/lassen-clang-13-cuda-11_tpls/clang-13.0.1/fmt-10.0.0-u3hormd7jprgxpemsdwy67f5wdd3rcks" CACHE PATH "") +set(FMT_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2025-04-16/lassen-clang-13-cuda-11_tpls/clang-13.0.1/fmt-10.0.0-6gbpxbsg5mhy7ylp6pcviq7ov2oacben" CACHE PATH "") #-------------------------------------------------------------------------------- # System Math Libraries @@ -127,19 +127,19 @@ set(FORTRAN_MANGLE_NO_UNDERSCORE ON CACHE BOOL "") # Math TPLs #-------------------------------------------------------------------------------- -set(METIS_DIR "/usr/gapps/GEOSX/thirdPartyLibs/2025-04-03_spack/lassen-clang-13-cuda-11_tpls/clang-13.0.1/metis-5.1.0-yk3zg6ifqxkue25iqr3waysqbkzjbiim" CACHE PATH "") +set(METIS_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2025-04-16/lassen-clang-13-cuda-11_tpls/clang-13.0.1/metis-5.1.0-3qyrxpm57t7co67giwgtgq7jhhw65o4y" CACHE PATH "") -set(PARMETIS_DIR "/usr/gapps/GEOSX/thirdPartyLibs/2025-04-03_spack/lassen-clang-13-cuda-11_tpls/clang-13.0.1/parmetis-4.0.3-hfu52rbhm3xhhbi33unvxrsydvvdqejd" CACHE PATH "") +set(PARMETIS_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2025-04-16/lassen-clang-13-cuda-11_tpls/clang-13.0.1/parmetis-4.0.3-w3gam3i5u72yhcuvuv46vjbvy732ssmd" CACHE PATH "") -set(SCOTCH_DIR "/usr/gapps/GEOSX/thirdPartyLibs/2025-04-03_spack/lassen-clang-13-cuda-11_tpls/clang-13.0.1/scotch-7.0.3-v3r45jclgkkywzyft37lqqoguhperyxm" CACHE PATH "") +set(SCOTCH_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2025-04-16/lassen-clang-13-cuda-11_tpls/clang-13.0.1/scotch-7.0.3-7hrto3tbcyufyb6b6rlxf7rieiyqjw3s" CACHE PATH "") -set(SUPERLU_DIST_DIR "/usr/gapps/GEOSX/thirdPartyLibs/2025-04-03_spack/lassen-clang-13-cuda-11_tpls/clang-13.0.1/superlu-dist-git.0f6efc377df2440c235452d13d28d2c717f832a1_6.3.0-git.8-2zru2u6fegs5bsz44wckbxcaxuwwdivw" CACHE PATH "") +set(SUPERLU_DIST_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2025-04-16/lassen-clang-13-cuda-11_tpls/clang-13.0.1/superlu-dist-git.0f6efc377df2440c235452d13d28d2c717f832a1_6.3.0-git.8-hllbbfqto5uo2bqdaxgqvvb6uboj3l6j" CACHE PATH "") -set(SUITESPARSE_DIR "/usr/gapps/GEOSX/thirdPartyLibs/2025-04-03_spack/lassen-clang-13-cuda-11_tpls/clang-13.0.1/suite-sparse-5.10.1-rxlyv2tiek7hl3ln7ps7ykguwog3tax4" CACHE PATH "") +set(SUITESPARSE_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2025-04-16/lassen-clang-13-cuda-11_tpls/clang-13.0.1/suite-sparse-5.10.1-gslncaaocvjpwtym3nyntrq7mx6d3q6u" CACHE PATH "") -set(TRILINOS_DIR "/usr/gapps/GEOSX/thirdPartyLibs/2025-04-03_spack/lassen-clang-13-cuda-11_tpls/clang-13.0.1/trilinos-16.0.0-mgoi2r4iuwmepceocoqgvzbtsdfzh4dq" CACHE PATH "") +set(TRILINOS_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2025-04-16/lassen-clang-13-cuda-11_tpls/clang-13.0.1/trilinos-16.1.0-5grx4kpszdyhhxksaheoct5xafp7fyft" CACHE PATH "") -set(HYPRE_DIR "/usr/gapps/GEOSX/thirdPartyLibs/2025-04-03_spack/lassen-clang-13-cuda-11_tpls/clang-13.0.1/hypre-git.21e5953ddc6daaa24699236108866afa597a415c_2.32.0-git.33-tfsly75mfqxkbsgpqdeogl6dhgqdq7q3" CACHE PATH "") +set(HYPRE_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2025-04-16/lassen-clang-13-cuda-11_tpls/clang-13.0.1/hypre-git.21e5953ddc6daaa24699236108866afa597a415c_2.32.0-git.33-tunlvgzfcctbd6xn6q4ymh5lpu7zf2ha" CACHE PATH "") set(ENABLE_HYPRE_DEVICE "CUDA" CACHE STRING "") @@ -187,7 +187,7 @@ set(ADDR2LINE_EXEC "/usr/bin/addr2line" CACHE PATH "") set(ENABLE_MATHPRESSO ON CACHE BOOL "") -set(MATHPRESSO_DIR "/usr/gapps/GEOSX/thirdPartyLibs/2025-04-03_spack/lassen-clang-13-cuda-11_tpls/clang-13.0.1/mathpresso-geos-z4ebytw2o2tmltrko7jwbko5x6jvadod" CACHE PATH "") +set(MATHPRESSO_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2025-04-16/lassen-clang-13-cuda-11_tpls/clang-13.0.1/mathpresso-geos-agnvrs7qxo3734vo5s6fditvdolxdof7" CACHE PATH "") set(ENABLE_XML_UPDATES ON CACHE BOOL "") diff --git a/host-configs/LLNL/lassen-blueos_3_ppc64le_ib_p9-clang@13.0.1-cuda@12.0.0.cmake b/host-configs/LLNL/lassen-blueos_3_ppc64le_ib_p9-clang@13.0.1-cuda@12.2.2.cmake similarity index 61% rename from host-configs/LLNL/lassen-blueos_3_ppc64le_ib_p9-clang@13.0.1-cuda@12.0.0.cmake rename to host-configs/LLNL/lassen-blueos_3_ppc64le_ib_p9-clang@13.0.1-cuda@12.2.2.cmake index e2d11ed4c5c..fc25d53736d 100644 --- a/host-configs/LLNL/lassen-blueos_3_ppc64le_ib_p9-clang@13.0.1-cuda@12.0.0.cmake +++ b/host-configs/LLNL/lassen-blueos_3_ppc64le_ib_p9-clang@13.0.1-cuda@12.2.2.cmake @@ -57,7 +57,7 @@ set(ENABLE_CUDA ON CACHE BOOL "") set(CMAKE_CUDA_STANDARD "17" CACHE PATH "") -set(CUDA_TOOLKIT_ROOT_DIR "/usr/tce/packages/cuda/cuda-12.0.0" CACHE PATH "") +set(CUDA_TOOLKIT_ROOT_DIR "/usr/tce/packages/cuda/cuda-12.2.2" CACHE PATH "") set(CMAKE_CUDA_COMPILER "${CUDA_TOOLKIT_ROOT_DIR}/bin/nvcc" CACHE PATH "") @@ -77,15 +77,15 @@ set(CMAKE_CUDA_FLAGS_DEBUG "-g -G -O0 -Xcompiler -O0" CACHE STRING "") set(ENABLE_CHAI ON CACHE BOOL "") -set(CHAI_DIR "/usr/gapps/GEOSX/thirdPartyLibs/2025-04-03_spack/lassen-clang-13-cuda-12_tpls/clang-13.0.1/chai-git.4b9060b18b9bec1167026cfb3132bd540c4bd56b_develop-cj6qdra5ki4cv4v7rdmyxe6yc2ob4yo3" CACHE PATH "") +set(CHAI_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2025-04-16/lassen-clang-13-cuda-12_tpls/clang-13.0.1/chai-git.4b9060b18b9bec1167026cfb3132bd540c4bd56b_develop-svtrdvgbszv3ujapq3yyinqq3wlfgfnm" CACHE PATH "") -set(RAJA_DIR "/usr/gapps/GEOSX/thirdPartyLibs/2025-04-03_spack/lassen-clang-13-cuda-12_tpls/clang-13.0.1/raja-git.1d70abf171474d331f1409908bdf1b1c3fe19222_develop-7g5ad7lnurgi7zvdpjwvsstrnatz3dhv" CACHE PATH "") +set(RAJA_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2025-04-16/lassen-clang-13-cuda-12_tpls/clang-13.0.1/raja-git.1d70abf171474d331f1409908bdf1b1c3fe19222_develop-pljzqoc7x7h6wyyl357ush3qswujewm5" CACHE PATH "") set(ENABLE_UMPIRE ON CACHE BOOL "") -set(UMPIRE_DIR "/usr/gapps/GEOSX/thirdPartyLibs/2025-04-03_spack/lassen-clang-13-cuda-12_tpls/clang-13.0.1/umpire-git.1ed0669c57f041baa1f1070693991c3a7a43e7ee_develop-z6qtq6uggxscyn6jckjewzzyaxgsojvd" CACHE PATH "") +set(UMPIRE_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2025-04-16/lassen-clang-13-cuda-12_tpls/clang-13.0.1/umpire-git.1ed0669c57f041baa1f1070693991c3a7a43e7ee_develop-7k6jb6qyskkckq574tsdygskw77wihsk" CACHE PATH "") -set(CAMP_DIR "/usr/gapps/GEOSX/thirdPartyLibs/2025-04-03_spack/lassen-clang-13-cuda-12_tpls/clang-13.0.1/camp-git.ee0a3069a7ae72da8bcea63c06260fad34901d43_main-zseh26hvunbp5hdce5akbstmvp7ie5ka" CACHE PATH "") +set(CAMP_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2025-04-16/lassen-clang-13-cuda-12_tpls/clang-13.0.1/camp-git.ee0a3069a7ae72da8bcea63c06260fad34901d43_main-cgtkppezedtigycomypyvqi76l5lf7qt" CACHE PATH "") #-------------------------------------------------------------------------------- # IO TPLs @@ -93,21 +93,21 @@ set(CAMP_DIR "/usr/gapps/GEOSX/thirdPartyLibs/2025-04-03_spack/lassen-clang-13-c set(ENABLE_CALIPER ON CACHE BOOL "") -set(CALIPER_DIR "/usr/gapps/GEOSX/thirdPartyLibs/2025-04-03_spack/lassen-clang-13-cuda-12_tpls/clang-13.0.1/caliper-git.287b7f3ad2d12f520aad04268d44f353cd05403c_2.12.0-4gu3btnlno2sbv56vhd3ux2uvgoupkgi" CACHE PATH "") +set(CALIPER_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2025-04-16/lassen-clang-13-cuda-12_tpls/clang-13.0.1/caliper-git.287b7f3ad2d12f520aad04268d44f353cd05403c_2.12.0-tesiolnzznhyhjti5asvuqoth4mvtw5j" CACHE PATH "") -set(adiak_DIR "/usr/gapps/GEOSX/thirdPartyLibs/2025-04-03_spack/lassen-clang-13-cuda-12_tpls/clang-13.0.1/adiak-0.4.0-hqwcvthhjo5zs4b3u52glnlcxk5bp34n/lib/cmake/adiak" CACHE PATH "") +set(adiak_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2025-04-16/lassen-clang-13-cuda-12_tpls/clang-13.0.1/adiak-0.4.0-3sckh7wgjjjp4ic37qxfvskkzmoyspdt/lib/cmake/adiak" CACHE PATH "") -set(HDF5_DIR "/usr/gapps/GEOSX/thirdPartyLibs/2025-04-03_spack/lassen-clang-13-cuda-12_tpls/clang-13.0.1/hdf5-1.12.1-dycb4qq65jod3vakmo4jfcknwbba4qp5" CACHE PATH "") +set(HDF5_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2025-04-16/lassen-clang-13-cuda-12_tpls/clang-13.0.1/hdf5-1.12.1-p46tov6mdj4ktcmczqzncjr6yuw4k4ni" CACHE PATH "") -set(CONDUIT_DIR "/usr/gapps/GEOSX/thirdPartyLibs/2025-04-03_spack/lassen-clang-13-cuda-12_tpls/clang-13.0.1/conduit-git.ad86e316ad56a75c099d30ca5ce75cff275b5924_develop-7nrioisimbmm3mqcl7uenprhkz36og6u" CACHE PATH "") +set(CONDUIT_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2025-04-16/lassen-clang-13-cuda-12_tpls/clang-13.0.1/conduit-git.ad86e316ad56a75c099d30ca5ce75cff275b5924_develop-rt7jq72frzj3cmzpam5cu37oqdguzzen" CACHE PATH "") -set(SILO_DIR "/usr/gapps/GEOSX/thirdPartyLibs/2025-04-03_spack/lassen-clang-13-cuda-12_tpls/clang-13.0.1/silo-4.11.1-bsd-bdktrlhcoynsflkrcgumryqbtu45gezb" CACHE PATH "") +set(SILO_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2025-04-16/lassen-clang-13-cuda-12_tpls/clang-13.0.1/silo-4.11.1-bsd-nqi4f3piubcsooovttbv23g3toynvlvh" CACHE PATH "") -set(PUGIXML_DIR "/usr/gapps/GEOSX/thirdPartyLibs/2025-04-03_spack/lassen-clang-13-cuda-12_tpls/clang-13.0.1/pugixml-1.13-dn3wo74qjiclno55tao7i6q3qsmmtbmm" CACHE PATH "") +set(PUGIXML_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2025-04-16/lassen-clang-13-cuda-12_tpls/clang-13.0.1/pugixml-1.13-rmadiq4y3vab4ov7mlqqapchtradducc" CACHE PATH "") -set(VTK_DIR "/usr/gapps/GEOSX/thirdPartyLibs/2025-04-03_spack/lassen-clang-13-cuda-12_tpls/clang-13.0.1/vtk-9.3.1-hjvim2htouza4aw6laupkeluggn7vzzl" CACHE PATH "") +set(VTK_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2025-04-16/lassen-clang-13-cuda-12_tpls/clang-13.0.1/vtk-9.4.2-r4mvurbxit6rjojurl57gmwfsxrhgkro" CACHE PATH "") -set(FMT_DIR "/usr/gapps/GEOSX/thirdPartyLibs/2025-04-03_spack/lassen-clang-13-cuda-12_tpls/clang-13.0.1/fmt-10.0.0-u3hormd7jprgxpemsdwy67f5wdd3rcks" CACHE PATH "") +set(FMT_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2025-04-16/lassen-clang-13-cuda-12_tpls/clang-13.0.1/fmt-10.0.0-6gbpxbsg5mhy7ylp6pcviq7ov2oacben" CACHE PATH "") #-------------------------------------------------------------------------------- # System Math Libraries @@ -127,19 +127,19 @@ set(FORTRAN_MANGLE_NO_UNDERSCORE ON CACHE BOOL "") # Math TPLs #-------------------------------------------------------------------------------- -set(METIS_DIR "/usr/gapps/GEOSX/thirdPartyLibs/2025-04-03_spack/lassen-clang-13-cuda-12_tpls/clang-13.0.1/metis-5.1.0-yk3zg6ifqxkue25iqr3waysqbkzjbiim" CACHE PATH "") +set(METIS_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2025-04-16/lassen-clang-13-cuda-12_tpls/clang-13.0.1/metis-5.1.0-3qyrxpm57t7co67giwgtgq7jhhw65o4y" CACHE PATH "") -set(PARMETIS_DIR "/usr/gapps/GEOSX/thirdPartyLibs/2025-04-03_spack/lassen-clang-13-cuda-12_tpls/clang-13.0.1/parmetis-4.0.3-hfu52rbhm3xhhbi33unvxrsydvvdqejd" CACHE PATH "") +set(PARMETIS_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2025-04-16/lassen-clang-13-cuda-12_tpls/clang-13.0.1/parmetis-4.0.3-w3gam3i5u72yhcuvuv46vjbvy732ssmd" CACHE PATH "") -set(SCOTCH_DIR "/usr/gapps/GEOSX/thirdPartyLibs/2025-04-03_spack/lassen-clang-13-cuda-12_tpls/clang-13.0.1/scotch-7.0.3-v3r45jclgkkywzyft37lqqoguhperyxm" CACHE PATH "") +set(SCOTCH_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2025-04-16/lassen-clang-13-cuda-12_tpls/clang-13.0.1/scotch-7.0.3-7hrto3tbcyufyb6b6rlxf7rieiyqjw3s" CACHE PATH "") -set(SUPERLU_DIST_DIR "/usr/gapps/GEOSX/thirdPartyLibs/2025-04-03_spack/lassen-clang-13-cuda-12_tpls/clang-13.0.1/superlu-dist-git.0f6efc377df2440c235452d13d28d2c717f832a1_6.3.0-git.8-2zru2u6fegs5bsz44wckbxcaxuwwdivw" CACHE PATH "") +set(SUPERLU_DIST_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2025-04-16/lassen-clang-13-cuda-12_tpls/clang-13.0.1/superlu-dist-git.0f6efc377df2440c235452d13d28d2c717f832a1_6.3.0-git.8-hllbbfqto5uo2bqdaxgqvvb6uboj3l6j" CACHE PATH "") -set(SUITESPARSE_DIR "/usr/gapps/GEOSX/thirdPartyLibs/2025-04-03_spack/lassen-clang-13-cuda-12_tpls/clang-13.0.1/suite-sparse-5.10.1-rxlyv2tiek7hl3ln7ps7ykguwog3tax4" CACHE PATH "") +set(SUITESPARSE_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2025-04-16/lassen-clang-13-cuda-12_tpls/clang-13.0.1/suite-sparse-5.10.1-gslncaaocvjpwtym3nyntrq7mx6d3q6u" CACHE PATH "") -set(TRILINOS_DIR "/usr/gapps/GEOSX/thirdPartyLibs/2025-04-03_spack/lassen-clang-13-cuda-12_tpls/clang-13.0.1/trilinos-16.0.0-wo5v5rma22soustvdev64v5thopnxpct" CACHE PATH "") +set(TRILINOS_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2025-04-16/lassen-clang-13-cuda-12_tpls/clang-13.0.1/trilinos-16.1.0-5grx4kpszdyhhxksaheoct5xafp7fyft" CACHE PATH "") -set(HYPRE_DIR "/usr/gapps/GEOSX/thirdPartyLibs/2025-04-03_spack/lassen-clang-13-cuda-12_tpls/clang-13.0.1/hypre-git.21e5953ddc6daaa24699236108866afa597a415c_2.32.0-git.33-ogwhpmtzltpx4unrwzfoyaca2jlahx5f" CACHE PATH "") +set(HYPRE_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2025-04-16/lassen-clang-13-cuda-12_tpls/clang-13.0.1/hypre-git.21e5953ddc6daaa24699236108866afa597a415c_2.32.0-git.33-dilenzx5aq5w7p5qmo667iou67sv4jl7" CACHE PATH "") set(ENABLE_HYPRE_DEVICE "CUDA" CACHE STRING "") @@ -187,7 +187,7 @@ set(ADDR2LINE_EXEC "/usr/bin/addr2line" CACHE PATH "") set(ENABLE_MATHPRESSO ON CACHE BOOL "") -set(MATHPRESSO_DIR "/usr/gapps/GEOSX/thirdPartyLibs/2025-04-03_spack/lassen-clang-13-cuda-12_tpls/clang-13.0.1/mathpresso-geos-z4ebytw2o2tmltrko7jwbko5x6jvadod" CACHE PATH "") +set(MATHPRESSO_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2025-04-16/lassen-clang-13-cuda-12_tpls/clang-13.0.1/mathpresso-geos-agnvrs7qxo3734vo5s6fditvdolxdof7" CACHE PATH "") set(ENABLE_XML_UPDATES ON CACHE BOOL "") diff --git a/host-configs/LLNL/lassen-blueos_3_ppc64le_ib_p9-gcc@8.3.1-cuda@11.8.0.cmake b/host-configs/LLNL/lassen-blueos_3_ppc64le_ib_p9-gcc@8.3.1-cuda@11.8.0.cmake index f58eff84ee6..181cd96e94d 100644 --- a/host-configs/LLNL/lassen-blueos_3_ppc64le_ib_p9-gcc@8.3.1-cuda@11.8.0.cmake +++ b/host-configs/LLNL/lassen-blueos_3_ppc64le_ib_p9-gcc@8.3.1-cuda@11.8.0.cmake @@ -77,15 +77,15 @@ set(CMAKE_CUDA_FLAGS_DEBUG "-g -G -O0 -Xcompiler -O0" CACHE STRING "") set(ENABLE_CHAI ON CACHE BOOL "") -set(CHAI_DIR "/usr/gapps/GEOSX/thirdPartyLibs/2025-04-03_spack/lassen-gcc-8-cuda-11_tpls/gcc-8.3.1/chai-git.4b9060b18b9bec1167026cfb3132bd540c4bd56b_develop-wqfiegcvs7mcvwfbsfhvlp67dq6pgkmj" CACHE PATH "") +set(CHAI_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2025-04-16/lassen-gcc-8-cuda-11_tpls/gcc-8.3.1/chai-git.4b9060b18b9bec1167026cfb3132bd540c4bd56b_develop-7wnlaxzcihkuizymdnnci56uhbaqvdgh" CACHE PATH "") -set(RAJA_DIR "/usr/gapps/GEOSX/thirdPartyLibs/2025-04-03_spack/lassen-gcc-8-cuda-11_tpls/gcc-8.3.1/raja-git.1d70abf171474d331f1409908bdf1b1c3fe19222_develop-r4gqy5cs36b365up22noodxozbhox5aa" CACHE PATH "") +set(RAJA_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2025-04-16/lassen-gcc-8-cuda-11_tpls/gcc-8.3.1/raja-git.1d70abf171474d331f1409908bdf1b1c3fe19222_develop-nnv4plp73ftllcxgst6szuok76v45g5q" CACHE PATH "") set(ENABLE_UMPIRE ON CACHE BOOL "") -set(UMPIRE_DIR "/usr/gapps/GEOSX/thirdPartyLibs/2025-04-03_spack/lassen-gcc-8-cuda-11_tpls/gcc-8.3.1/umpire-git.1ed0669c57f041baa1f1070693991c3a7a43e7ee_develop-f73tjzjdmo7cbxqe4mp7eehf4o5hyamp" CACHE PATH "") +set(UMPIRE_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2025-04-16/lassen-gcc-8-cuda-11_tpls/gcc-8.3.1/umpire-git.1ed0669c57f041baa1f1070693991c3a7a43e7ee_develop-jdqm56pwdndks4nqjlvdcbm5f67d5ymf" CACHE PATH "") -set(CAMP_DIR "/usr/gapps/GEOSX/thirdPartyLibs/2025-04-03_spack/lassen-gcc-8-cuda-11_tpls/gcc-8.3.1/camp-git.ee0a3069a7ae72da8bcea63c06260fad34901d43_main-5zgnrmmdn2pijqefj2onhesyqxzoijm3" CACHE PATH "") +set(CAMP_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2025-04-16/lassen-gcc-8-cuda-11_tpls/gcc-8.3.1/camp-git.ee0a3069a7ae72da8bcea63c06260fad34901d43_main-leabuhdy46cwgzrdgy6euqvfzi3sdv6j" CACHE PATH "") #-------------------------------------------------------------------------------- # IO TPLs @@ -93,21 +93,21 @@ set(CAMP_DIR "/usr/gapps/GEOSX/thirdPartyLibs/2025-04-03_spack/lassen-gcc-8-cuda set(ENABLE_CALIPER ON CACHE BOOL "") -set(CALIPER_DIR "/usr/gapps/GEOSX/thirdPartyLibs/2025-04-03_spack/lassen-gcc-8-cuda-11_tpls/gcc-8.3.1/caliper-git.287b7f3ad2d12f520aad04268d44f353cd05403c_2.12.0-rw6xo4fv4xn4oapuiypwwn7cz3m73naz" CACHE PATH "") +set(CALIPER_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2025-04-16/lassen-gcc-8-cuda-11_tpls/gcc-8.3.1/caliper-git.287b7f3ad2d12f520aad04268d44f353cd05403c_2.12.0-4o2hij6pbcavyav2djiifne5yoh6judq" CACHE PATH "") -set(adiak_DIR "/usr/gapps/GEOSX/thirdPartyLibs/2025-04-03_spack/lassen-gcc-8-cuda-11_tpls/gcc-8.3.1/adiak-0.4.0-n3yugcwz5o3ggvi2nrwybgmfattinedh/lib/cmake/adiak" CACHE PATH "") +set(adiak_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2025-04-16/lassen-gcc-8-cuda-11_tpls/gcc-8.3.1/adiak-0.4.0-jrqmoii2lzu2imzhwsazd3rujttkgqws/lib/cmake/adiak" CACHE PATH "") -set(HDF5_DIR "/usr/gapps/GEOSX/thirdPartyLibs/2025-04-03_spack/lassen-gcc-8-cuda-11_tpls/gcc-8.3.1/hdf5-1.12.1-obzanrc4jpjjzno25h4iohq6f3hr2j27" CACHE PATH "") +set(HDF5_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2025-04-16/lassen-gcc-8-cuda-11_tpls/gcc-8.3.1/hdf5-1.12.1-oedmzeyclljshhp6wvflvydyfelztffk" CACHE PATH "") -set(CONDUIT_DIR "/usr/gapps/GEOSX/thirdPartyLibs/2025-04-03_spack/lassen-gcc-8-cuda-11_tpls/gcc-8.3.1/conduit-git.ad86e316ad56a75c099d30ca5ce75cff275b5924_develop-ubpigj3aj4jsqbi7j7bbibmg2ryo7xoj" CACHE PATH "") +set(CONDUIT_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2025-04-16/lassen-gcc-8-cuda-11_tpls/gcc-8.3.1/conduit-git.ad86e316ad56a75c099d30ca5ce75cff275b5924_develop-v5rwkgv56zdmh23lwyuynu3fdurelckt" CACHE PATH "") -set(SILO_DIR "/usr/gapps/GEOSX/thirdPartyLibs/2025-04-03_spack/lassen-gcc-8-cuda-11_tpls/gcc-8.3.1/silo-4.11.1-bsd-roheyk37frcivqqo4l3a4ldq7d5hx6st" CACHE PATH "") +set(SILO_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2025-04-16/lassen-gcc-8-cuda-11_tpls/gcc-8.3.1/silo-4.11.1-bsd-wglxufqf4vmt5zsxt37py277yq3g7nqx" CACHE PATH "") -set(PUGIXML_DIR "/usr/gapps/GEOSX/thirdPartyLibs/2025-04-03_spack/lassen-gcc-8-cuda-11_tpls/gcc-8.3.1/pugixml-1.13-s3vycldwlzcj5s6pua2hyghvdoqm6hu3" CACHE PATH "") +set(PUGIXML_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2025-04-16/lassen-gcc-8-cuda-11_tpls/gcc-8.3.1/pugixml-1.13-wx4umca2stjej7clxk3rfbzb2mpdtt5g" CACHE PATH "") -set(VTK_DIR "/usr/gapps/GEOSX/thirdPartyLibs/2025-04-03_spack/lassen-gcc-8-cuda-11_tpls/gcc-8.3.1/vtk-9.3.1-xoeo4iubpe3qwprc7o2j5lglbp4y6m7t" CACHE PATH "") +set(VTK_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2025-04-16/lassen-gcc-8-cuda-11_tpls/gcc-8.3.1/vtk-9.4.2-zkwkkm4lfsykgbizyz45p26fq7wu2ryf" CACHE PATH "") -set(FMT_DIR "/usr/gapps/GEOSX/thirdPartyLibs/2025-04-03_spack/lassen-gcc-8-cuda-11_tpls/gcc-8.3.1/fmt-10.0.0-6jiaf3rryjoxxkptvy2jcrnoajdpe6mv" CACHE PATH "") +set(FMT_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2025-04-16/lassen-gcc-8-cuda-11_tpls/gcc-8.3.1/fmt-10.0.0-mtehyjpjzuugvbuslhqthupvhvwnw4bu" CACHE PATH "") #-------------------------------------------------------------------------------- # System Math Libraries @@ -127,19 +127,19 @@ set(FORTRAN_MANGLE_NO_UNDERSCORE ON CACHE BOOL "") # Math TPLs #-------------------------------------------------------------------------------- -set(METIS_DIR "/usr/gapps/GEOSX/thirdPartyLibs/2025-04-03_spack/lassen-gcc-8-cuda-11_tpls/gcc-8.3.1/metis-5.1.0-nn7ngjgltv2ijx4kswtnoeyfgwbq24k2" CACHE PATH "") +set(METIS_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2025-04-16/lassen-gcc-8-cuda-11_tpls/gcc-8.3.1/metis-5.1.0-4skjvcwya7vkf6kd7q2no2difomuuc7n" CACHE PATH "") -set(PARMETIS_DIR "/usr/gapps/GEOSX/thirdPartyLibs/2025-04-03_spack/lassen-gcc-8-cuda-11_tpls/gcc-8.3.1/parmetis-4.0.3-chbckvoyrbustqebbsxhrrw7e3ngjx43" CACHE PATH "") +set(PARMETIS_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2025-04-16/lassen-gcc-8-cuda-11_tpls/gcc-8.3.1/parmetis-4.0.3-n6yetnfnev3yu2zhcxt3nzsipieufbcl" CACHE PATH "") -set(SCOTCH_DIR "/usr/gapps/GEOSX/thirdPartyLibs/2025-04-03_spack/lassen-gcc-8-cuda-11_tpls/gcc-8.3.1/scotch-7.0.3-4n72uptvwu74yw3nplp2dbyhxt5if6jf" CACHE PATH "") +set(SCOTCH_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2025-04-16/lassen-gcc-8-cuda-11_tpls/gcc-8.3.1/scotch-7.0.3-r6l2zc25vdmkegz7jkf6kxo57trtm32m" CACHE PATH "") -set(SUPERLU_DIST_DIR "/usr/gapps/GEOSX/thirdPartyLibs/2025-04-03_spack/lassen-gcc-8-cuda-11_tpls/gcc-8.3.1/superlu-dist-git.0f6efc377df2440c235452d13d28d2c717f832a1_6.3.0-git.8-co27fkcshr4pdskjot7sa3bfhccymaws" CACHE PATH "") +set(SUPERLU_DIST_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2025-04-16/lassen-gcc-8-cuda-11_tpls/gcc-8.3.1/superlu-dist-git.0f6efc377df2440c235452d13d28d2c717f832a1_6.3.0-git.8-g5y5xuks34y2uiwjqobhjj2zbdnocfwm" CACHE PATH "") -set(SUITESPARSE_DIR "/usr/gapps/GEOSX/thirdPartyLibs/2025-04-03_spack/lassen-gcc-8-cuda-11_tpls/gcc-8.3.1/suite-sparse-5.10.1-rgp2xi4ihgkbjm2rzgspizeler7w6otm" CACHE PATH "") +set(SUITESPARSE_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2025-04-16/lassen-gcc-8-cuda-11_tpls/gcc-8.3.1/suite-sparse-5.10.1-fmerfb2ylan4xzq6oshxe7627xcebbuc" CACHE PATH "") -set(TRILINOS_DIR "/usr/gapps/GEOSX/thirdPartyLibs/2025-04-03_spack/lassen-gcc-8-cuda-11_tpls/gcc-8.3.1/trilinos-16.0.0-k35ukkbitl64gzvdfe2dlvt5sg6r7t67" CACHE PATH "") +set(TRILINOS_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2025-04-16/lassen-gcc-8-cuda-11_tpls/gcc-8.3.1/trilinos-16.1.0-l7f2twq6lqvaql2ir4iwqub6budkh4if" CACHE PATH "") -set(HYPRE_DIR "/usr/gapps/GEOSX/thirdPartyLibs/2025-04-03_spack/lassen-gcc-8-cuda-11_tpls/gcc-8.3.1/hypre-git.21e5953ddc6daaa24699236108866afa597a415c_2.32.0-git.33-54clpmcn6y4pivwra6tuffibtipxuvjp" CACHE PATH "") +set(HYPRE_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2025-04-16/lassen-gcc-8-cuda-11_tpls/gcc-8.3.1/hypre-git.21e5953ddc6daaa24699236108866afa597a415c_2.32.0-git.33-nqwvniex4cseevwc6aedacsi3qs62efi" CACHE PATH "") set(ENABLE_HYPRE_DEVICE "CUDA" CACHE STRING "") @@ -187,7 +187,7 @@ set(ADDR2LINE_EXEC "/usr/bin/addr2line" CACHE PATH "") set(ENABLE_MATHPRESSO ON CACHE BOOL "") -set(MATHPRESSO_DIR "/usr/gapps/GEOSX/thirdPartyLibs/2025-04-03_spack/lassen-gcc-8-cuda-11_tpls/gcc-8.3.1/mathpresso-geos-tf3bai7si63pwb6nuqqkrliyiipl7z2m" CACHE PATH "") +set(MATHPRESSO_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2025-04-16/lassen-gcc-8-cuda-11_tpls/gcc-8.3.1/mathpresso-geos-wykn2hvzqjjlwjn2j6nh37e5ofsontwq" CACHE PATH "") set(ENABLE_XML_UPDATES ON CACHE BOOL "") diff --git a/host-configs/LLNL/ruby-toss_4_x86_64_ib-clang@14.0.6.cmake b/host-configs/LLNL/ruby-toss_4_x86_64_ib-clang@14.0.6.cmake index 4b5e7aea4d5..e2fad5b38dc 100644 --- a/host-configs/LLNL/ruby-toss_4_x86_64_ib-clang@14.0.6.cmake +++ b/host-configs/LLNL/ruby-toss_4_x86_64_ib-clang@14.0.6.cmake @@ -58,15 +58,15 @@ set(ENABLE_CUDA OFF CACHE BOOL "") set(ENABLE_CHAI ON CACHE BOOL "") -set(CHAI_DIR "/usr/gapps/GEOSX/thirdPartyLibs/2025-04-03_spack/ruby-clang-14_tpls/clang-14.0.6/chai-git.4b9060b18b9bec1167026cfb3132bd540c4bd56b_develop-f4wgpqutnikc45ymbfntdnbwcbpxp6ww" CACHE PATH "") +set(CHAI_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2025-04-16/ruby-clang-14_tpls/clang-14.0.6/chai-git.4b9060b18b9bec1167026cfb3132bd540c4bd56b_develop-ksmeelgooguezcfwrfuolrrgiqsfyzrn" CACHE PATH "") -set(RAJA_DIR "/usr/gapps/GEOSX/thirdPartyLibs/2025-04-03_spack/ruby-clang-14_tpls/clang-14.0.6/raja-git.1d70abf171474d331f1409908bdf1b1c3fe19222_develop-dn7yccm4x5q2kz6zl7pinkmtmksf3yoc" CACHE PATH "") +set(RAJA_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2025-04-16/ruby-clang-14_tpls/clang-14.0.6/raja-git.1d70abf171474d331f1409908bdf1b1c3fe19222_develop-liacmht5om33b4m4qsbyvxoke5iggag2" CACHE PATH "") set(ENABLE_UMPIRE ON CACHE BOOL "") -set(UMPIRE_DIR "/usr/gapps/GEOSX/thirdPartyLibs/2025-04-03_spack/ruby-clang-14_tpls/clang-14.0.6/umpire-git.1ed0669c57f041baa1f1070693991c3a7a43e7ee_develop-k6gdhiuktlcu5tfk4vuhzyqhj57ew7it" CACHE PATH "") +set(UMPIRE_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2025-04-16/ruby-clang-14_tpls/clang-14.0.6/umpire-git.1ed0669c57f041baa1f1070693991c3a7a43e7ee_develop-msxz5g2fgdtvh36cnhlxlw5lrgefcver" CACHE PATH "") -set(CAMP_DIR "/usr/gapps/GEOSX/thirdPartyLibs/2025-04-03_spack/ruby-clang-14_tpls/clang-14.0.6/camp-git.ee0a3069a7ae72da8bcea63c06260fad34901d43_main-e2mec4ypeahwfmjk2ntrbonnjlo6cahm" CACHE PATH "") +set(CAMP_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2025-04-16/ruby-clang-14_tpls/clang-14.0.6/camp-git.ee0a3069a7ae72da8bcea63c06260fad34901d43_main-seumcvrcjlfsitznrklm6anxlyop4wt3" CACHE PATH "") #-------------------------------------------------------------------------------- # IO TPLs @@ -74,21 +74,21 @@ set(CAMP_DIR "/usr/gapps/GEOSX/thirdPartyLibs/2025-04-03_spack/ruby-clang-14_tpl set(ENABLE_CALIPER ON CACHE BOOL "") -set(CALIPER_DIR "/usr/gapps/GEOSX/thirdPartyLibs/2025-04-03_spack/ruby-clang-14_tpls/clang-14.0.6/caliper-git.287b7f3ad2d12f520aad04268d44f353cd05403c_2.12.0-d6jzlhx4ofqairetauzhiw7rcocb3lj5" CACHE PATH "") +set(CALIPER_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2025-04-16/ruby-clang-14_tpls/clang-14.0.6/caliper-git.287b7f3ad2d12f520aad04268d44f353cd05403c_2.12.0-jgcljxcmnwpmu2w3e6fwepntqqjt274h" CACHE PATH "") -set(adiak_DIR "/usr/gapps/GEOSX/thirdPartyLibs/2025-04-03_spack/ruby-clang-14_tpls/clang-14.0.6/adiak-0.4.0-vxgcukydyqrm6ciuxrw4leflputw6r5e/lib/cmake/adiak" CACHE PATH "") +set(adiak_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2025-04-16/ruby-clang-14_tpls/clang-14.0.6/adiak-0.4.0-shzoi42twk7k6gbnkjwsbdddzu4rhrkw/lib/cmake/adiak" CACHE PATH "") -set(HDF5_DIR "/usr/gapps/GEOSX/thirdPartyLibs/2025-04-03_spack/ruby-clang-14_tpls/clang-14.0.6/hdf5-1.12.1-yqvru4fil7emvnajdmu3tq736rlzesza" CACHE PATH "") +set(HDF5_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2025-04-16/ruby-clang-14_tpls/clang-14.0.6/hdf5-1.12.1-4sbm456runiwk6j7qazogadcz435xvrg" CACHE PATH "") -set(CONDUIT_DIR "/usr/gapps/GEOSX/thirdPartyLibs/2025-04-03_spack/ruby-clang-14_tpls/clang-14.0.6/conduit-git.ad86e316ad56a75c099d30ca5ce75cff275b5924_develop-sowkah5jcivfrcna3lbmxxhntokwin6n" CACHE PATH "") +set(CONDUIT_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2025-04-16/ruby-clang-14_tpls/clang-14.0.6/conduit-git.ad86e316ad56a75c099d30ca5ce75cff275b5924_develop-5fv2jm2puzfkclt4k7jc6nnvbfyzezim" CACHE PATH "") -set(SILO_DIR "/usr/gapps/GEOSX/thirdPartyLibs/2025-04-03_spack/ruby-clang-14_tpls/clang-14.0.6/silo-4.11.1-bsd-dmyx6w72zap3cqtrtrdoaggki6dbdywv" CACHE PATH "") +set(SILO_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2025-04-16/ruby-clang-14_tpls/clang-14.0.6/silo-4.11.1-bsd-jwyj3qy5zssnecqucxc3jxnotuyxyh6w" CACHE PATH "") -set(PUGIXML_DIR "/usr/gapps/GEOSX/thirdPartyLibs/2025-04-03_spack/ruby-clang-14_tpls/clang-14.0.6/pugixml-1.13-qdosppqlevwbzkbkr25tycjlts6dxuoq" CACHE PATH "") +set(PUGIXML_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2025-04-16/ruby-clang-14_tpls/clang-14.0.6/pugixml-1.13-octpifpder5dpo6tjewt2n3vl2n2vlok" CACHE PATH "") -set(VTK_DIR "/usr/gapps/GEOSX/thirdPartyLibs/2025-04-03_spack/ruby-clang-14_tpls/clang-14.0.6/vtk-9.3.1-sgjxp6i2a5hlvzux3ufnmvrr3zoa22su" CACHE PATH "") +set(VTK_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2025-04-16/ruby-clang-14_tpls/clang-14.0.6/vtk-9.4.2-sum6763pdlv5qwei5nbyndt5qlk6dvxc" CACHE PATH "") -set(FMT_DIR "/usr/gapps/GEOSX/thirdPartyLibs/2025-04-03_spack/ruby-clang-14_tpls/clang-14.0.6/fmt-10.0.0-f2lzpypwoyhiracsh44luu46ezmch72t" CACHE PATH "") +set(FMT_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2025-04-16/ruby-clang-14_tpls/clang-14.0.6/fmt-10.0.0-4gzwrffoa2pl6v7uwyynj5yegriur7ik" CACHE PATH "") #-------------------------------------------------------------------------------- # System Math Libraries @@ -98,7 +98,7 @@ set(ENABLE_MKL ON CACHE BOOL "") set(MKL_INCLUDE_DIRS "/usr/tce/packages/mkl/mkl-2022.1.0/include" CACHE PATH "") -set(MKL_LIBRARIES /usr/tce/packages/mkl/mkl-2022.1.0/mkl/2022.1.0/lib/intel64/libmkl_gf_lp64.so +set(MKL_LIBRARIES /usr/tce/packages/mkl/mkl-2022.1.0/mkl/2022.1.0/lib/intel64/libmkl_intel_lp64.so /usr/tce/packages/mkl/mkl-2022.1.0/mkl/2022.1.0/lib/intel64/libmkl_gnu_thread.so /usr/tce/packages/mkl/mkl-2022.1.0/mkl/2022.1.0/lib/intel64/libmkl_core.so /lib/../lib64/libomp.so @@ -110,19 +110,19 @@ set(MKL_LIBRARIES /usr/tce/packages/mkl/mkl-2022.1.0/mkl/2022.1.0/lib/intel64/li # Math TPLs #-------------------------------------------------------------------------------- -set(METIS_DIR "/usr/gapps/GEOSX/thirdPartyLibs/2025-04-03_spack/ruby-clang-14_tpls/clang-14.0.6/metis-5.1.0-2bggpuqbh4sjefm2hisblqpofiek27dg" CACHE PATH "") +set(METIS_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2025-04-16/ruby-clang-14_tpls/clang-14.0.6/metis-5.1.0-ar4qtsbmnbmtlul5qx3pofbmf3jakucm" CACHE PATH "") -set(PARMETIS_DIR "/usr/gapps/GEOSX/thirdPartyLibs/2025-04-03_spack/ruby-clang-14_tpls/clang-14.0.6/parmetis-4.0.3-dy34gwdh5lk4bmzrucykto667hgj7njl" CACHE PATH "") +set(PARMETIS_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2025-04-16/ruby-clang-14_tpls/clang-14.0.6/parmetis-4.0.3-xvx5rgufkonp2talkmpnzp452pgebq55" CACHE PATH "") -set(SCOTCH_DIR "/usr/gapps/GEOSX/thirdPartyLibs/2025-04-03_spack/ruby-clang-14_tpls/clang-14.0.6/scotch-7.0.3-vquie4qxvhrhcbsaagdkjlwrvxyasj7r" CACHE PATH "") +set(SCOTCH_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2025-04-16/ruby-clang-14_tpls/clang-14.0.6/scotch-7.0.3-mlu7lwoextyse4gsloazxgxdlxd6gpx2" CACHE PATH "") -set(SUPERLU_DIST_DIR "/usr/gapps/GEOSX/thirdPartyLibs/2025-04-03_spack/ruby-clang-14_tpls/clang-14.0.6/superlu-dist-git.0f6efc377df2440c235452d13d28d2c717f832a1_6.3.0-git.8-uf3dqwltl5532qvkrcrse2nzk32drtv5" CACHE PATH "") +set(SUPERLU_DIST_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2025-04-16/ruby-clang-14_tpls/clang-14.0.6/superlu-dist-git.0f6efc377df2440c235452d13d28d2c717f832a1_6.3.0-git.8-fqieoarboqxtgg5zhahckdj4l54unqq3" CACHE PATH "") -set(SUITESPARSE_DIR "/usr/gapps/GEOSX/thirdPartyLibs/2025-04-03_spack/ruby-clang-14_tpls/clang-14.0.6/suite-sparse-5.10.1-kgaikvqvpf5quqvhu4bfm3tbixwcoyfo" CACHE PATH "") +set(SUITESPARSE_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2025-04-16/ruby-clang-14_tpls/clang-14.0.6/suite-sparse-5.10.1-ccwpkt522s5m3xwuvcj2dn4ctqykfshz" CACHE PATH "") -set(TRILINOS_DIR "/usr/gapps/GEOSX/thirdPartyLibs/2025-04-03_spack/ruby-clang-14_tpls/clang-14.0.6/trilinos-16.0.0-kt3gwm2xmyhg3t2z4pfwx3w75wkbu3ga" CACHE PATH "") +set(TRILINOS_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2025-04-16/ruby-clang-14_tpls/clang-14.0.6/trilinos-16.1.0-cnv2mfchuntcex5yhk2fhrlyxeu7xexo" CACHE PATH "") -set(HYPRE_DIR "/usr/gapps/GEOSX/thirdPartyLibs/2025-04-03_spack/ruby-clang-14_tpls/clang-14.0.6/hypre-git.21e5953ddc6daaa24699236108866afa597a415c_2.32.0-git.33-4ssxay255dsjyqvkgcfcpgsbp5mktmic" CACHE PATH "") +set(HYPRE_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2025-04-16/ruby-clang-14_tpls/clang-14.0.6/hypre-git.21e5953ddc6daaa24699236108866afa597a415c_2.32.0-git.33-w7ukzd4nbc6bl4w2i7vokxrptqdntp7i" CACHE PATH "") set(ENABLE_PETSC OFF CACHE BOOL "") @@ -146,7 +146,7 @@ set(ENABLE_PYGEOSX ON CACHE BOOL "") set(SPHINX_EXECUTABLE "/usr/gapps/GEOSX/thirdPartyLibs/python/quartz-gcc-python/python/bin/sphinx-build" CACHE PATH "") -set(DOXYGEN_EXECUTABLE "/usr/gapps/GEOSX/thirdPartyLibs/2025-04-03_spack/ruby-clang-14_tpls/clang-14.0.6/doxygen-1.8.20-xj3wmf2ztwfreg3ao4zdjyjlami7lrb4/bin/doxygen" CACHE PATH "") +set(DOXYGEN_EXECUTABLE "/usr/WS1/GEOS/GEOSX/TPLs_2025-04-16/ruby-clang-14_tpls/clang-14.0.6/doxygen-1.8.20-pcgpk5gzhzstzrt5cblfgrrichbgln4u/bin/doxygen" CACHE PATH "") #-------------------------------------------------------------------------------- # Development tools @@ -154,7 +154,7 @@ set(DOXYGEN_EXECUTABLE "/usr/gapps/GEOSX/thirdPartyLibs/2025-04-03_spack/ruby-cl set(ENABLE_UNCRUSTIFY ON CACHE BOOL "") -set(UNCRUSTIFY_EXECUTABLE "/usr/gapps/GEOSX/thirdPartyLibs/2025-04-03_spack/ruby-clang-14_tpls/clang-14.0.6/uncrustify-git.401a4098bce9dcc47e024987403f2d59d9ba7bd2_0.70.1-git.319-3tyetsqkpeonbslmn2iithvvvyfhozc6/bin/uncrustify" CACHE PATH "") +set(UNCRUSTIFY_EXECUTABLE "/usr/WS1/GEOS/GEOSX/TPLs_2025-04-16/ruby-clang-14_tpls/clang-14.0.6/uncrustify-git.401a4098bce9dcc47e024987403f2d59d9ba7bd2_0.70.1-git.319-4y4ztexrq54droaglskgemmcgnepnwxx/bin/uncrustify" CACHE PATH "") #-------------------------------------------------------------------------------- # addr2line @@ -170,7 +170,7 @@ set(ADDR2LINE_EXEC "/usr/bin/addr2line" CACHE PATH "") set(ENABLE_MATHPRESSO ON CACHE BOOL "") -set(MATHPRESSO_DIR "/usr/gapps/GEOSX/thirdPartyLibs/2025-04-03_spack/ruby-clang-14_tpls/clang-14.0.6/mathpresso-geos-pxokzqriqhovt3ggd37a3ocrhzp3p7ho" CACHE PATH "") +set(MATHPRESSO_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2025-04-16/ruby-clang-14_tpls/clang-14.0.6/mathpresso-geos-5kkbozv2oghijthzn3etg66evaegymsx" CACHE PATH "") set(ENABLE_XML_UPDATES ON CACHE BOOL "") diff --git a/host-configs/LLNL/ruby-toss_4_x86_64_ib-gcc@12.1.1.cmake b/host-configs/LLNL/ruby-toss_4_x86_64_ib-gcc@12.1.1.cmake index 57471298464..2b725733dfa 100644 --- a/host-configs/LLNL/ruby-toss_4_x86_64_ib-gcc@12.1.1.cmake +++ b/host-configs/LLNL/ruby-toss_4_x86_64_ib-gcc@12.1.1.cmake @@ -58,15 +58,15 @@ set(ENABLE_CUDA OFF CACHE BOOL "") set(ENABLE_CHAI ON CACHE BOOL "") -set(CHAI_DIR "/usr/gapps/GEOSX/thirdPartyLibs/2025-04-03_spack/ruby-gcc-12_tpls/gcc-12.1.1/chai-git.4b9060b18b9bec1167026cfb3132bd540c4bd56b_develop-uq6ogpe5shfs5s5ifayx27gvzm3n3xcf" CACHE PATH "") +set(CHAI_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2025-04-16/ruby-gcc-12_tpls/gcc-12.1.1/chai-git.4b9060b18b9bec1167026cfb3132bd540c4bd56b_develop-2xob7j63ysxxm5msqcs5akk53ox36rrq" CACHE PATH "") -set(RAJA_DIR "/usr/gapps/GEOSX/thirdPartyLibs/2025-04-03_spack/ruby-gcc-12_tpls/gcc-12.1.1/raja-git.1d70abf171474d331f1409908bdf1b1c3fe19222_develop-37yxlbkfjq4ww4iw46u3a3d52oi6pul4" CACHE PATH "") +set(RAJA_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2025-04-16/ruby-gcc-12_tpls/gcc-12.1.1/raja-git.1d70abf171474d331f1409908bdf1b1c3fe19222_develop-w6d3vfhqea67jtrl5kgsf7yfdmw53sws" CACHE PATH "") set(ENABLE_UMPIRE ON CACHE BOOL "") -set(UMPIRE_DIR "/usr/gapps/GEOSX/thirdPartyLibs/2025-04-03_spack/ruby-gcc-12_tpls/gcc-12.1.1/umpire-git.1ed0669c57f041baa1f1070693991c3a7a43e7ee_develop-tymd742qkyap4m2m3kcnlx4mqnikk4pw" CACHE PATH "") +set(UMPIRE_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2025-04-16/ruby-gcc-12_tpls/gcc-12.1.1/umpire-git.1ed0669c57f041baa1f1070693991c3a7a43e7ee_develop-h4gry4jg4nfbhrh55hecfdzzy3awxq2x" CACHE PATH "") -set(CAMP_DIR "/usr/gapps/GEOSX/thirdPartyLibs/2025-04-03_spack/ruby-gcc-12_tpls/gcc-12.1.1/camp-git.ee0a3069a7ae72da8bcea63c06260fad34901d43_main-wtxnzy3oakj4hdtuj5vpwpdtymqmyt4s" CACHE PATH "") +set(CAMP_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2025-04-16/ruby-gcc-12_tpls/gcc-12.1.1/camp-git.ee0a3069a7ae72da8bcea63c06260fad34901d43_main-7avauujxf75odfjvsunfgz34wkzen3hb" CACHE PATH "") #-------------------------------------------------------------------------------- # IO TPLs @@ -74,21 +74,21 @@ set(CAMP_DIR "/usr/gapps/GEOSX/thirdPartyLibs/2025-04-03_spack/ruby-gcc-12_tpls/ set(ENABLE_CALIPER ON CACHE BOOL "") -set(CALIPER_DIR "/usr/gapps/GEOSX/thirdPartyLibs/2025-04-03_spack/ruby-gcc-12_tpls/gcc-12.1.1/caliper-git.287b7f3ad2d12f520aad04268d44f353cd05403c_2.12.0-bno6d6qyyvivznkozzdh27ljrj3yqbv2" CACHE PATH "") +set(CALIPER_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2025-04-16/ruby-gcc-12_tpls/gcc-12.1.1/caliper-git.287b7f3ad2d12f520aad04268d44f353cd05403c_2.12.0-xolotrctq2ml5kcg4dminlshg6vzagor" CACHE PATH "") -set(adiak_DIR "/usr/gapps/GEOSX/thirdPartyLibs/2025-04-03_spack/ruby-gcc-12_tpls/gcc-12.1.1/adiak-0.4.0-dimwte7ij4naho6hhcqowidlxnespn7e/lib/cmake/adiak" CACHE PATH "") +set(adiak_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2025-04-16/ruby-gcc-12_tpls/gcc-12.1.1/adiak-0.4.0-bz6cshrbl4zpowg6uvhdo7ki7ss2tgjr/lib/cmake/adiak" CACHE PATH "") -set(HDF5_DIR "/usr/gapps/GEOSX/thirdPartyLibs/2025-04-03_spack/ruby-gcc-12_tpls/gcc-12.1.1/hdf5-1.12.1-ijx73yvfrhxnjls4acfy2sdqtiekvyec" CACHE PATH "") +set(HDF5_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2025-04-16/ruby-gcc-12_tpls/gcc-12.1.1/hdf5-1.12.1-oghlibs4dsel6eqrwu2xp2gvg4pjz2md" CACHE PATH "") -set(CONDUIT_DIR "/usr/gapps/GEOSX/thirdPartyLibs/2025-04-03_spack/ruby-gcc-12_tpls/gcc-12.1.1/conduit-git.ad86e316ad56a75c099d30ca5ce75cff275b5924_develop-jwijeuulb6xfflmsmh4snh6qvmmvenve" CACHE PATH "") +set(CONDUIT_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2025-04-16/ruby-gcc-12_tpls/gcc-12.1.1/conduit-git.ad86e316ad56a75c099d30ca5ce75cff275b5924_develop-37y7d7y2e735gaelsdl2ub7itkak6a77" CACHE PATH "") -set(SILO_DIR "/usr/gapps/GEOSX/thirdPartyLibs/2025-04-03_spack/ruby-gcc-12_tpls/gcc-12.1.1/silo-4.11.1-bsd-nrzzqos7534qy74dk5anmp3pvsgdovrq" CACHE PATH "") +set(SILO_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2025-04-16/ruby-gcc-12_tpls/gcc-12.1.1/silo-4.11.1-bsd-c4eskt44znon3uq54ozahcwpq6y4uusl" CACHE PATH "") -set(PUGIXML_DIR "/usr/gapps/GEOSX/thirdPartyLibs/2025-04-03_spack/ruby-gcc-12_tpls/gcc-12.1.1/pugixml-1.13-7v6zhre6pi7ibnief5tqhmqxowllqo2w" CACHE PATH "") +set(PUGIXML_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2025-04-16/ruby-gcc-12_tpls/gcc-12.1.1/pugixml-1.13-hsfh2l3cmzc7piwx4ex3azvz5tk75tfs" CACHE PATH "") -set(VTK_DIR "/usr/gapps/GEOSX/thirdPartyLibs/2025-04-03_spack/ruby-gcc-12_tpls/gcc-12.1.1/vtk-9.3.1-6rs7wpfvmzw7pdsdl6mifdrg7nhuidqd" CACHE PATH "") +set(VTK_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2025-04-16/ruby-gcc-12_tpls/gcc-12.1.1/vtk-9.4.2-4cf6y4amgebrzyhnhasmgjghmciuola7" CACHE PATH "") -set(FMT_DIR "/usr/gapps/GEOSX/thirdPartyLibs/2025-04-03_spack/ruby-gcc-12_tpls/gcc-12.1.1/fmt-10.0.0-4wcnmovbi74zd66vdk6xhjo6hefdbxbp" CACHE PATH "") +set(FMT_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2025-04-16/ruby-gcc-12_tpls/gcc-12.1.1/fmt-10.0.0-e7nurcfb4jtbpu75wmofg7hdurzjaf5n" CACHE PATH "") #-------------------------------------------------------------------------------- # System Math Libraries @@ -98,7 +98,7 @@ set(ENABLE_MKL ON CACHE BOOL "") set(MKL_INCLUDE_DIRS "/usr/tce/packages/mkl/mkl-2022.1.0/include" CACHE PATH "") -set(MKL_LIBRARIES /usr/tce/packages/mkl/mkl-2022.1.0/mkl/2022.1.0/lib/intel64/libmkl_gf_lp64.so +set(MKL_LIBRARIES /usr/tce/packages/mkl/mkl-2022.1.0/mkl/2022.1.0/lib/intel64/libmkl_intel_lp64.so /usr/tce/packages/mkl/mkl-2022.1.0/mkl/2022.1.0/lib/intel64/libmkl_gnu_thread.so /usr/tce/packages/mkl/mkl-2022.1.0/mkl/2022.1.0/lib/intel64/libmkl_core.so /lib/../lib64/libomp.so @@ -110,19 +110,19 @@ set(MKL_LIBRARIES /usr/tce/packages/mkl/mkl-2022.1.0/mkl/2022.1.0/lib/intel64/li # Math TPLs #-------------------------------------------------------------------------------- -set(METIS_DIR "/usr/gapps/GEOSX/thirdPartyLibs/2025-04-03_spack/ruby-gcc-12_tpls/gcc-12.1.1/metis-5.1.0-jrpyyvbvi5zzxt3mraydgurmfk7pjj77" CACHE PATH "") +set(METIS_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2025-04-16/ruby-gcc-12_tpls/gcc-12.1.1/metis-5.1.0-b2tyegtpk5zhjutrvdsgukfjuzfl35bg" CACHE PATH "") -set(PARMETIS_DIR "/usr/gapps/GEOSX/thirdPartyLibs/2025-04-03_spack/ruby-gcc-12_tpls/gcc-12.1.1/parmetis-4.0.3-i2lkaqn2onxsvx3rcssafh7zkgv4xgcb" CACHE PATH "") +set(PARMETIS_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2025-04-16/ruby-gcc-12_tpls/gcc-12.1.1/parmetis-4.0.3-wc7b6rp7ap6mtmu2zuucl7dwd3d72giq" CACHE PATH "") -set(SCOTCH_DIR "/usr/gapps/GEOSX/thirdPartyLibs/2025-04-03_spack/ruby-gcc-12_tpls/gcc-12.1.1/scotch-7.0.3-fl625kpmhevzvzmuotssykvvhaqovqk3" CACHE PATH "") +set(SCOTCH_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2025-04-16/ruby-gcc-12_tpls/gcc-12.1.1/scotch-7.0.3-4cuy5tv2ffzzryghy4dt5jqjkacyjxtp" CACHE PATH "") -set(SUPERLU_DIST_DIR "/usr/gapps/GEOSX/thirdPartyLibs/2025-04-03_spack/ruby-gcc-12_tpls/gcc-12.1.1/superlu-dist-git.0f6efc377df2440c235452d13d28d2c717f832a1_6.3.0-git.8-kul235x6jkdwxbdntczlhho7h6x65pwh" CACHE PATH "") +set(SUPERLU_DIST_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2025-04-16/ruby-gcc-12_tpls/gcc-12.1.1/superlu-dist-git.0f6efc377df2440c235452d13d28d2c717f832a1_6.3.0-git.8-djdmeegz4s2liz2wlvcvkrld2ynpw3in" CACHE PATH "") -set(SUITESPARSE_DIR "/usr/gapps/GEOSX/thirdPartyLibs/2025-04-03_spack/ruby-gcc-12_tpls/gcc-12.1.1/suite-sparse-5.10.1-fbm7gbwba72t4ggduvynvnbcr43uxxs4" CACHE PATH "") +set(SUITESPARSE_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2025-04-16/ruby-gcc-12_tpls/gcc-12.1.1/suite-sparse-5.10.1-spsprgn677h4meayroocuyd3rct34jv2" CACHE PATH "") -set(TRILINOS_DIR "/usr/gapps/GEOSX/thirdPartyLibs/2025-04-03_spack/ruby-gcc-12_tpls/gcc-12.1.1/trilinos-16.0.0-tlpnzz4auhkqtnirn3sduww6xpxgbtyn" CACHE PATH "") +set(TRILINOS_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2025-04-16/ruby-gcc-12_tpls/gcc-12.1.1/trilinos-16.1.0-ijnjoqaod6dricu5elrcaqsclw4lsxqg" CACHE PATH "") -set(HYPRE_DIR "/usr/gapps/GEOSX/thirdPartyLibs/2025-04-03_spack/ruby-gcc-12_tpls/gcc-12.1.1/hypre-git.21e5953ddc6daaa24699236108866afa597a415c_2.32.0-git.33-xccozj6hzrschhug3bip57vvbxwdhdmw" CACHE PATH "") +set(HYPRE_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2025-04-16/ruby-gcc-12_tpls/gcc-12.1.1/hypre-git.21e5953ddc6daaa24699236108866afa597a415c_2.32.0-git.33-5ff7umsj522hosraqhenhvb3lvvjdrb4" CACHE PATH "") set(ENABLE_PETSC OFF CACHE BOOL "") @@ -146,7 +146,7 @@ set(ENABLE_PYGEOSX ON CACHE BOOL "") set(SPHINX_EXECUTABLE "/usr/gapps/GEOSX/thirdPartyLibs/python/quartz-gcc-python/python/bin/sphinx-build" CACHE PATH "") -set(DOXYGEN_EXECUTABLE "/usr/gapps/GEOSX/thirdPartyLibs/2025-04-03_spack/ruby-gcc-12_tpls/gcc-12.1.1/doxygen-1.8.20-hbxmvlkrwmpt5mvibhths6cdo5rlor3s/bin/doxygen" CACHE PATH "") +set(DOXYGEN_EXECUTABLE "/usr/WS1/GEOS/GEOSX/TPLs_2025-04-16/ruby-gcc-12_tpls/gcc-12.1.1/doxygen-1.8.20-rbsdp6mktuvtbdx5pfi2y2kmeivgumrk/bin/doxygen" CACHE PATH "") #-------------------------------------------------------------------------------- # Development tools @@ -154,7 +154,7 @@ set(DOXYGEN_EXECUTABLE "/usr/gapps/GEOSX/thirdPartyLibs/2025-04-03_spack/ruby-gc set(ENABLE_UNCRUSTIFY ON CACHE BOOL "") -set(UNCRUSTIFY_EXECUTABLE "/usr/gapps/GEOSX/thirdPartyLibs/2025-04-03_spack/ruby-gcc-12_tpls/gcc-12.1.1/uncrustify-git.401a4098bce9dcc47e024987403f2d59d9ba7bd2_0.70.1-git.319-bsad7cne3ccgu3munuxms52yxxhxeob5/bin/uncrustify" CACHE PATH "") +set(UNCRUSTIFY_EXECUTABLE "/usr/WS1/GEOS/GEOSX/TPLs_2025-04-16/ruby-gcc-12_tpls/gcc-12.1.1/uncrustify-git.401a4098bce9dcc47e024987403f2d59d9ba7bd2_0.70.1-git.319-66zegvv2c4odtesul4gfg65p2hgukmw7/bin/uncrustify" CACHE PATH "") #-------------------------------------------------------------------------------- # addr2line @@ -170,7 +170,7 @@ set(ADDR2LINE_EXEC "/usr/bin/addr2line" CACHE PATH "") set(ENABLE_MATHPRESSO ON CACHE BOOL "") -set(MATHPRESSO_DIR "/usr/gapps/GEOSX/thirdPartyLibs/2025-04-03_spack/ruby-gcc-12_tpls/gcc-12.1.1/mathpresso-geos-duhbqwijvovnk2drgvvh2fs647mqitjj" CACHE PATH "") +set(MATHPRESSO_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2025-04-16/ruby-gcc-12_tpls/gcc-12.1.1/mathpresso-geos-pmas5poag5egtkkogmkxzbowtlsnhznm" CACHE PATH "") set(ENABLE_XML_UPDATES ON CACHE BOOL "") diff --git a/host-configs/LLNL/ruby-toss_4_x86_64_ib-gcc@12noAVX.cmake b/host-configs/LLNL/ruby-toss_4_x86_64_ib-gcc@12noAVX.cmake index 70f9f4bb24a..b6f847e3b38 100644 --- a/host-configs/LLNL/ruby-toss_4_x86_64_ib-gcc@12noAVX.cmake +++ b/host-configs/LLNL/ruby-toss_4_x86_64_ib-gcc@12noAVX.cmake @@ -60,15 +60,15 @@ set(ENABLE_CUDA OFF CACHE BOOL "") set(ENABLE_CHAI ON CACHE BOOL "") -set(CHAI_DIR "/usr/gapps/GEOSX/thirdPartyLibs/2025-04-03_spack/ruby-gcc-12noAVX_tpls/gcc-12noAVX/chai-git.4b9060b18b9bec1167026cfb3132bd540c4bd56b_develop-leifvg5jj3pqsdbt2jvujdotbvjavidq" CACHE PATH "") +set(CHAI_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2025-04-16/ruby-gcc-12noAVX_tpls/gcc-12noAVX/chai-git.4b9060b18b9bec1167026cfb3132bd540c4bd56b_develop-44liirgqt77y5jx6chuabzw6v5rpj22r" CACHE PATH "") -set(RAJA_DIR "/usr/gapps/GEOSX/thirdPartyLibs/2025-04-03_spack/ruby-gcc-12noAVX_tpls/gcc-12noAVX/raja-git.1d70abf171474d331f1409908bdf1b1c3fe19222_develop-2y47wpygfea35spibzd657rncwjgr3xk" CACHE PATH "") +set(RAJA_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2025-04-16/ruby-gcc-12noAVX_tpls/gcc-12noAVX/raja-git.1d70abf171474d331f1409908bdf1b1c3fe19222_develop-jkwf235s5cewqgnoe6me7gv4hty5hfuw" CACHE PATH "") set(ENABLE_UMPIRE ON CACHE BOOL "") -set(UMPIRE_DIR "/usr/gapps/GEOSX/thirdPartyLibs/2025-04-03_spack/ruby-gcc-12noAVX_tpls/gcc-12noAVX/umpire-git.1ed0669c57f041baa1f1070693991c3a7a43e7ee_develop-2fsgks5hmrb5eep4xrcn7cn6tf2s25qt" CACHE PATH "") +set(UMPIRE_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2025-04-16/ruby-gcc-12noAVX_tpls/gcc-12noAVX/umpire-git.1ed0669c57f041baa1f1070693991c3a7a43e7ee_develop-f5nd3amxl5vi32gpxuebjy3hza3i46xr" CACHE PATH "") -set(CAMP_DIR "/usr/gapps/GEOSX/thirdPartyLibs/2025-04-03_spack/ruby-gcc-12noAVX_tpls/gcc-12noAVX/camp-git.ee0a3069a7ae72da8bcea63c06260fad34901d43_main-sw3zpyoowyj5f2eo43rnd5sxmdeopmzi" CACHE PATH "") +set(CAMP_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2025-04-16/ruby-gcc-12noAVX_tpls/gcc-12noAVX/camp-git.ee0a3069a7ae72da8bcea63c06260fad34901d43_main-ozknqlixdd5t2fggyzzahyp2uwgtpqxe" CACHE PATH "") #-------------------------------------------------------------------------------- # IO TPLs @@ -76,21 +76,21 @@ set(CAMP_DIR "/usr/gapps/GEOSX/thirdPartyLibs/2025-04-03_spack/ruby-gcc-12noAVX_ set(ENABLE_CALIPER ON CACHE BOOL "") -set(CALIPER_DIR "/usr/gapps/GEOSX/thirdPartyLibs/2025-04-03_spack/ruby-gcc-12noAVX_tpls/gcc-12noAVX/caliper-git.287b7f3ad2d12f520aad04268d44f353cd05403c_2.12.0-olusdj2xpppf5tam6ktcysn6ogeq4i2d" CACHE PATH "") +set(CALIPER_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2025-04-16/ruby-gcc-12noAVX_tpls/gcc-12noAVX/caliper-git.287b7f3ad2d12f520aad04268d44f353cd05403c_2.12.0-fpt5fqjl57zcfp7juq2723exiqbiafue" CACHE PATH "") -set(adiak_DIR "/usr/gapps/GEOSX/thirdPartyLibs/2025-04-03_spack/ruby-gcc-12noAVX_tpls/gcc-12noAVX/adiak-0.4.0-kgrknuu6drw34t7svfcen5t5u37i4jnf/lib/cmake/adiak" CACHE PATH "") +set(adiak_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2025-04-16/ruby-gcc-12noAVX_tpls/gcc-12noAVX/adiak-0.4.0-ic6ousqruhancnroudaj2ramn26nnzxt/lib/cmake/adiak" CACHE PATH "") -set(HDF5_DIR "/usr/gapps/GEOSX/thirdPartyLibs/2025-04-03_spack/ruby-gcc-12noAVX_tpls/gcc-12noAVX/hdf5-1.12.1-chdwkirwhv5wph3ui6yuenspycyu4o5g" CACHE PATH "") +set(HDF5_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2025-04-16/ruby-gcc-12noAVX_tpls/gcc-12noAVX/hdf5-1.12.1-gde7rzb5axcjosct7jnzil5mqznuphym" CACHE PATH "") -set(CONDUIT_DIR "/usr/gapps/GEOSX/thirdPartyLibs/2025-04-03_spack/ruby-gcc-12noAVX_tpls/gcc-12noAVX/conduit-git.ad86e316ad56a75c099d30ca5ce75cff275b5924_develop-dc5zun6rptqzosk3ntitczne2umvfvoe" CACHE PATH "") +set(CONDUIT_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2025-04-16/ruby-gcc-12noAVX_tpls/gcc-12noAVX/conduit-git.ad86e316ad56a75c099d30ca5ce75cff275b5924_develop-xwnrnqd7jpyvg7e6ak3n2lrjb2teflv3" CACHE PATH "") -set(SILO_DIR "/usr/gapps/GEOSX/thirdPartyLibs/2025-04-03_spack/ruby-gcc-12noAVX_tpls/gcc-12noAVX/silo-4.11.1-bsd-wmvom3aodvg5tpn4b7tymog4j5o2bjdl" CACHE PATH "") +set(SILO_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2025-04-16/ruby-gcc-12noAVX_tpls/gcc-12noAVX/silo-4.11.1-bsd-qgi3yuajumhnem5jyfxudgaxymsxsry2" CACHE PATH "") -set(PUGIXML_DIR "/usr/gapps/GEOSX/thirdPartyLibs/2025-04-03_spack/ruby-gcc-12noAVX_tpls/gcc-12noAVX/pugixml-1.13-lzydzfiimopvd46asgg6wsswe4tkzbvm" CACHE PATH "") +set(PUGIXML_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2025-04-16/ruby-gcc-12noAVX_tpls/gcc-12noAVX/pugixml-1.13-czxwgb3p5ogoeiqftrp3bqahzr6lgr5n" CACHE PATH "") -set(VTK_DIR "/usr/gapps/GEOSX/thirdPartyLibs/2025-04-03_spack/ruby-gcc-12noAVX_tpls/gcc-12noAVX/vtk-9.3.1-rtmsf25pdwhvyygjqmzsezgoomzqf6fi" CACHE PATH "") +set(VTK_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2025-04-16/ruby-gcc-12noAVX_tpls/gcc-12noAVX/vtk-9.4.2-r57tnvswwccndtq3ae55fwqgzcpwpmlx" CACHE PATH "") -set(FMT_DIR "/usr/gapps/GEOSX/thirdPartyLibs/2025-04-03_spack/ruby-gcc-12noAVX_tpls/gcc-12noAVX/fmt-10.0.0-na2mo7xln32wmq2hjrmbdyzacr7yqxev" CACHE PATH "") +set(FMT_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2025-04-16/ruby-gcc-12noAVX_tpls/gcc-12noAVX/fmt-10.0.0-2mwtki3p7acfmyns4d27f6pvtwgbxdaw" CACHE PATH "") #-------------------------------------------------------------------------------- # System Math Libraries @@ -100,7 +100,7 @@ set(ENABLE_MKL ON CACHE BOOL "") set(MKL_INCLUDE_DIRS "/usr/tce/packages/mkl/mkl-2022.1.0/include" CACHE PATH "") -set(MKL_LIBRARIES /usr/tce/packages/mkl/mkl-2022.1.0/mkl/2022.1.0/lib/intel64/libmkl_gf_lp64.so +set(MKL_LIBRARIES /usr/tce/packages/mkl/mkl-2022.1.0/mkl/2022.1.0/lib/intel64/libmkl_intel_lp64.so /usr/tce/packages/mkl/mkl-2022.1.0/mkl/2022.1.0/lib/intel64/libmkl_gnu_thread.so /usr/tce/packages/mkl/mkl-2022.1.0/mkl/2022.1.0/lib/intel64/libmkl_core.so /lib/../lib64/libomp.so @@ -112,19 +112,19 @@ set(MKL_LIBRARIES /usr/tce/packages/mkl/mkl-2022.1.0/mkl/2022.1.0/lib/intel64/li # Math TPLs #-------------------------------------------------------------------------------- -set(METIS_DIR "/usr/gapps/GEOSX/thirdPartyLibs/2025-04-03_spack/ruby-gcc-12noAVX_tpls/gcc-12noAVX/metis-5.1.0-klusyacs6uicwrr6t2uh4inudrz25oog" CACHE PATH "") +set(METIS_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2025-04-16/ruby-gcc-12noAVX_tpls/gcc-12noAVX/metis-5.1.0-hemq6k3gyqbppgsvok3b2kcrtx24oglo" CACHE PATH "") -set(PARMETIS_DIR "/usr/gapps/GEOSX/thirdPartyLibs/2025-04-03_spack/ruby-gcc-12noAVX_tpls/gcc-12noAVX/parmetis-4.0.3-v5legva4mfqqce3sdgesl4th77brabgp" CACHE PATH "") +set(PARMETIS_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2025-04-16/ruby-gcc-12noAVX_tpls/gcc-12noAVX/parmetis-4.0.3-jbpzgcnoj3trxe3jjjbxxqjxgm4666h2" CACHE PATH "") -set(SCOTCH_DIR "/usr/gapps/GEOSX/thirdPartyLibs/2025-04-03_spack/ruby-gcc-12noAVX_tpls/gcc-12noAVX/scotch-7.0.3-nebodz5k3zv7xdt3nqooanpyn3o4glwk" CACHE PATH "") +set(SCOTCH_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2025-04-16/ruby-gcc-12noAVX_tpls/gcc-12noAVX/scotch-7.0.3-frgphccdsmcv57rmsmizi7kzn7ggyazg" CACHE PATH "") -set(SUPERLU_DIST_DIR "/usr/gapps/GEOSX/thirdPartyLibs/2025-04-03_spack/ruby-gcc-12noAVX_tpls/gcc-12noAVX/superlu-dist-git.0f6efc377df2440c235452d13d28d2c717f832a1_6.3.0-git.8-ippbrqdxoazamofylj5pmuwrh6inr7wj" CACHE PATH "") +set(SUPERLU_DIST_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2025-04-16/ruby-gcc-12noAVX_tpls/gcc-12noAVX/superlu-dist-git.0f6efc377df2440c235452d13d28d2c717f832a1_6.3.0-git.8-kutepd3wey2t6z72ln7tcyyeclxpfj4m" CACHE PATH "") -set(SUITESPARSE_DIR "/usr/gapps/GEOSX/thirdPartyLibs/2025-04-03_spack/ruby-gcc-12noAVX_tpls/gcc-12noAVX/suite-sparse-5.10.1-webltrnxup4nbupu53no5257splerdr6" CACHE PATH "") +set(SUITESPARSE_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2025-04-16/ruby-gcc-12noAVX_tpls/gcc-12noAVX/suite-sparse-5.10.1-i6e7qqrkbistqhfir3lmlhw5oc5ghwoh" CACHE PATH "") -set(TRILINOS_DIR "/usr/gapps/GEOSX/thirdPartyLibs/2025-04-03_spack/ruby-gcc-12noAVX_tpls/gcc-12noAVX/trilinos-16.0.0-ysargtkfdb5xy5fzx6ulphazmjvezelh" CACHE PATH "") +set(TRILINOS_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2025-04-16/ruby-gcc-12noAVX_tpls/gcc-12noAVX/trilinos-16.1.0-ummkoh33hrslvibofwc6m4xktisxltn2" CACHE PATH "") -set(HYPRE_DIR "/usr/gapps/GEOSX/thirdPartyLibs/2025-04-03_spack/ruby-gcc-12noAVX_tpls/gcc-12noAVX/hypre-git.21e5953ddc6daaa24699236108866afa597a415c_2.32.0-git.33-ml4eq3rh265fw2id2loqeuxr4h4juz27" CACHE PATH "") +set(HYPRE_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2025-04-16/ruby-gcc-12noAVX_tpls/gcc-12noAVX/hypre-git.21e5953ddc6daaa24699236108866afa597a415c_2.32.0-git.33-4yjylromko2bxvcdhu6cf3fzjucaavwf" CACHE PATH "") set(ENABLE_PETSC OFF CACHE BOOL "") @@ -148,7 +148,7 @@ set(ENABLE_PYGEOSX ON CACHE BOOL "") set(SPHINX_EXECUTABLE "/usr/gapps/GEOSX/thirdPartyLibs/python/quartz-gcc-python/python/bin/sphinx-build" CACHE PATH "") -set(DOXYGEN_EXECUTABLE "/usr/gapps/GEOSX/thirdPartyLibs/2025-04-03_spack/ruby-gcc-12noAVX_tpls/gcc-12noAVX/doxygen-1.8.20-c4zarmc366msdoizvmau2bs7n76ob7vo/bin/doxygen" CACHE PATH "") +set(DOXYGEN_EXECUTABLE "/usr/WS1/GEOS/GEOSX/TPLs_2025-04-16/ruby-gcc-12noAVX_tpls/gcc-12noAVX/doxygen-1.8.20-gimiza4fo3e3l6hk7is2i6ldsx5tzjdz/bin/doxygen" CACHE PATH "") #-------------------------------------------------------------------------------- # Development tools @@ -156,7 +156,7 @@ set(DOXYGEN_EXECUTABLE "/usr/gapps/GEOSX/thirdPartyLibs/2025-04-03_spack/ruby-gc set(ENABLE_UNCRUSTIFY ON CACHE BOOL "") -set(UNCRUSTIFY_EXECUTABLE "/usr/gapps/GEOSX/thirdPartyLibs/2025-04-03_spack/ruby-gcc-12noAVX_tpls/gcc-12noAVX/uncrustify-git.401a4098bce9dcc47e024987403f2d59d9ba7bd2_0.70.1-git.319-2mqopy2akzlsxtxeg27byz3abovta3nh/bin/uncrustify" CACHE PATH "") +set(UNCRUSTIFY_EXECUTABLE "/usr/WS1/GEOS/GEOSX/TPLs_2025-04-16/ruby-gcc-12noAVX_tpls/gcc-12noAVX/uncrustify-git.401a4098bce9dcc47e024987403f2d59d9ba7bd2_0.70.1-git.319-eecq2jjtthgyzmdi3sk5enloz6xw5bzw/bin/uncrustify" CACHE PATH "") #-------------------------------------------------------------------------------- # addr2line @@ -172,7 +172,7 @@ set(ADDR2LINE_EXEC "/usr/bin/addr2line" CACHE PATH "") set(ENABLE_MATHPRESSO ON CACHE BOOL "") -set(MATHPRESSO_DIR "/usr/gapps/GEOSX/thirdPartyLibs/2025-04-03_spack/ruby-gcc-12noAVX_tpls/gcc-12noAVX/mathpresso-geos-oxuork75cuchoi2oejgmbuucnru7llce" CACHE PATH "") +set(MATHPRESSO_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2025-04-16/ruby-gcc-12noAVX_tpls/gcc-12noAVX/mathpresso-geos-vqn7cjtawyzaitoivbgkxqbclcdhog2j" CACHE PATH "") set(ENABLE_XML_UPDATES ON CACHE BOOL "") diff --git a/src/coreComponents/schema/schema.xsd b/src/coreComponents/schema/schema.xsd index ee95e352d66..c8137e5ce7c 100644 --- a/src/coreComponents/schema/schema.xsd +++ b/src/coreComponents/schema/schema.xsd @@ -3459,7 +3459,7 @@ Information output from lower logLevels is added with the desired log level - + @@ -3482,7 +3482,7 @@ Local- Add jump stabilization on interior of macro elements--> - + diff --git a/src/coreComponents/schema/schema.xsd.other b/src/coreComponents/schema/schema.xsd.other index 728b907fe74..7cbfd61e863 100644 --- a/src/coreComponents/schema/schema.xsd.other +++ b/src/coreComponents/schema/schema.xsd.other @@ -486,7 +486,7 @@ - + @@ -576,7 +576,7 @@ - + @@ -613,7 +613,7 @@ - + @@ -666,7 +666,7 @@ - + @@ -709,7 +709,7 @@ - + @@ -744,7 +744,7 @@ - + @@ -755,7 +755,7 @@ - + @@ -768,7 +768,7 @@ - + @@ -781,7 +781,7 @@ - + @@ -795,7 +795,7 @@ - + @@ -829,7 +829,7 @@ - + @@ -894,7 +894,7 @@ - + @@ -927,7 +927,7 @@ - + @@ -938,7 +938,7 @@ - + @@ -949,7 +949,7 @@ - + @@ -962,7 +962,7 @@ - + @@ -975,7 +975,7 @@ - + @@ -986,7 +986,7 @@ - + @@ -997,7 +997,7 @@ - + @@ -1008,7 +1008,7 @@ - + @@ -1021,7 +1021,7 @@ - + @@ -1034,7 +1034,7 @@ - + @@ -1047,7 +1047,7 @@ - + @@ -1060,7 +1060,7 @@ - + @@ -1071,7 +1071,7 @@ - + @@ -1084,7 +1084,7 @@ - + @@ -1097,7 +1097,7 @@ - + @@ -1108,7 +1108,7 @@ - + @@ -1119,7 +1119,7 @@ - + @@ -1132,7 +1132,7 @@ - + @@ -1143,7 +1143,7 @@ - + @@ -1154,7 +1154,7 @@ - + @@ -1167,7 +1167,7 @@ - + @@ -1180,7 +1180,7 @@ - + @@ -1193,7 +1193,7 @@ - + @@ -1206,7 +1206,7 @@ - + @@ -1219,7 +1219,7 @@ - + @@ -1230,7 +1230,7 @@ - + @@ -1243,7 +1243,7 @@ - + @@ -1256,7 +1256,7 @@ - + @@ -1269,7 +1269,7 @@ - + @@ -1283,7 +1283,7 @@ - + @@ -1298,7 +1298,7 @@ - + @@ -1315,7 +1315,7 @@ - + @@ -1332,7 +1332,7 @@ - + @@ -1349,7 +1349,7 @@ - + @@ -1364,7 +1364,7 @@ - + @@ -1403,7 +1403,7 @@ - + @@ -1432,7 +1432,7 @@ - + @@ -1527,7 +1527,7 @@ - + @@ -3191,7 +3191,7 @@ - + @@ -3219,7 +3219,7 @@ - + @@ -3238,11 +3238,11 @@ - + - + @@ -3252,7 +3252,7 @@ - + @@ -3262,11 +3262,11 @@ - + - + @@ -3276,7 +3276,7 @@ - + @@ -3286,7 +3286,7 @@ - + @@ -3296,7 +3296,7 @@ - + @@ -3320,7 +3320,7 @@ - + @@ -3338,7 +3338,7 @@ - + @@ -3350,7 +3350,7 @@ - + @@ -3362,7 +3362,7 @@ - + @@ -3370,11 +3370,11 @@ - + - + @@ -3397,7 +3397,7 @@ - + @@ -3423,7 +3423,7 @@ - + @@ -3444,7 +3444,7 @@ - + @@ -3474,7 +3474,7 @@ - + @@ -3488,7 +3488,7 @@ - + @@ -3515,7 +3515,7 @@ - + @@ -3554,7 +3554,7 @@ - + From 8f53f132982497f6ae2efdfcb084365b1a767cb9 Mon Sep 17 00:00:00 2001 From: "Randolph R. Settgast" Date: Fri, 18 Apr 2025 12:40:58 -0700 Subject: [PATCH 03/19] comment out vtk unit test --- ...ppc64le_ib_p9-gcc@12.2.1-cuda@12.2.2.cmake | 197 ++++++++++++++++++ .../unitTests/meshTests/testVTKImport.cpp | 2 +- 2 files changed, 198 insertions(+), 1 deletion(-) create mode 100644 host-configs/LLNL/lassen-blueos_3_ppc64le_ib_p9-gcc@12.2.1-cuda@12.2.2.cmake diff --git a/host-configs/LLNL/lassen-blueos_3_ppc64le_ib_p9-gcc@12.2.1-cuda@12.2.2.cmake b/host-configs/LLNL/lassen-blueos_3_ppc64le_ib_p9-gcc@12.2.1-cuda@12.2.2.cmake new file mode 100644 index 00000000000..50bea817291 --- /dev/null +++ b/host-configs/LLNL/lassen-blueos_3_ppc64le_ib_p9-gcc@12.2.1-cuda@12.2.2.cmake @@ -0,0 +1,197 @@ +################################################################################# +# Generated host-config - Edit at own risk! +################################################################################# +#-------------------------------------------------------------------------------- +# SYS_TYPE: blueos_3_ppc64le_ib_p9 +# Compiler Spec: gcc@=12.2.1 +# CMake executable path: /usr/tce/packages/cmake/cmake-3.29.2/bin/cmake +#-------------------------------------------------------------------------------- + +#-------------------------------------------------------------------------------- +# Compilers +#-------------------------------------------------------------------------------- + +set(CMAKE_C_COMPILER "/usr/tce/packages/gcc/gcc-12.2.1/bin/gcc" CACHE PATH "") + +set(CMAKE_CXX_COMPILER "/usr/tce/packages/gcc/gcc-12.2.1/bin/g++" CACHE PATH "") + +set(CMAKE_CXX_FLAGS_RELEASE "-O3 -DNDEBUG" CACHE STRING "") + +set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O2 -g -DNDEBUG" CACHE STRING "") + +set(CMAKE_CXX_FLAGS_DEBUG "-g" CACHE STRING "") + +#-------------------------------------------------------------------------------- +# CMake Standard +#-------------------------------------------------------------------------------- + +set(BLT_CXX_STD "c++17" CACHE STRING "") + +#-------------------------------------------------------------------------------- +# MPI +#-------------------------------------------------------------------------------- + +set(ENABLE_MPI ON CACHE BOOL "") + +set(MPI_C_COMPILER "/usr/tce/packages/spectrum-mpi/spectrum-mpi-rolling-release-gcc-12.2.1/bin/mpicc" CACHE PATH "") + +set(MPI_CXX_COMPILER "/usr/tce/packages/spectrum-mpi/spectrum-mpi-rolling-release-gcc-12.2.1/bin/mpicxx" CACHE PATH "") + +set(ENABLE_WRAP_ALL_TESTS_WITH_MPIEXEC ON CACHE BOOL "") + +set(MPIEXEC "lrun" CACHE PATH "") + +set(MPIEXEC_NUMPROC_FLAG "-n" CACHE PATH "") + +#-------------------------------------------------------------------------------- +# OpenMP +#-------------------------------------------------------------------------------- + +set(ENABLE_OPENMP ON CACHE BOOL "") + +#-------------------------------------------------------------------------------- +# Cuda +#-------------------------------------------------------------------------------- + +set(ENABLE_CUDA ON CACHE BOOL "") + +set(CMAKE_CUDA_STANDARD "17" CACHE PATH "") + +set(CUDA_TOOLKIT_ROOT_DIR "/usr/tce/packages/cuda/cuda-12.2.2" CACHE PATH "") + +set(CMAKE_CUDA_COMPILER "${CUDA_TOOLKIT_ROOT_DIR}/bin/nvcc" CACHE PATH "") + +set(CMAKE_CUDA_ARCHITECTURES "70" CACHE STRING "") + +set(CMAKE_CUDA_FLAGS "-restrict --expt-extended-lambda -Werror cross-execution-space-call,reorder,deprecated-declarations -arch sm_70" CACHE STRING "") + +set(CMAKE_CUDA_FLAGS_RELEASE "-O3 -DNDEBUG -Xcompiler -DNDEBUG -Xcompiler -O3 -Xcompiler -mcpu=powerpc64le -Xcompiler -mtune=powerpc64le" CACHE STRING "") + +set(CMAKE_CUDA_FLAGS_RELWITHDEBINFO "-g -lineinfo ${CMAKE_CUDA_FLAGS_RELEASE}" CACHE STRING "") + +set(CMAKE_CUDA_FLAGS_DEBUG "-g -G -O0 -Xcompiler -O0" CACHE STRING "") + +#-------------------------------------------------------------------------------- +# Performance Portability TPLs +#-------------------------------------------------------------------------------- + +set(ENABLE_CHAI ON CACHE BOOL "") + +set(CHAI_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2025-04-16/lassen-gcc-12-cuda-12_tpls/gcc-12.2.1/chai-git.4b9060b18b9bec1167026cfb3132bd540c4bd56b_develop-vhg4xshwxpkvjo5rix3y73b3iiolgzyv" CACHE PATH "") + +set(RAJA_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2025-04-16/lassen-gcc-12-cuda-12_tpls/gcc-12.2.1/raja-git.1d70abf171474d331f1409908bdf1b1c3fe19222_develop-dh3u6qxy6wpjjcurdxdqahtleeqpwec7" CACHE PATH "") + +set(ENABLE_UMPIRE ON CACHE BOOL "") + +set(UMPIRE_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2025-04-16/lassen-gcc-12-cuda-12_tpls/gcc-12.2.1/umpire-git.1ed0669c57f041baa1f1070693991c3a7a43e7ee_develop-3hal737zj45sxqwhotzf4fbawiobzutr" CACHE PATH "") + +set(CAMP_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2025-04-16/lassen-gcc-12-cuda-12_tpls/gcc-12.2.1/camp-git.ee0a3069a7ae72da8bcea63c06260fad34901d43_main-57jxirhulntkzp6t2ejittr5eilonrv3" CACHE PATH "") + +#-------------------------------------------------------------------------------- +# IO TPLs +#-------------------------------------------------------------------------------- + +set(ENABLE_CALIPER ON CACHE BOOL "") + +set(CALIPER_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2025-04-16/lassen-gcc-12-cuda-12_tpls/gcc-12.2.1/caliper-git.287b7f3ad2d12f520aad04268d44f353cd05403c_2.12.0-kbpv7dxren575impkq2mrziias5fskvq" CACHE PATH "") + +set(adiak_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2025-04-16/lassen-gcc-12-cuda-12_tpls/gcc-12.2.1/adiak-0.4.0-3k7t62ech7mdaazlmc7jhsnkmwymvgjw/lib/cmake/adiak" CACHE PATH "") + +set(HDF5_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2025-04-16/lassen-gcc-12-cuda-12_tpls/gcc-12.2.1/hdf5-1.12.1-5giqvfzuztzfd44xgdnb5lfxsr4enddd" CACHE PATH "") + +set(CONDUIT_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2025-04-16/lassen-gcc-12-cuda-12_tpls/gcc-12.2.1/conduit-git.ad86e316ad56a75c099d30ca5ce75cff275b5924_develop-enj3465765iagbtod3gl43hxvrszcgfs" CACHE PATH "") + +set(SILO_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2025-04-16/lassen-gcc-12-cuda-12_tpls/gcc-12.2.1/silo-4.11.1-bsd-yiogm7n27lnigrqoekyhguydimtnagph" CACHE PATH "") + +set(PUGIXML_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2025-04-16/lassen-gcc-12-cuda-12_tpls/gcc-12.2.1/pugixml-1.13-svmnlqb3msraiz6da2n6aohywnugrkyo" CACHE PATH "") + +set(VTK_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2025-04-16/lassen-gcc-12-cuda-12_tpls/gcc-12.2.1/vtk-9.4.2-3ak2unaonvamkpwncqr3cbue74rsacvm" CACHE PATH "") + +set(FMT_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2025-04-16/lassen-gcc-12-cuda-12_tpls/gcc-12.2.1/fmt-10.0.0-h23upmisikqmmimetxwauycuut6fbihq" CACHE PATH "") + +#-------------------------------------------------------------------------------- +# System Math Libraries +#-------------------------------------------------------------------------------- + +set(ENABLE_ESSL ON CACHE BOOL "") + +set(ESSL_INCLUDE_DIRS "/usr/tcetmp/packages/essl/essl-6.3.0.2/include" CACHE PATH "") + +set(ESSL_LIBRARIES /usr/tcetmp/packages/essl/essl-6.3.0.2/lib64/libessl.so + /usr/tcetmp/packages/essl/essl-6.3.0.2/lib64/liblapackforessl.so + /usr/tcetmp/packages/essl/essl-6.3.0.2/lib64/liblapackforessl_.so CACHE STRING "") + +set(FORTRAN_MANGLE_NO_UNDERSCORE ON CACHE BOOL "") + +#-------------------------------------------------------------------------------- +# Math TPLs +#-------------------------------------------------------------------------------- + +set(METIS_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2025-04-16/lassen-gcc-12-cuda-12_tpls/gcc-12.2.1/metis-5.1.0-etpeap3gi3hupeh4cx6sfbwvjzdm5vxn" CACHE PATH "") + +set(PARMETIS_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2025-04-16/lassen-gcc-12-cuda-12_tpls/gcc-12.2.1/parmetis-4.0.3-mudkkwdfruibaetissldvusv55icjrqb" CACHE PATH "") + +set(SCOTCH_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2025-04-16/lassen-gcc-12-cuda-12_tpls/gcc-12.2.1/scotch-7.0.3-k7iraeiruu3qwkw6uzv4inlsjaishgri" CACHE PATH "") + +set(SUPERLU_DIST_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2025-04-16/lassen-gcc-12-cuda-12_tpls/gcc-12.2.1/superlu-dist-git.0f6efc377df2440c235452d13d28d2c717f832a1_6.3.0-git.8-vu6hrmf4lqulmxybxe7g66nuvp26r77b" CACHE PATH "") + +set(SUITESPARSE_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2025-04-16/lassen-gcc-12-cuda-12_tpls/gcc-12.2.1/suite-sparse-5.10.1-7wtrejhxpjc7fraq24udu4jqj5uwd4uh" CACHE PATH "") + +set(TRILINOS_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2025-04-16/lassen-gcc-12-cuda-12_tpls/gcc-12.2.1/trilinos-16.1.0-3yyfm524feycs7wqovbifgfrfmftyayn" CACHE PATH "") + +set(HYPRE_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2025-04-16/lassen-gcc-12-cuda-12_tpls/gcc-12.2.1/hypre-git.21e5953ddc6daaa24699236108866afa597a415c_2.32.0-git.33-tyk5v5wyx5vwt54b3jpdvnhubspkbbah" CACHE PATH "") + +set(ENABLE_HYPRE_DEVICE "CUDA" CACHE STRING "") + +set(ENABLE_PETSC OFF CACHE BOOL "") + +set(GEOS_LA_INTERFACE "Hypre" CACHE STRING "") + +#-------------------------------------------------------------------------------- +# Python +#-------------------------------------------------------------------------------- + +set(Python3_ROOT_DIR "/usr/gapps/GEOSX/thirdPartyLibs/python/lassen-gcc-python/python/" CACHE PATH "") + +set(Python3_EXECUTABLE "/usr/gapps/GEOSX/thirdPartyLibs/python/lassen-gcc-python/python/bin/python3" CACHE PATH "") + +set(ENABLE_PYGEOSX ON CACHE BOOL "") + +#-------------------------------------------------------------------------------- +# Documentation +#-------------------------------------------------------------------------------- + +set(ENABLE_DOCS OFF CACHE BOOL "") + +set(ENABLE_DOXYGEN OFF CACHE BOOL "") + +set(ENABLE_SPHINX OFF CACHE BOOL "") + +#-------------------------------------------------------------------------------- +# Development tools +#-------------------------------------------------------------------------------- + +set(ENABLE_UNCRUSTIFY OFF CACHE BOOL "") + +#-------------------------------------------------------------------------------- +# addr2line +#-------------------------------------------------------------------------------- + +set(ENABLE_ADDR2LINE ON CACHE BOOL "") + +set(ADDR2LINE_EXEC "/usr/bin/addr2line" CACHE PATH "") + +#-------------------------------------------------------------------------------- +# Other +#-------------------------------------------------------------------------------- + +set(ENABLE_MATHPRESSO ON CACHE BOOL "") + +set(MATHPRESSO_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2025-04-16/lassen-gcc-12-cuda-12_tpls/gcc-12.2.1/mathpresso-geos-e7z5fzanx2inxvhhneusfxo2ansjhwkx" CACHE PATH "") + +set(ENABLE_XML_UPDATES ON CACHE BOOL "") + +set(GEOS_BUILD_SHARED_LIBS ON CACHE BOOL "") + +set(ATS_ARGUMENTS "--ats jsrun_omp --ats jsrun_bind=packed" CACHE STRING "") + diff --git a/src/coreComponents/unitTests/meshTests/testVTKImport.cpp b/src/coreComponents/unitTests/meshTests/testVTKImport.cpp index 5ca9043b0c3..7b5035fd653 100644 --- a/src/coreComponents/unitTests/meshTests/testVTKImport.cpp +++ b/src/coreComponents/unitTests/meshTests/testVTKImport.cpp @@ -410,7 +410,7 @@ TEST( VTKImport, cube ) } }; - std::set< string > const meshFiles{ "cube.vtk", + std::set< string > const meshFiles{ //"cube.vtk", "cube_STRUCTURED_POINTS.vtk", "cube_RECTILINEAR_GRID.vtk", "cube_STRUCTURED_GRID.vtk", From 099b74229f8f9186a0fd5fa825160550b09425ba Mon Sep 17 00:00:00 2001 From: Matteo Cusini <49037133+CusiniM@users.noreply.github.com> Date: Fri, 18 Apr 2025 14:13:37 -0700 Subject: [PATCH 04/19] add missing packages to install script. --- scripts/setupPythonEnvironment.bash | 2 ++ 1 file changed, 2 insertions(+) diff --git a/scripts/setupPythonEnvironment.bash b/scripts/setupPythonEnvironment.bash index 338e7013a03..87d931f2672 100755 --- a/scripts/setupPythonEnvironment.bash +++ b/scripts/setupPythonEnvironment.bash @@ -14,6 +14,8 @@ PACKAGE_BRANCH=main declare -a TARGET_PACKAGES=("geos-mesh" "geos-xml-tools" "hdf5-wrapper" + "geos-utils" + "geos-mesh" "pygeos-tools" "geos-ats") declare -a LINK_SCRIPTS=("preprocess_xml" From b5a345be58fad74c33286d370f53beace353dae1 Mon Sep 17 00:00:00 2001 From: Matteo Cusini <49037133+CusiniM@users.noreply.github.com> Date: Fri, 18 Apr 2025 15:10:26 -0700 Subject: [PATCH 05/19] change python branch. --- src/CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 8a8ad541f28..bcdaa1dac10 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -220,8 +220,8 @@ install( FILES ${CMAKE_BINARY_DIR}/schema.xsd ################################ # Add python environment setup ################################ -# message(WARNING "Temporarily changing the geosPythonBranch to cusini/addFailedTestsLogProcessing") -# set(GEOS_PYTHON_PACKAGES_BRANCH "cusini/addFailedTestsLogProcessing" CACHE STRING "" FORCE) +message(WARNING "Temporarily changing the geosPythonBranch to cusini/remove-relative-paths") +set(GEOS_PYTHON_PACKAGES_BRANCH "cusini/remove-relative-paths" CACHE STRING "" FORCE) if ( Python3_EXECUTABLE ) From 59669a99b8135afe27e37e8e0b3b0e9b7869aef8 Mon Sep 17 00:00:00 2001 From: Randolph Settgast Date: Fri, 25 Apr 2025 19:02:42 -0700 Subject: [PATCH 06/19] add explicit zlib import. update tpl tag --- .devcontainer/devcontainer.json | 2 +- .../thirdparty/SetupGeosxThirdParty.cmake | 26 +++- src/coreComponents/schema/schema.xsd | 4 +- src/coreComponents/schema/schema.xsd.other | 146 +++++++++--------- 4 files changed, 101 insertions(+), 77 deletions(-) diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index 87981e942aa..934c21659ea 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -2,7 +2,7 @@ "build": { "dockerfile": "Dockerfile", "args": { - "GEOS_TPL_TAG": "306-673" + "GEOS_TPL_TAG": "306-680" } }, "runArgs": [ diff --git a/src/cmake/thirdparty/SetupGeosxThirdParty.cmake b/src/cmake/thirdparty/SetupGeosxThirdParty.cmake index f042521712b..6736e46062c 100644 --- a/src/cmake/thirdparty/SetupGeosxThirdParty.cmake +++ b/src/cmake/thirdparty/SetupGeosxThirdParty.cmake @@ -210,6 +210,28 @@ else() mandatory_tpl_doesnt_exist("Conduit" CONDUIT_DIR) endif() +################################ +# ZLIB +################################ +if(DEFINED ZLIB_DIR) + list(PREPEND CMAKE_PREFIX_PATH "${ZLIB_DIR}") +endif() + +find_package(ZLIB REQUIRED) + +# Print ZLIB info after finding it +message(STATUS "----> ZLIB version: ${ZLIB_VERSION}") +message(STATUS "----> ZLIB include dirs: ${ZLIB_INCLUDE_DIRS}") +message(STATUS "----> ZLIB library: ${ZLIB_LIBRARIES}") + +blt_convert_to_system_includes(TARGET ZLIB::ZLIB) + +set(ENABLE_ZLIB ON CACHE BOOL "") + +unset(_ZLIB_FIND_OPTIONS) + + + ################################ # HDF5 ################################ @@ -230,6 +252,8 @@ else() mandatory_tpl_doesnt_exist("hdf5" HDF5_DIR) endif() +target_link_libraries(HDF5::HDF5 INTERFACE ZLIB::ZLIB) + ################################ # SILO ################################ @@ -873,7 +897,7 @@ if( ${CMAKE_VERSION} VERSION_LESS "3.19" ) set( PYTHON_AND_VERSION Python3 ) set( PYTHON_OPTIONAL_COMPONENTS) else() - set( PYTHON_AND_VERSION Python3 3.6.0...3.12.2 ) + set( PYTHON_AND_VERSION Python3 3.6.0...3.13.3 ) set( PYTHON_OPTIONAL_COMPONENTS OPTIONAL_COMPONENTS Development NumPy) endif() if(ENABLE_PYGEOSX) diff --git a/src/coreComponents/schema/schema.xsd b/src/coreComponents/schema/schema.xsd index c8137e5ce7c..ee95e352d66 100644 --- a/src/coreComponents/schema/schema.xsd +++ b/src/coreComponents/schema/schema.xsd @@ -3459,7 +3459,7 @@ Information output from lower logLevels is added with the desired log level - + @@ -3482,7 +3482,7 @@ Local- Add jump stabilization on interior of macro elements--> - + diff --git a/src/coreComponents/schema/schema.xsd.other b/src/coreComponents/schema/schema.xsd.other index 7cbfd61e863..728b907fe74 100644 --- a/src/coreComponents/schema/schema.xsd.other +++ b/src/coreComponents/schema/schema.xsd.other @@ -486,7 +486,7 @@ - + @@ -576,7 +576,7 @@ - + @@ -613,7 +613,7 @@ - + @@ -666,7 +666,7 @@ - + @@ -709,7 +709,7 @@ - + @@ -744,7 +744,7 @@ - + @@ -755,7 +755,7 @@ - + @@ -768,7 +768,7 @@ - + @@ -781,7 +781,7 @@ - + @@ -795,7 +795,7 @@ - + @@ -829,7 +829,7 @@ - + @@ -894,7 +894,7 @@ - + @@ -927,7 +927,7 @@ - + @@ -938,7 +938,7 @@ - + @@ -949,7 +949,7 @@ - + @@ -962,7 +962,7 @@ - + @@ -975,7 +975,7 @@ - + @@ -986,7 +986,7 @@ - + @@ -997,7 +997,7 @@ - + @@ -1008,7 +1008,7 @@ - + @@ -1021,7 +1021,7 @@ - + @@ -1034,7 +1034,7 @@ - + @@ -1047,7 +1047,7 @@ - + @@ -1060,7 +1060,7 @@ - + @@ -1071,7 +1071,7 @@ - + @@ -1084,7 +1084,7 @@ - + @@ -1097,7 +1097,7 @@ - + @@ -1108,7 +1108,7 @@ - + @@ -1119,7 +1119,7 @@ - + @@ -1132,7 +1132,7 @@ - + @@ -1143,7 +1143,7 @@ - + @@ -1154,7 +1154,7 @@ - + @@ -1167,7 +1167,7 @@ - + @@ -1180,7 +1180,7 @@ - + @@ -1193,7 +1193,7 @@ - + @@ -1206,7 +1206,7 @@ - + @@ -1219,7 +1219,7 @@ - + @@ -1230,7 +1230,7 @@ - + @@ -1243,7 +1243,7 @@ - + @@ -1256,7 +1256,7 @@ - + @@ -1269,7 +1269,7 @@ - + @@ -1283,7 +1283,7 @@ - + @@ -1298,7 +1298,7 @@ - + @@ -1315,7 +1315,7 @@ - + @@ -1332,7 +1332,7 @@ - + @@ -1349,7 +1349,7 @@ - + @@ -1364,7 +1364,7 @@ - + @@ -1403,7 +1403,7 @@ - + @@ -1432,7 +1432,7 @@ - + @@ -1527,7 +1527,7 @@ - + @@ -3191,7 +3191,7 @@ - + @@ -3219,7 +3219,7 @@ - + @@ -3238,11 +3238,11 @@ - + - + @@ -3252,7 +3252,7 @@ - + @@ -3262,11 +3262,11 @@ - + - + @@ -3276,7 +3276,7 @@ - + @@ -3286,7 +3286,7 @@ - + @@ -3296,7 +3296,7 @@ - + @@ -3320,7 +3320,7 @@ - + @@ -3338,7 +3338,7 @@ - + @@ -3350,7 +3350,7 @@ - + @@ -3362,7 +3362,7 @@ - + @@ -3370,11 +3370,11 @@ - + - + @@ -3397,7 +3397,7 @@ - + @@ -3423,7 +3423,7 @@ - + @@ -3444,7 +3444,7 @@ - + @@ -3474,7 +3474,7 @@ - + @@ -3488,7 +3488,7 @@ - + @@ -3515,7 +3515,7 @@ - + @@ -3554,7 +3554,7 @@ - + From 7510572b694a4ba4e030e75baaa3f43e1606c19f Mon Sep 17 00:00:00 2001 From: Randolph Settgast Date: Fri, 25 Apr 2025 21:20:59 -0700 Subject: [PATCH 07/19] revert python packages path --- src/CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index bcdaa1dac10..d9c175fec20 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -220,8 +220,8 @@ install( FILES ${CMAKE_BINARY_DIR}/schema.xsd ################################ # Add python environment setup ################################ -message(WARNING "Temporarily changing the geosPythonBranch to cusini/remove-relative-paths") -set(GEOS_PYTHON_PACKAGES_BRANCH "cusini/remove-relative-paths" CACHE STRING "" FORCE) +#message(WARNING "Temporarily changing the geosPythonBranch to cusini/remove-relative-paths") +#set(GEOS_PYTHON_PACKAGES_BRANCH "cusini/remove-relative-paths" CACHE STRING "" FORCE) if ( Python3_EXECUTABLE ) From d100cd26cd00b070250e30018d96018bd90f8863 Mon Sep 17 00:00:00 2001 From: Randolph Settgast Date: Fri, 25 Apr 2025 23:24:57 -0700 Subject: [PATCH 08/19] uncrustify --- .../unitTests/meshTests/testVTKImport.cpp | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/src/coreComponents/unitTests/meshTests/testVTKImport.cpp b/src/coreComponents/unitTests/meshTests/testVTKImport.cpp index 7b5035fd653..b435a0729f2 100644 --- a/src/coreComponents/unitTests/meshTests/testVTKImport.cpp +++ b/src/coreComponents/unitTests/meshTests/testVTKImport.cpp @@ -411,18 +411,18 @@ TEST( VTKImport, cube ) }; std::set< string > const meshFiles{ //"cube.vtk", - "cube_STRUCTURED_POINTS.vtk", - "cube_RECTILINEAR_GRID.vtk", - "cube_STRUCTURED_GRID.vtk", - "cube_UNSTRUCTURED_GRID.vtk", - "cube.vtu", - //"cube.pvtu", - "cube.vts", - "cube.pvts", - "cube.vtr", - "cube.pvtr", - "cube.vti", - "cube.pvti" }; + "cube_STRUCTURED_POINTS.vtk", + "cube_RECTILINEAR_GRID.vtk", + "cube_STRUCTURED_GRID.vtk", + "cube_UNSTRUCTURED_GRID.vtk", + "cube.vtu", + //"cube.pvtu", + "cube.vts", + "cube.pvts", + "cube.vtr", + "cube.pvtr", + "cube.vti", + "cube.pvti" }; for( string const & meshFile: meshFiles ) { TestMeshImport( testMeshDir + "/" + meshFile, validate ); From 13b74f34fbb1a98dac95f755618e5ab9f887d9af Mon Sep 17 00:00:00 2001 From: Randolph Settgast Date: Sun, 27 Apr 2025 01:04:23 -0700 Subject: [PATCH 09/19] add script to diff restart files that have different partitions --- scripts/parallelRestartDiff.py | 317 +++++++++++++++++++++++++++++++++ 1 file changed, 317 insertions(+) create mode 100644 scripts/parallelRestartDiff.py diff --git a/scripts/parallelRestartDiff.py b/scripts/parallelRestartDiff.py new file mode 100644 index 00000000000..710dee93e7e --- /dev/null +++ b/scripts/parallelRestartDiff.py @@ -0,0 +1,317 @@ +import h5py +import numpy as np +import glob +import os + +def read_and_aggregate_hdf5_series(file_pattern, paths_to_read, global_index_path, coord_path): + """ + Reads a series of HDF5 files (one per rank), aggregates into a unified 2D array: + [globalIndex, x, y, z, field1, field2, ...] + """ + + # Expand ~ and glob files + file_pattern = os.path.expanduser(file_pattern) + file_list = sorted(glob.glob(file_pattern)) + if not file_list: + raise RuntimeError(f"No files matched pattern: {file_pattern}") + + print(f"[INFO] Found {len(file_list)} files matching {file_pattern}") + for file_name in file_list: + print(f"[INFO] Loading file: {file_name}") + + # Initialize storage + all_global_indices = [] + all_coords = [] + all_fields = {path: [] for path in paths_to_read} + + # Loop over all files + for file_name in file_list: + with h5py.File(file_name, 'r') as f: + + # --- Global Indices --- + if global_index_path not in f: + raise ValueError(f"Global index group {global_index_path} not found in {file_name}") + + global_group = f[global_index_path] + if '__values__' not in global_group: + raise ValueError(f"__values__ dataset not found inside global index group {global_index_path}") + + global_dataset = global_group['__values__'] + global_indices = np.asarray(global_dataset) + all_global_indices.append(global_indices) + + + # Reshape if needed (usually 1D, but safer to be general) + if '__dimensions__' in global_dataset.attrs: + dims = global_dataset.attrs['__dimensions__'] + global_indices = global_indices.reshape(dims) + elif global_indices.ndim != 1: + global_indices = global_indices.reshape((-1,)) + + + # --- Coordinates --- + if coord_path not in f: + raise ValueError(f"Coordinate path {coord_path} not found in {file_name}") + coord_group = f[coord_path] + if '__values__' not in coord_group: + raise ValueError(f"__values__ dataset not found under {coord_path} in {file_name}") + coords_dataset = coord_group['__values__'] + coords = np.asarray(coords_dataset) + + # Try reshaping properly + if '__dimensions__' in coords_dataset.attrs: + dims = coords_dataset.attrs['__dimensions__'] + coords = coords.reshape(dims) + elif '__dimensions__' in coord_group.attrs: + dims = coord_group.attrs['__dimensions__'] + coords = coords.reshape(dims) + elif coords.ndim == 1: + coords = coords.reshape((-1, 3)) + if coords.shape[1] != 3: + raise ValueError(f"Coordinates should have shape (N,3) but got {coords.shape}") + + all_coords.append(coords) + + # --- Fields --- + for path in paths_to_read: + if path not in f: + raise ValueError(f"Field group {path} not found in {file_name}") + + group = f[path] + if '__values__' not in group: + raise ValueError(f"__values__ dataset not found inside group {path} in {file_name}") + + dataset = group['__values__'] + field_data = np.asarray(dataset) + + # Try reshaping properly + if '__dimensions__' in dataset.attrs: + dims = dataset.attrs['__dimensions__'] + field_data = field_data.reshape(dims) + elif field_data.ndim == 1: + field_data = field_data.reshape((-1,)) # probably 1D fields like pressure, saturation + + all_fields[path].append(field_data) + + + # --- Concatenate all ranks --- + all_global_indices = np.concatenate(all_global_indices, axis=0) + all_coords = np.concatenate(all_coords, axis=0) + for path in all_fields: + all_fields[path] = np.concatenate(all_fields[path], axis=0) + + # --- Sort by global index --- + sort_order = np.argsort(all_global_indices) + all_global_indices = all_global_indices[sort_order] + all_coords = all_coords[sort_order] + for path in all_fields: + all_fields[path] = all_fields[path][sort_order] + + # --- Assemble final array --- + columns = [all_global_indices[:, np.newaxis], # (N,1) + all_coords] # (N,3) + for path in paths_to_read: + columns.append(all_fields[path][:, np.newaxis]) # (N,1) + + final_array = np.hstack(columns) + + print(f"[INFO] Aggregated final array shape: {final_array.shape}") + + return final_array + +def print_aggregated_table(array, field_names, num_rows=10): + """ + Pretty-prints an aggregated array with headers. + + Parameters: + - array (np.ndarray): The 2D numpy array to print + - field_names (list of str): List of column names + - num_rows (int): Number of rows to print (default: 10) + """ + + if array.shape[1] != len(field_names): + raise ValueError(f"Mismatch: array has {array.shape[1]} columns but {len(field_names)} field names provided.") + + # Print header + header_line = " | ".join(f"{name:^12}" for name in field_names) + print(header_line) + print("-" * len(header_line)) + + # Print each row + for row in array[:num_rows]: + row_items = [] + for i, value in enumerate(row): + if i == 0: + row_items.append(f"{int(value):12d}") # globalIndex as integer + else: + row_items.append(f"{value:12.5e}") # floating-point for others + print(" | ".join(row_items)) + + +def print_aggregated_diff_table(array1, array2, field_names, tolerance=1e-8, num_rows=None): + """ + Pretty-prints a side-by-side comparison of two aggregated arrays. + + Parameters: + - array1, array2 (np.ndarray): Aggregated arrays to compare + - field_names (list of str): List of column names + - tolerance (float): Coordinate comparison tolerance + - num_rows (int or None): Number of rows to print (default: all) + """ + + if array1.shape[1] != len(field_names) or array2.shape[1] != len(field_names): + raise ValueError("Mismatch between array shape and number of field names.") + + # Build lookup by globalIndex + map1 = {int(row[0]): row for row in array1} + map2 = {int(row[0]): row for row in array2} + + # Find union of all globalIndices + all_indices = sorted(set(map1.keys()).union(map2.keys())) + + if num_rows is None: + num_rows = len(all_indices) + + # Print headers + header = f"{'globalIndex':>12} | {'x1':>12} | {'y1':>12} | {'z1':>12} | {'x2':>12} | {'y2':>12} | {'z2':>12} | {'coord_match':^12}" + for field in field_names[4:]: # Skip globalIndex, x, y, z + header += f" | {field + '_1':>12} | {field + '_2':>12} | {field + '_Δ':>12}" + print(header) + print("-" * len(header)) + + # Print rows + for idx in all_indices[:num_rows]: + row1 = map1.get(idx) + row2 = map2.get(idx) + + if row1 is None: + print(f"{idx:12d} | {'(missing)':>12} | {'(missing)':>12} | {'(missing)':>12} | {row2[1]:12.5e} | {row2[2]:12.5e} | {row2[3]:12.5e} | {'MISSING 1':^12}") + continue + if row2 is None: + print(f"{idx:12d} | {row1[1]:12.5e} | {row1[2]:12.5e} | {row1[3]:12.5e} | {'(missing)':>12} | {'(missing)':>12} | {'(missing)':>12} | {'MISSING 2':^12}") + continue + + # Compare coordinates + coord_diff = np.linalg.norm(row1[1:4] - row2[1:4]) + coord_match = "OK" if coord_diff < tolerance else "MISMATCH" + + line = f"{idx:12d} |" + for i in range(1, 4): + line += f" {row1[i]:12.5e} |" + for i in range(1, 4): + line += f" {row2[i]:12.5e} |" + line += f" {coord_match:^12}" + + # Compare fields + for i in range(4, len(field_names)): + val1 = row1[i] + val2 = row2[i] + delta = val2 - val1 + line += f" | {val1:12.5e} | {val2:12.5e} | {delta:12.5e}" + + print(line) + +def summarize_aggregated_diff(array1, array2, field_names, coord_tolerance=1e-8, field_tolerance=1e-8): + """ + Summarizes differences between two aggregated arrays with scaled tolerances. + + Parameters: + - array1, array2 (np.ndarray): Aggregated arrays + - field_names (list of str): List of column names + - coord_tolerance (float): Relative tolerance for coordinates (default 1e-8) + - field_tolerance (float): Relative tolerance for fields (default 1e-8) + + Returns: + - dict: summary counts + """ + + if array1.shape[1] != len(field_names) or array2.shape[1] != len(field_names): + raise ValueError("Mismatch between array shape and field names length.") + + # Build maps by globalIndex + map1 = {int(row[0]): row for row in array1} + map2 = {int(row[0]): row for row in array2} + + all_indices = sorted(set(map1.keys()).union(map2.keys())) + + # Compute maximum norm of coordinates + coords1 = array1[:, 1:4] + coords2 = array2[:, 1:4] + max_coord_norm = max(np.max(np.linalg.norm(coords1, axis=1)), + np.max(np.linalg.norm(coords2, axis=1))) + if max_coord_norm == 0.0: + max_coord_norm = 1.0 # prevent division by zero + + # Compute maximum absolute value for each field + field_max_abs = [] + for i in range(4, len(field_names)): + max1 = np.max(np.abs(array1[:, i])) if array1.shape[0] > 0 else 0.0 + max2 = np.max(np.abs(array2[:, i])) if array2.shape[0] > 0 else 0.0 + field_max_abs.append(max(max1, max2) or 1.0) # fallback to 1.0 to avoid division by zero + + # Initialize counters + missing_in_1 = 0 + missing_in_2 = 0 + coord_mismatches = 0 + field_mismatches = 0 + + # Now check all rows + for idx in all_indices: + row1 = map1.get(idx) + row2 = map2.get(idx) + + if row1 is None: + missing_in_1 += 1 + continue + if row2 is None: + missing_in_2 += 1 + continue + + # Check coordinates + coord_diff = np.linalg.norm(row1[1:4] - row2[1:4]) + if coord_diff > coord_tolerance * max_coord_norm: + coord_mismatches += 1 + + # Check fields + for i in range(4, len(field_names)): + val1 = row1[i] + val2 = row2[i] + delta = abs(val2 - val1) + max_val = field_max_abs[i-4] + if delta > field_tolerance * max_val: + field_mismatches += 1 + + return { + "total_indices": len(all_indices), + "missing_in_1": missing_in_1, + "missing_in_2": missing_in_2, + "coord_mismatches": coord_mismatches, + "field_mismatches": field_mismatches, + "max_coord_norm": max_coord_norm, + "field_max_abs": field_max_abs + } + + + +# Example usage: +if __name__ == "__main__": + file_pattern1 = "~/Downloads/baseline_integratedTests-pr3624-11053-ae011c7/singlePhaseFlow/incompressible_pebi3d_02/0to1_restart_000000001/rank_000000*.hdf5" + file_pattern2 = "~/Downloads/baseline_integratedTests-pr3626-11174-d100cd2/singlePhaseFlow/incompressible_pebi3d_02/0to1_restart_000000001/rank_000000*.hdf5" + paths_to_compare = ["/Problem/domain/MeshBodies/mesh/meshLevels/Level0/ElementRegions/elementRegionsGroup/Domain/elementSubRegions/pentagonalPrisms/pressure"] + global_index_path = "/Problem/domain/MeshBodies/mesh/meshLevels/Level0/ElementRegions/elementRegionsGroup/Domain/elementSubRegions/pentagonalPrisms/localToGlobalMap" # or None + coord_path = "/Problem/domain/MeshBodies/mesh/meshLevels/Level0/ElementRegions/elementRegionsGroup/Domain/elementSubRegions/pentagonalPrisms/elementCenter" # fallback + + aggregated1 = read_and_aggregate_hdf5_series(file_pattern1, paths_to_compare, global_index_path, coord_path) + aggregated2 = read_and_aggregate_hdf5_series(file_pattern2, paths_to_compare, global_index_path, coord_path) + + # Suppose you have: + field_names = ["globalIndex", "x", "y", "z", "pressure"] + +# print_aggregated_diff_table(aggregated1, aggregated2, field_names) + + summary = summarize_aggregated_diff(aggregated1, aggregated2, field_names) + + print("\nSummary of Differences:") + for key, value in summary.items(): + print(f"{key:>20}: {value}") + From 414f5d3f44cd529a4efa9865a34295244e4bbb7d Mon Sep 17 00:00:00 2001 From: Randolph Settgast Date: Sun, 27 Apr 2025 15:40:59 -0700 Subject: [PATCH 10/19] checking script works...with hardcoded paths --- scripts/parallelRestartDiff.py | 606 ++++++++++++++++++--------------- src/coreComponents/LvArray | 2 +- 2 files changed, 329 insertions(+), 279 deletions(-) diff --git a/scripts/parallelRestartDiff.py b/scripts/parallelRestartDiff.py index 710dee93e7e..c2184f7216a 100644 --- a/scripts/parallelRestartDiff.py +++ b/scripts/parallelRestartDiff.py @@ -2,316 +2,366 @@ import numpy as np import glob import os - -def read_and_aggregate_hdf5_series(file_pattern, paths_to_read, global_index_path, coord_path): +import sys +import itertools +import re + +# ------------------------------ +# Utilities for wildcard expansion +# ------------------------------ +def expand_field_paths_per_object(file_name, patterns): """ - Reads a series of HDF5 files (one per rank), aggregates into a unified 2D array: - [globalIndex, x, y, z, field1, field2, ...] + Expand wildcard patterns and group by base path. """ - - # Expand ~ and glob files + expanded = {} + with h5py.File(file_name, 'r') as f: + for pattern in patterns: + tokens = [] + pos = 0 + for match in re.finditer(r'\[([^]]+)\]', pattern): + tokens.append(pattern[pos:match.start()]) + options = match.group(1).split(',') + tokens.append(options) + pos = match.end() + tokens.append(pattern[pos:]) + option_lists = [t if isinstance(t, list) else [t] for t in tokens] + for combination in itertools.product(*option_lists): + full_path = ''.join(combination) + if full_path in f: + base_path = extract_base_path(full_path) + field_name = full_path.split('/')[-1] + expanded.setdefault(base_path, []).append(field_name) + print(f"[INFO] Expanded {sum(len(v) for v in expanded.values())} fields over {len(expanded)} objects.") + return expanded + + +def extract_base_path(field_path): + return '/'.join(field_path.split('/')[:-1]) + +# ------------------------------ +# Read and Aggregate +# ------------------------------ +def read_and_aggregate_hdf5_series(file_pattern, paths_to_read): file_pattern = os.path.expanduser(file_pattern) file_list = sorted(glob.glob(file_pattern)) if not file_list: raise RuntimeError(f"No files matched pattern: {file_pattern}") print(f"[INFO] Found {len(file_list)} files matching {file_pattern}") - for file_name in file_list: - print(f"[INFO] Loading file: {file_name}") - - # Initialize storage - all_global_indices = [] - all_coords = [] - all_fields = {path: [] for path in paths_to_read} - - # Loop over all files - for file_name in file_list: - with h5py.File(file_name, 'r') as f: - - # --- Global Indices --- - if global_index_path not in f: - raise ValueError(f"Global index group {global_index_path} not found in {file_name}") - - global_group = f[global_index_path] - if '__values__' not in global_group: - raise ValueError(f"__values__ dataset not found inside global index group {global_index_path}") - - global_dataset = global_group['__values__'] - global_indices = np.asarray(global_dataset) - all_global_indices.append(global_indices) - - - # Reshape if needed (usually 1D, but safer to be general) - if '__dimensions__' in global_dataset.attrs: - dims = global_dataset.attrs['__dimensions__'] - global_indices = global_indices.reshape(dims) - elif global_indices.ndim != 1: - global_indices = global_indices.reshape((-1,)) - - - # --- Coordinates --- - if coord_path not in f: - raise ValueError(f"Coordinate path {coord_path} not found in {file_name}") - coord_group = f[coord_path] - if '__values__' not in coord_group: - raise ValueError(f"__values__ dataset not found under {coord_path} in {file_name}") - coords_dataset = coord_group['__values__'] - coords = np.asarray(coords_dataset) - - # Try reshaping properly - if '__dimensions__' in coords_dataset.attrs: - dims = coords_dataset.attrs['__dimensions__'] - coords = coords.reshape(dims) - elif '__dimensions__' in coord_group.attrs: - dims = coord_group.attrs['__dimensions__'] - coords = coords.reshape(dims) - elif coords.ndim == 1: - coords = coords.reshape((-1, 3)) - if coords.shape[1] != 3: - raise ValueError(f"Coordinates should have shape (N,3) but got {coords.shape}") - - all_coords.append(coords) - - # --- Fields --- - for path in paths_to_read: - if path not in f: - raise ValueError(f"Field group {path} not found in {file_name}") - - group = f[path] - if '__values__' not in group: - raise ValueError(f"__values__ dataset not found inside group {path} in {file_name}") - - dataset = group['__values__'] - field_data = np.asarray(dataset) - # Try reshaping properly + aggregated_data = {} + + for base_path, field_list in paths_to_read.items(): + print(f"[INFO] Processing base path: {base_path}") + print(f"[INFO] Fields: {field_list}") + all_rows = [] + for file_name in file_list: + print(f"[INFO] Loading file: {file_name}") + with h5py.File(file_name, 'r') as f: + global_index_path = f"{base_path}/localToGlobalMap" + print(f"[INFO] Global index path: {global_index_path}") + coord_path = f"{base_path}/elementCenter" + + # Global Indices + group = f[global_index_path] + dataset = group['__values__'] + global_indices = np.asarray(dataset) if '__dimensions__' in dataset.attrs: dims = dataset.attrs['__dimensions__'] - field_data = field_data.reshape(dims) - elif field_data.ndim == 1: - field_data = field_data.reshape((-1,)) # probably 1D fields like pressure, saturation - - all_fields[path].append(field_data) - - - # --- Concatenate all ranks --- - all_global_indices = np.concatenate(all_global_indices, axis=0) - all_coords = np.concatenate(all_coords, axis=0) - for path in all_fields: - all_fields[path] = np.concatenate(all_fields[path], axis=0) + global_indices = global_indices.reshape(dims) + elif global_indices.ndim != 1: + global_indices = global_indices.reshape((-1,)) - # --- Sort by global index --- - sort_order = np.argsort(all_global_indices) - all_global_indices = all_global_indices[sort_order] - all_coords = all_coords[sort_order] - for path in all_fields: - all_fields[path] = all_fields[path][sort_order] - - # --- Assemble final array --- - columns = [all_global_indices[:, np.newaxis], # (N,1) - all_coords] # (N,3) - for path in paths_to_read: - columns.append(all_fields[path][:, np.newaxis]) # (N,1) - - final_array = np.hstack(columns) - - print(f"[INFO] Aggregated final array shape: {final_array.shape}") - - return final_array - -def print_aggregated_table(array, field_names, num_rows=10): - """ - Pretty-prints an aggregated array with headers. - - Parameters: - - array (np.ndarray): The 2D numpy array to print - - field_names (list of str): List of column names - - num_rows (int): Number of rows to print (default: 10) - """ - - if array.shape[1] != len(field_names): - raise ValueError(f"Mismatch: array has {array.shape[1]} columns but {len(field_names)} field names provided.") - - # Print header - header_line = " | ".join(f"{name:^12}" for name in field_names) - print(header_line) - print("-" * len(header_line)) - - # Print each row - for row in array[:num_rows]: - row_items = [] - for i, value in enumerate(row): - if i == 0: - row_items.append(f"{int(value):12d}") # globalIndex as integer - else: - row_items.append(f"{value:12.5e}") # floating-point for others - print(" | ".join(row_items)) - - -def print_aggregated_diff_table(array1, array2, field_names, tolerance=1e-8, num_rows=None): + # Coordinates + group = f[coord_path] + dataset = group['__values__'] + coords = np.asarray(dataset) + if '__dimensions__' in dataset.attrs: + dims = dataset.attrs['__dimensions__'] + coords = coords.reshape(dims) + elif coords.ndim == 1: + coords = coords.reshape((-1, 3)) + if coords.shape[1] != 3: + raise ValueError(f"Coordinates should have shape (N,3) but got {coords.shape}") + + # Fields + field_datas = [] + for path in field_list: + field_path = f"{base_path}/{path}" + group = f[field_path] + dataset = group['__values__'] + field_data = np.asarray(dataset) + if '__dimensions__' in dataset.attrs: + dims = dataset.attrs['__dimensions__'] + field_data = field_data.reshape(dims) + elif field_data.ndim == 1: + field_data = field_data.reshape((-1,)) + field_datas.append(field_data) + + # Assemble Rows + num_entries = global_indices.shape[0] + for i in range(num_entries): + row = [global_indices[i]] + list(coords[i]) + for field_data in field_datas: + if field_data.ndim == 1: + row.append(field_data[i]) + else: + row.extend(field_data[i]) + all_rows.append(row) + + all_rows = np.array(all_rows) + sort_order = np.argsort(all_rows[:, 0]) + aggregated_data[base_path] = all_rows[sort_order] + + print(f"[INFO] Aggregated {len(aggregated_data)} object groups.") + return aggregated_data + +# ------------------------------ +# Field Name Generation +# ------------------------------ +def generate_field_names_per_object(file_name, base_path_to_fields): """ - Pretty-prints a side-by-side comparison of two aggregated arrays. - - Parameters: - - array1, array2 (np.ndarray): Aggregated arrays to compare - - field_names (list of str): List of column names - - tolerance (float): Coordinate comparison tolerance - - num_rows (int or None): Number of rows to print (default: all) + Generate field names per object for the table headers. """ - - if array1.shape[1] != len(field_names) or array2.shape[1] != len(field_names): - raise ValueError("Mismatch between array shape and number of field names.") - - # Build lookup by globalIndex - map1 = {int(row[0]): row for row in array1} - map2 = {int(row[0]): row for row in array2} - - # Find union of all globalIndices - all_indices = sorted(set(map1.keys()).union(map2.keys())) - - if num_rows is None: - num_rows = len(all_indices) - - # Print headers - header = f"{'globalIndex':>12} | {'x1':>12} | {'y1':>12} | {'z1':>12} | {'x2':>12} | {'y2':>12} | {'z2':>12} | {'coord_match':^12}" - for field in field_names[4:]: # Skip globalIndex, x, y, z - header += f" | {field + '_1':>12} | {field + '_2':>12} | {field + '_Δ':>12}" - print(header) - print("-" * len(header)) - - # Print rows - for idx in all_indices[:num_rows]: - row1 = map1.get(idx) - row2 = map2.get(idx) - - if row1 is None: - print(f"{idx:12d} | {'(missing)':>12} | {'(missing)':>12} | {'(missing)':>12} | {row2[1]:12.5e} | {row2[2]:12.5e} | {row2[3]:12.5e} | {'MISSING 1':^12}") + field_names_per_object = {} + with h5py.File(file_name, 'r') as f: + for base_path, fields in base_path_to_fields.items(): + field_names = ["globalIndex", "x", "y", "z"] + for field in fields: + full_path = f"{base_path}/{field}" + group = f[full_path] + dataset = group['__values__'] + if '__dimensions__' in dataset.attrs: + dims = dataset.attrs['__dimensions__'] + else: + dims = dataset.shape + if len(dims) == 1 or dims[1] == 1: + field_names.append(field) + else: + field_names.extend([f"{field}_{i}" for i in range(dims[1])]) + field_names_per_object[base_path] = field_names + return field_names_per_object + + +# ------------------------------ +# Printing Utilities +# ------------------------------ +def print_aggregated_table(aggregated_data, field_names_per_object, num_rows=None): + for base_path, array in aggregated_data.items(): + field_names = field_names_per_object.get(base_path) + if field_names is None: + raise ValueError(f"No field names available for {base_path}.") + + print(f"\n[INFO] Object: {base_path} ({array.shape[0]} entries)") + + if array.shape[1] != len(field_names): + raise ValueError(f"Mismatch between array shape and field names for {base_path}.") + + rows_to_print = array.shape[0] if num_rows is None else min(array.shape[0], num_rows) + header = " | ".join(f"{name:^12}" for name in field_names) + print(header) + print("-" * len(header)) + + for row in array[:rows_to_print]: + row_items = [] + for i, value in enumerate(row): + if i == 0: + row_items.append(f"{int(value):12d}") + else: + row_items.append(f"{value:12.5e}") + print(" | ".join(row_items)) + + + +def print_aggregated_diff_table(aggregated1, aggregated2, field_names_per_object, coord_tolerance=1e-8, num_rows=None): + all_keys = sorted(set(aggregated1.keys()).union(aggregated2.keys())) + for base_path in all_keys: + print(f"\n[DIFF] Object: {base_path}") + array1 = aggregated1.get(base_path) + array2 = aggregated2.get(base_path) + + if array1 is None: + print("[WARN] Missing in dataset 1.") continue - if row2 is None: - print(f"{idx:12d} | {row1[1]:12.5e} | {row1[2]:12.5e} | {row1[3]:12.5e} | {'(missing)':>12} | {'(missing)':>12} | {'(missing)':>12} | {'MISSING 2':^12}") + if array2 is None: + print("[WARN] Missing in dataset 2.") continue - # Compare coordinates - coord_diff = np.linalg.norm(row1[1:4] - row2[1:4]) - coord_match = "OK" if coord_diff < tolerance else "MISMATCH" + field_names = field_names_per_object.get(base_path) + if field_names is None: + raise ValueError(f"No field names available for {base_path}.") + + if array1.shape[1] != len(field_names) or array2.shape[1] != len(field_names): + raise ValueError(f"Mismatch between array shape and field names for {base_path}.") + + map1 = {int(row[0]): row for row in array1} + map2 = {int(row[0]): row for row in array2} + all_indices = sorted(set(map1.keys()).union(map2.keys())) + rows_to_print = len(all_indices) if num_rows is None else min(len(all_indices), num_rows) + + header = f"{'globalIndex':>12} | {'x1':>12} | {'y1':>12} | {'z1':>12} | {'x2':>12} | {'y2':>12} | {'z2':>12} | {'coord_match':^12}" + for field in field_names[4:]: + header += f" | {field + '_1':>12} | {field + '_2':>12} | {field + '_Δ':>12}" + print(header) + print("-" * len(header)) + + for idx in all_indices[:rows_to_print]: + row1 = map1.get(idx) + row2 = map2.get(idx) + + if row1 is None or row2 is None: + print(f"{idx:12d} | {'MISSING'}") + continue + + coord_diff = np.linalg.norm(row1[1:4] - row2[1:4]) + coord_match = "OK" if coord_diff < coord_tolerance else "MISMATCH" + + line = f"{idx:12d} |" + for i in range(1, 4): + line += f" {row1[i]:12.5e} |" + for i in range(1, 4): + line += f" {row2[i]:12.5e} |" + line += f" {coord_match:^12}" + + for i in range(4, len(field_names)): + val1 = row1[i] + val2 = row2[i] + delta = val2 - val1 + line += f" | {val1:12.5e} | {val2:12.5e} | {delta:12.5e}" + print(line) + + +# ------------------------------ +# Summarizing and Pass/Fail +# ------------------------------ +def summarize_aggregated_diff(aggregated1, aggregated2, field_names_per_object, coord_tolerance=1e-8, field_tolerance=1e-8): + all_keys = sorted(set(aggregated1.keys()).union(aggregated2.keys())) + overall_summary = {} + for base_path in all_keys: + array1 = aggregated1.get(base_path) + array2 = aggregated2.get(base_path) + + if array1 is None or array2 is None: + continue - line = f"{idx:12d} |" - for i in range(1, 4): - line += f" {row1[i]:12.5e} |" - for i in range(1, 4): - line += f" {row2[i]:12.5e} |" - line += f" {coord_match:^12}" + field_names = field_names_per_object.get(base_path) + if field_names is None: + raise ValueError(f"No field names available for {base_path}.") - # Compare fields - for i in range(4, len(field_names)): - val1 = row1[i] - val2 = row2[i] - delta = val2 - val1 - line += f" | {val1:12.5e} | {val2:12.5e} | {delta:12.5e}" + if array1.shape[1] != len(field_names) or array2.shape[1] != len(field_names): + raise ValueError(f"Mismatch between array shape and field names for {base_path}.") - print(line) + map1 = {int(row[0]): row for row in array1} + map2 = {int(row[0]): row for row in array2} + all_indices = sorted(set(map1.keys()).union(map2.keys())) -def summarize_aggregated_diff(array1, array2, field_names, coord_tolerance=1e-8, field_tolerance=1e-8): - """ - Summarizes differences between two aggregated arrays with scaled tolerances. + coords1 = array1[:, 1:4] + coords2 = array2[:, 1:4] + max_coord_norm = max(np.max(np.linalg.norm(coords1, axis=1)), + np.max(np.linalg.norm(coords2, axis=1))) + if max_coord_norm == 0.0: + max_coord_norm = 1.0 - Parameters: - - array1, array2 (np.ndarray): Aggregated arrays - - field_names (list of str): List of column names - - coord_tolerance (float): Relative tolerance for coordinates (default 1e-8) - - field_tolerance (float): Relative tolerance for fields (default 1e-8) - - Returns: - - dict: summary counts - """ + field_max_abs = [] + for i in range(4, len(field_names)): + max1 = np.max(np.abs(array1[:, i])) if array1.shape[0] > 0 else 0.0 + max2 = np.max(np.abs(array2[:, i])) if array2.shape[0] > 0 else 0.0 + field_max_abs.append(max(max1, max2) or 1.0) + + missing_in_1 = missing_in_2 = coord_mismatches = field_mismatches = 0 + for idx in all_indices: + row1 = map1.get(idx) + row2 = map2.get(idx) + if row1 is None: + missing_in_1 += 1 + continue + if row2 is None: + missing_in_2 += 1 + continue + coord_diff = np.linalg.norm(row1[1:4] - row2[1:4]) + if coord_diff > coord_tolerance * max_coord_norm: + coord_mismatches += 1 + for i in range(4, len(field_names)): + val1, val2 = row1[i], row2[i] + delta = abs(val2 - val1) + if delta > field_tolerance * field_max_abs[i-4]: + field_mismatches += 1 + + overall_summary[base_path] = { + "total_indices": len(all_indices), + "missing_in_1": missing_in_1, + "missing_in_2": missing_in_2, + "coord_mismatches": coord_mismatches, + "field_mismatches": field_mismatches, + "max_coord_norm": max_coord_norm, + "field_max_abs": field_max_abs + } + + return overall_summary + + +def check_pass_fail(overall_summary): + overall_pass = True + for base_path, summary in overall_summary.items(): + print(f"\n[CHECK] Object: {base_path}") + fail = False + if summary['missing_in_1']: + print(f"[FAIL] missing_in_1: {summary['missing_in_1']}") + fail = True + if summary['missing_in_2']: + print(f"[FAIL] missing_in_2: {summary['missing_in_2']}") + fail = True + if summary['coord_mismatches']: + print(f"[FAIL] coord_mismatches: {summary['coord_mismatches']}") + fail = True + if summary['field_mismatches']: + print(f"[FAIL] field_mismatches: {summary['field_mismatches']}") + fail = True + if not fail: + print("[PASS] No mismatches found.") + else: + overall_pass = False + + return overall_pass - if array1.shape[1] != len(field_names) or array2.shape[1] != len(field_names): - raise ValueError("Mismatch between array shape and field names length.") - - # Build maps by globalIndex - map1 = {int(row[0]): row for row in array1} - map2 = {int(row[0]): row for row in array2} - - all_indices = sorted(set(map1.keys()).union(map2.keys())) - - # Compute maximum norm of coordinates - coords1 = array1[:, 1:4] - coords2 = array2[:, 1:4] - max_coord_norm = max(np.max(np.linalg.norm(coords1, axis=1)), - np.max(np.linalg.norm(coords2, axis=1))) - if max_coord_norm == 0.0: - max_coord_norm = 1.0 # prevent division by zero - - # Compute maximum absolute value for each field - field_max_abs = [] - for i in range(4, len(field_names)): - max1 = np.max(np.abs(array1[:, i])) if array1.shape[0] > 0 else 0.0 - max2 = np.max(np.abs(array2[:, i])) if array2.shape[0] > 0 else 0.0 - field_max_abs.append(max(max1, max2) or 1.0) # fallback to 1.0 to avoid division by zero - - # Initialize counters - missing_in_1 = 0 - missing_in_2 = 0 - coord_mismatches = 0 - field_mismatches = 0 - - # Now check all rows - for idx in all_indices: - row1 = map1.get(idx) - row2 = map2.get(idx) - - if row1 is None: - missing_in_1 += 1 - continue - if row2 is None: - missing_in_2 += 1 - continue - # Check coordinates - coord_diff = np.linalg.norm(row1[1:4] - row2[1:4]) - if coord_diff > coord_tolerance * max_coord_norm: - coord_mismatches += 1 - # Check fields - for i in range(4, len(field_names)): - val1 = row1[i] - val2 = row2[i] - delta = abs(val2 - val1) - max_val = field_max_abs[i-4] - if delta > field_tolerance * max_val: - field_mismatches += 1 - - return { - "total_indices": len(all_indices), - "missing_in_1": missing_in_1, - "missing_in_2": missing_in_2, - "coord_mismatches": coord_mismatches, - "field_mismatches": field_mismatches, - "max_coord_norm": max_coord_norm, - "field_max_abs": field_max_abs - } - - - -# Example usage: if __name__ == "__main__": file_pattern1 = "~/Downloads/baseline_integratedTests-pr3624-11053-ae011c7/singlePhaseFlow/incompressible_pebi3d_02/0to1_restart_000000001/rank_000000*.hdf5" file_pattern2 = "~/Downloads/baseline_integratedTests-pr3626-11174-d100cd2/singlePhaseFlow/incompressible_pebi3d_02/0to1_restart_000000001/rank_000000*.hdf5" - paths_to_compare = ["/Problem/domain/MeshBodies/mesh/meshLevels/Level0/ElementRegions/elementRegionsGroup/Domain/elementSubRegions/pentagonalPrisms/pressure"] - global_index_path = "/Problem/domain/MeshBodies/mesh/meshLevels/Level0/ElementRegions/elementRegionsGroup/Domain/elementSubRegions/pentagonalPrisms/localToGlobalMap" # or None - coord_path = "/Problem/domain/MeshBodies/mesh/meshLevels/Level0/ElementRegions/elementRegionsGroup/Domain/elementSubRegions/pentagonalPrisms/elementCenter" # fallback - aggregated1 = read_and_aggregate_hdf5_series(file_pattern1, paths_to_compare, global_index_path, coord_path) - aggregated2 = read_and_aggregate_hdf5_series(file_pattern2, paths_to_compare, global_index_path, coord_path) + raw_patterns = [ + "/Problem/domain/MeshBodies/mesh/meshLevels/Level0/ElementRegions/elementRegionsGroup/Domain/elementSubRegions/[hexahedra,hexagonalPrisms]/[pressure,temperature]" + ] - # Suppose you have: - field_names = ["globalIndex", "x", "y", "z", "pressure"] + one_example_file = glob.glob(os.path.expanduser(file_pattern1))[0] -# print_aggregated_diff_table(aggregated1, aggregated2, field_names) + base_path_to_fields = expand_field_paths_per_object(one_example_file, raw_patterns) - summary = summarize_aggregated_diff(aggregated1, aggregated2, field_names) + print("\nExpanded base_path_to_fields:") + for base_path, fields in base_path_to_fields.items(): + print(f" {base_path} -> {fields}") + + field_names_per_object = generate_field_names_per_object(one_example_file, base_path_to_fields) + + aggregated1 = read_and_aggregate_hdf5_series(file_pattern1, base_path_to_fields) + aggregated2 = read_and_aggregate_hdf5_series(file_pattern2, base_path_to_fields) + + print_aggregated_diff_table(aggregated1, aggregated2, field_names_per_object) + + overall_summary = summarize_aggregated_diff(aggregated1, aggregated2, field_names_per_object) print("\nSummary of Differences:") - for key, value in summary.items(): - print(f"{key:>20}: {value}") + for base_path, summary in overall_summary.items(): + print(f"\n[Summary for Object: {base_path}]") + for key, value in summary.items(): + if isinstance(value, list): + for field, val in zip(field_names_per_object[base_path][4:], value): + print(f" Max abs {field:>15}: {val:.5e}") + else: + print(f"{key:>20}: {value}") + + passed = check_pass_fail(overall_summary) + if not passed: + sys.exit(1) diff --git a/src/coreComponents/LvArray b/src/coreComponents/LvArray index e848125162b..f49ffcc4b19 160000 --- a/src/coreComponents/LvArray +++ b/src/coreComponents/LvArray @@ -1 +1 @@ -Subproject commit e848125162b5b6af76d2dd40c8cfa7fd6ee18cbe +Subproject commit f49ffcc4b196da07a38b97091b90127304223e6d From 60aa1134147a48f8282bd188da33740e305dcd2f Mon Sep 17 00:00:00 2001 From: Randolph Settgast Date: Sun, 27 Apr 2025 15:43:32 -0700 Subject: [PATCH 11/19] checking script works...with hardcoded paths --- scripts/parallelRestartDiff.py | 73 ++++++++++++++++++---------------- 1 file changed, 38 insertions(+), 35 deletions(-) diff --git a/scripts/parallelRestartDiff.py b/scripts/parallelRestartDiff.py index c2184f7216a..cdc234d32fb 100644 --- a/scripts/parallelRestartDiff.py +++ b/scripts/parallelRestartDiff.py @@ -172,32 +172,44 @@ def print_aggregated_table(aggregated_data, field_names_per_object, num_rows=Non print(" | ".join(row_items)) +def prepare_arrays_for_comparison(aggregated1, aggregated2, field_names_per_object, base_path): + """ + Validates and prepares arrays and field names for comparison for a given object path. + """ + array1 = aggregated1.get(base_path) + array2 = aggregated2.get(base_path) + + if array1 is None or array2 is None: + return None, None, None, None, None # Missing object in one dataset + + field_names = field_names_per_object.get(base_path) + if field_names is None: + raise ValueError(f"No field names available for {base_path}.") + + if array1.shape[1] != len(field_names) or array2.shape[1] != len(field_names): + raise ValueError(f"Mismatch between array shape and field names for {base_path}.") + + map1 = {int(row[0]): row for row in array1} + map2 = {int(row[0]): row for row in array2} + all_indices = sorted(set(map1.keys()).union(map2.keys())) + + return array1, array2, field_names, map1, map2 + def print_aggregated_diff_table(aggregated1, aggregated2, field_names_per_object, coord_tolerance=1e-8, num_rows=None): all_keys = sorted(set(aggregated1.keys()).union(aggregated2.keys())) for base_path in all_keys: print(f"\n[DIFF] Object: {base_path}") - array1 = aggregated1.get(base_path) - array2 = aggregated2.get(base_path) - - if array1 is None: - print("[WARN] Missing in dataset 1.") - continue - if array2 is None: - print("[WARN] Missing in dataset 2.") - continue - field_names = field_names_per_object.get(base_path) - if field_names is None: - raise ValueError(f"No field names available for {base_path}.") + array1, array2, field_names, map1, map2 = prepare_arrays_for_comparison( + aggregated1, aggregated2, field_names_per_object, base_path + ) - if array1.shape[1] != len(field_names) or array2.shape[1] != len(field_names): - raise ValueError(f"Mismatch between array shape and field names for {base_path}.") + if array1 is None or array2 is None: + print("[WARN] Missing dataset.") + continue - map1 = {int(row[0]): row for row in array1} - map2 = {int(row[0]): row for row in array2} - all_indices = sorted(set(map1.keys()).union(map2.keys())) - rows_to_print = len(all_indices) if num_rows is None else min(len(all_indices), num_rows) + rows_to_print = len(map1) if num_rows is None else min(len(map1), num_rows) header = f"{'globalIndex':>12} | {'x1':>12} | {'y1':>12} | {'z1':>12} | {'x2':>12} | {'y2':>12} | {'z2':>12} | {'coord_match':^12}" for field in field_names[4:]: @@ -205,7 +217,7 @@ def print_aggregated_diff_table(aggregated1, aggregated2, field_names_per_object print(header) print("-" * len(header)) - for idx in all_indices[:rows_to_print]: + for idx in sorted(map1.keys())[:rows_to_print]: row1 = map1.get(idx) row2 = map2.get(idx) @@ -222,7 +234,6 @@ def print_aggregated_diff_table(aggregated1, aggregated2, field_names_per_object for i in range(1, 4): line += f" {row2[i]:12.5e} |" line += f" {coord_match:^12}" - for i in range(4, len(field_names)): val1 = row1[i] val2 = row2[i] @@ -231,6 +242,7 @@ def print_aggregated_diff_table(aggregated1, aggregated2, field_names_per_object print(line) + # ------------------------------ # Summarizing and Pass/Fail # ------------------------------ @@ -238,23 +250,13 @@ def summarize_aggregated_diff(aggregated1, aggregated2, field_names_per_object, all_keys = sorted(set(aggregated1.keys()).union(aggregated2.keys())) overall_summary = {} for base_path in all_keys: - array1 = aggregated1.get(base_path) - array2 = aggregated2.get(base_path) + array1, array2, field_names, map1, map2 = prepare_arrays_for_comparison( + aggregated1, aggregated2, field_names_per_object, base_path + ) if array1 is None or array2 is None: continue - field_names = field_names_per_object.get(base_path) - if field_names is None: - raise ValueError(f"No field names available for {base_path}.") - - if array1.shape[1] != len(field_names) or array2.shape[1] != len(field_names): - raise ValueError(f"Mismatch between array shape and field names for {base_path}.") - - map1 = {int(row[0]): row for row in array1} - map2 = {int(row[0]): row for row in array2} - all_indices = sorted(set(map1.keys()).union(map2.keys())) - coords1 = array1[:, 1:4] coords2 = array2[:, 1:4] max_coord_norm = max(np.max(np.linalg.norm(coords1, axis=1)), @@ -269,7 +271,7 @@ def summarize_aggregated_diff(aggregated1, aggregated2, field_names_per_object, field_max_abs.append(max(max1, max2) or 1.0) missing_in_1 = missing_in_2 = coord_mismatches = field_mismatches = 0 - for idx in all_indices: + for idx in sorted(set(map1.keys()).union(map2.keys())): row1 = map1.get(idx) row2 = map2.get(idx) if row1 is None: @@ -288,7 +290,7 @@ def summarize_aggregated_diff(aggregated1, aggregated2, field_names_per_object, field_mismatches += 1 overall_summary[base_path] = { - "total_indices": len(all_indices), + "total_indices": len(map1), "missing_in_1": missing_in_1, "missing_in_2": missing_in_2, "coord_mismatches": coord_mismatches, @@ -300,6 +302,7 @@ def summarize_aggregated_diff(aggregated1, aggregated2, field_names_per_object, return overall_summary + def check_pass_fail(overall_summary): overall_pass = True for base_path, summary in overall_summary.items(): From 038a2c5352c309f7a9d5b60c13712361704c916e Mon Sep 17 00:00:00 2001 From: Randolph Settgast Date: Sun, 27 Apr 2025 15:58:16 -0700 Subject: [PATCH 12/19] checking script works...with hardcoded paths --- scripts/parallelRestartDiff.py | 94 +++++++++++++++++++++------------- 1 file changed, 58 insertions(+), 36 deletions(-) diff --git a/scripts/parallelRestartDiff.py b/scripts/parallelRestartDiff.py index cdc234d32fb..5aeea611894 100644 --- a/scripts/parallelRestartDiff.py +++ b/scripts/parallelRestartDiff.py @@ -172,44 +172,34 @@ def print_aggregated_table(aggregated_data, field_names_per_object, num_rows=Non print(" | ".join(row_items)) -def prepare_arrays_for_comparison(aggregated1, aggregated2, field_names_per_object, base_path): - """ - Validates and prepares arrays and field names for comparison for a given object path. - """ - array1 = aggregated1.get(base_path) - array2 = aggregated2.get(base_path) - - if array1 is None or array2 is None: - return None, None, None, None, None # Missing object in one dataset - - field_names = field_names_per_object.get(base_path) - if field_names is None: - raise ValueError(f"No field names available for {base_path}.") - - if array1.shape[1] != len(field_names) or array2.shape[1] != len(field_names): - raise ValueError(f"Mismatch between array shape and field names for {base_path}.") - - map1 = {int(row[0]): row for row in array1} - map2 = {int(row[0]): row for row in array2} - all_indices = sorted(set(map1.keys()).union(map2.keys())) - return array1, array2, field_names, map1, map2 def print_aggregated_diff_table(aggregated1, aggregated2, field_names_per_object, coord_tolerance=1e-8, num_rows=None): all_keys = sorted(set(aggregated1.keys()).union(aggregated2.keys())) for base_path in all_keys: print(f"\n[DIFF] Object: {base_path}") + array1 = aggregated1.get(base_path) + array2 = aggregated2.get(base_path) + field_names = field_names_per_object.get(base_path) - array1, array2, field_names, map1, map2 = prepare_arrays_for_comparison( - aggregated1, aggregated2, field_names_per_object, base_path - ) - - if array1 is None or array2 is None: - print("[WARN] Missing dataset.") + if array1 is None and array2 is None: + print("[WARN] Missing in BOTH datasets.") + continue + if array1 is None: + print("[WARN] Missing in dataset 1. No comparison possible.") continue + if array2 is None: + print("[WARN] Missing in dataset 2. No comparison possible.") + continue + + if array1.shape[1] != len(field_names) or array2.shape[1] != len(field_names): + raise ValueError(f"Mismatch between array shape and field names for {base_path}.") - rows_to_print = len(map1) if num_rows is None else min(len(map1), num_rows) + map1 = {int(row[0]): row for row in array1} + map2 = {int(row[0]): row for row in array2} + all_indices = sorted(set(map1.keys()).union(map2.keys())) + rows_to_print = len(all_indices) if num_rows is None else min(len(all_indices), num_rows) header = f"{'globalIndex':>12} | {'x1':>12} | {'y1':>12} | {'z1':>12} | {'x2':>12} | {'y2':>12} | {'z2':>12} | {'coord_match':^12}" for field in field_names[4:]: @@ -217,12 +207,12 @@ def print_aggregated_diff_table(aggregated1, aggregated2, field_names_per_object print(header) print("-" * len(header)) - for idx in sorted(map1.keys())[:rows_to_print]: + for idx in all_indices[:rows_to_print]: row1 = map1.get(idx) row2 = map2.get(idx) if row1 is None or row2 is None: - print(f"{idx:12d} | {'MISSING'}") + print(f"{idx:12d} | {'MISSING':>12}") continue coord_diff = np.linalg.norm(row1[1:4] - row2[1:4]) @@ -234,6 +224,7 @@ def print_aggregated_diff_table(aggregated1, aggregated2, field_names_per_object for i in range(1, 4): line += f" {row2[i]:12.5e} |" line += f" {coord_match:^12}" + for i in range(4, len(field_names)): val1 = row1[i] val2 = row2[i] @@ -243,20 +234,50 @@ def print_aggregated_diff_table(aggregated1, aggregated2, field_names_per_object + # ------------------------------ # Summarizing and Pass/Fail # ------------------------------ def summarize_aggregated_diff(aggregated1, aggregated2, field_names_per_object, coord_tolerance=1e-8, field_tolerance=1e-8): all_keys = sorted(set(aggregated1.keys()).union(aggregated2.keys())) overall_summary = {} + for base_path in all_keys: - array1, array2, field_names, map1, map2 = prepare_arrays_for_comparison( - aggregated1, aggregated2, field_names_per_object, base_path - ) + array1 = aggregated1.get(base_path) + array2 = aggregated2.get(base_path) + field_names = field_names_per_object.get(base_path) - if array1 is None or array2 is None: + if array1 is None: + overall_summary[base_path] = { + "total_indices": 0, + "missing_in_1": 1, + "missing_in_2": 0, + "coord_mismatches": 0, + "field_mismatches": 0, + "max_coord_norm": 0.0, + "field_max_abs": [] + } continue + if array2 is None: + overall_summary[base_path] = { + "total_indices": 0, + "missing_in_1": 0, + "missing_in_2": 1, + "coord_mismatches": 0, + "field_mismatches": 0, + "max_coord_norm": 0.0, + "field_max_abs": [] + } + continue + + if array1.shape[1] != len(field_names) or array2.shape[1] != len(field_names): + raise ValueError(f"Mismatch between array shape and field names for {base_path}.") + + map1 = {int(row[0]): row for row in array1} + map2 = {int(row[0]): row for row in array2} + all_indices = sorted(set(map1.keys()).union(map2.keys())) + coords1 = array1[:, 1:4] coords2 = array2[:, 1:4] max_coord_norm = max(np.max(np.linalg.norm(coords1, axis=1)), @@ -271,7 +292,7 @@ def summarize_aggregated_diff(aggregated1, aggregated2, field_names_per_object, field_max_abs.append(max(max1, max2) or 1.0) missing_in_1 = missing_in_2 = coord_mismatches = field_mismatches = 0 - for idx in sorted(set(map1.keys()).union(map2.keys())): + for idx in all_indices: row1 = map1.get(idx) row2 = map2.get(idx) if row1 is None: @@ -290,7 +311,7 @@ def summarize_aggregated_diff(aggregated1, aggregated2, field_names_per_object, field_mismatches += 1 overall_summary[base_path] = { - "total_indices": len(map1), + "total_indices": len(all_indices), "missing_in_1": missing_in_1, "missing_in_2": missing_in_2, "coord_mismatches": coord_mismatches, @@ -303,6 +324,7 @@ def summarize_aggregated_diff(aggregated1, aggregated2, field_names_per_object, + def check_pass_fail(overall_summary): overall_pass = True for base_path, summary in overall_summary.items(): From 53c9adbad4e79425bcfd98b51244d1d4daa2b1af Mon Sep 17 00:00:00 2001 From: Randolph Settgast Date: Sun, 27 Apr 2025 16:04:22 -0700 Subject: [PATCH 13/19] take command line arguments --- scripts/parallelRestartDiff.py | 24 +++++++++++++++--------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/scripts/parallelRestartDiff.py b/scripts/parallelRestartDiff.py index 5aeea611894..68b3ca0e048 100644 --- a/scripts/parallelRestartDiff.py +++ b/scripts/parallelRestartDiff.py @@ -5,6 +5,7 @@ import sys import itertools import re +import argparse # ------------------------------ # Utilities for wildcard expansion @@ -352,16 +353,21 @@ def check_pass_fail(overall_summary): if __name__ == "__main__": - file_pattern1 = "~/Downloads/baseline_integratedTests-pr3624-11053-ae011c7/singlePhaseFlow/incompressible_pebi3d_02/0to1_restart_000000001/rank_000000*.hdf5" - file_pattern2 = "~/Downloads/baseline_integratedTests-pr3626-11174-d100cd2/singlePhaseFlow/incompressible_pebi3d_02/0to1_restart_000000001/rank_000000*.hdf5" + parser = argparse.ArgumentParser(description="Compare two sets of parallel HDF5 restart files.") - raw_patterns = [ - "/Problem/domain/MeshBodies/mesh/meshLevels/Level0/ElementRegions/elementRegionsGroup/Domain/elementSubRegions/[hexahedra,hexagonalPrisms]/[pressure,temperature]" - ] + parser.add_argument("--baseline", required=True, help="path to baseline (e.g., '~/Downloads/old/rank_*.hdf5')") + parser.add_argument("--restart", required=True, help="path to restart (e.g., '~/Downloads/new/rank_*.hdf5')") + parser.add_argument("--fields", required=True, action="append", help="Field paths with optional wildcards (can specify multiple).") - one_example_file = glob.glob(os.path.expanduser(file_pattern1))[0] + args = parser.parse_args() - base_path_to_fields = expand_field_paths_per_object(one_example_file, raw_patterns) + baseline_file_pattern = args.baseline + restart_file_pattern = args.restart + raw_field_patterns = args.fields + + one_example_file = glob.glob(os.path.expanduser(baseline_file_pattern))[0] + + base_path_to_fields = expand_field_paths_per_object(one_example_file, raw_field_patterns) print("\nExpanded base_path_to_fields:") for base_path, fields in base_path_to_fields.items(): @@ -369,8 +375,8 @@ def check_pass_fail(overall_summary): field_names_per_object = generate_field_names_per_object(one_example_file, base_path_to_fields) - aggregated1 = read_and_aggregate_hdf5_series(file_pattern1, base_path_to_fields) - aggregated2 = read_and_aggregate_hdf5_series(file_pattern2, base_path_to_fields) + aggregated1 = read_and_aggregate_hdf5_series(baseline_file_pattern, base_path_to_fields) + aggregated2 = read_and_aggregate_hdf5_series(restart_file_pattern, base_path_to_fields) print_aggregated_diff_table(aggregated1, aggregated2, field_names_per_object) From c8e88334522d5f4e0bc39f539aac044758c57865 Mon Sep 17 00:00:00 2001 From: Randolph Settgast Date: Sun, 27 Apr 2025 20:46:46 -0700 Subject: [PATCH 14/19] script works with scalar+vector --- scripts/parallelRestartDiff.py | 82 ++++++++++++++++++++++++++-------- 1 file changed, 64 insertions(+), 18 deletions(-) diff --git a/scripts/parallelRestartDiff.py b/scripts/parallelRestartDiff.py index 68b3ca0e048..9f71c84bb64 100644 --- a/scripts/parallelRestartDiff.py +++ b/scripts/parallelRestartDiff.py @@ -13,25 +13,38 @@ def expand_field_paths_per_object(file_name, patterns): """ Expand wildcard patterns and group by base path. + Raise an error if any specified pattern does not match anything. """ expanded = {} with h5py.File(file_name, 'r') as f: for pattern in patterns: tokens = [] pos = 0 + has_wildcard = False for match in re.finditer(r'\[([^]]+)\]', pattern): + has_wildcard = True tokens.append(pattern[pos:match.start()]) options = match.group(1).split(',') tokens.append(options) pos = match.end() tokens.append(pattern[pos:]) option_lists = [t if isinstance(t, list) else [t] for t in tokens] + + matched_any = False for combination in itertools.product(*option_lists): full_path = ''.join(combination) if full_path in f: base_path = extract_base_path(full_path) field_name = full_path.split('/')[-1] expanded.setdefault(base_path, []).append(field_name) + matched_any = True + + if not matched_any: + if has_wildcard: + raise ValueError(f"No fields matched pattern: {pattern}") + else: + raise ValueError(f"Specified field path not found in HDF5: {pattern}") + print(f"[INFO] Expanded {sum(len(v) for v in expanded.values())} fields over {len(expanded)} objects.") return expanded @@ -42,26 +55,36 @@ def extract_base_path(field_path): # ------------------------------ # Read and Aggregate # ------------------------------ +def infer_coord_dataset_name(base_path): + """ + Infer the coordinate dataset name based on the container object name. + """ + container = base_path.split('/')[-1] + if container.endswith('nodeManager'): + return 'ReferencePosition' + elif container.endswith('FaceManager'): + return 'faceCenter' + elif container.endswith('EdgeManager'): + return 'edgeCenter' + else: + return 'elementCenter' + + def read_and_aggregate_hdf5_series(file_pattern, paths_to_read): file_pattern = os.path.expanduser(file_pattern) file_list = sorted(glob.glob(file_pattern)) if not file_list: raise RuntimeError(f"No files matched pattern: {file_pattern}") - print(f"[INFO] Found {len(file_list)} files matching {file_pattern}") - aggregated_data = {} for base_path, field_list in paths_to_read.items(): - print(f"[INFO] Processing base path: {base_path}") - print(f"[INFO] Fields: {field_list}") all_rows = [] for file_name in file_list: - print(f"[INFO] Loading file: {file_name}") with h5py.File(file_name, 'r') as f: global_index_path = f"{base_path}/localToGlobalMap" - print(f"[INFO] Global index path: {global_index_path}") - coord_path = f"{base_path}/elementCenter" + coord_dataset_name = infer_coord_dataset_name(base_path) + coord_path = f"{base_path}/{coord_dataset_name}" # Global Indices group = f[global_index_path] @@ -92,11 +115,16 @@ def read_and_aggregate_hdf5_series(file_pattern, paths_to_read): group = f[field_path] dataset = group['__values__'] field_data = np.asarray(dataset) - if '__dimensions__' in dataset.attrs: - dims = dataset.attrs['__dimensions__'] + + if '__dimensions__' in group: + dims = np.asarray(group['__dimensions__']) field_data = field_data.reshape(dims) + print(f"[INFO] Reshaping field data {field_path} to {dims}") elif field_data.ndim == 1: field_data = field_data.reshape((-1,)) + else: + raise ValueError(f"Unsupported data shape for {field_path}: {field_data.shape}") + field_datas.append(field_data) # Assemble Rows @@ -104,12 +132,15 @@ def read_and_aggregate_hdf5_series(file_pattern, paths_to_read): for i in range(num_entries): row = [global_indices[i]] + list(coords[i]) for field_data in field_datas: - if field_data.ndim == 1: + if field_data.ndim == 1 or (field_data.shape[1] == 1): + # scalar field row.append(field_data[i]) else: + # vector/tensor field row.extend(field_data[i]) all_rows.append(row) + all_rows = np.array(all_rows) sort_order = np.argsort(all_rows[:, 0]) aggregated_data[base_path] = all_rows[sort_order] @@ -117,13 +148,11 @@ def read_and_aggregate_hdf5_series(file_pattern, paths_to_read): print(f"[INFO] Aggregated {len(aggregated_data)} object groups.") return aggregated_data + # ------------------------------ # Field Name Generation # ------------------------------ def generate_field_names_per_object(file_name, base_path_to_fields): - """ - Generate field names per object for the table headers. - """ field_names_per_object = {} with h5py.File(file_name, 'r') as f: for base_path, fields in base_path_to_fields.items(): @@ -132,14 +161,20 @@ def generate_field_names_per_object(file_name, base_path_to_fields): full_path = f"{base_path}/{field}" group = f[full_path] dataset = group['__values__'] - if '__dimensions__' in dataset.attrs: - dims = dataset.attrs['__dimensions__'] + + if '__dimensions__' in group: + dims = np.asarray(group['__dimensions__']) else: dims = dataset.shape - if len(dims) == 1 or dims[1] == 1: + + # Correct handling + if len(dims) == 1: + field_names.append(field) + elif len(dims) == 2 and dims[1] == 1: field_names.append(field) else: field_names.extend([f"{field}_{i}" for i in range(dims[1])]) + field_names_per_object[base_path] = field_names return field_names_per_object @@ -184,6 +219,9 @@ def print_aggregated_diff_table(aggregated1, aggregated2, field_names_per_object array2 = aggregated2.get(base_path) field_names = field_names_per_object.get(base_path) + if field_names is None: + raise ValueError(f"No field names available for {base_path}.") + if array1 is None and array2 is None: print("[WARN] Missing in BOTH datasets.") continue @@ -236,6 +274,7 @@ def print_aggregated_diff_table(aggregated1, aggregated2, field_names_per_object + # ------------------------------ # Summarizing and Pass/Fail # ------------------------------ @@ -248,6 +287,9 @@ def summarize_aggregated_diff(aggregated1, aggregated2, field_names_per_object, array2 = aggregated2.get(base_path) field_names = field_names_per_object.get(base_path) + if field_names is None: + raise ValueError(f"No field names available for {base_path}.") + if array1 is None: overall_summary[base_path] = { "total_indices": 0, @@ -273,6 +315,10 @@ def summarize_aggregated_diff(aggregated1, aggregated2, field_names_per_object, continue if array1.shape[1] != len(field_names) or array2.shape[1] != len(field_names): + print( f"[WARN] array1.shape[1] = {array1.shape[1]}.") + print( f"[WARN] array2.shape[1] = {array2.shape[1]}.") + print( f"[WARN] len(field_names) = {len(field_names)}.") + print( f"[WARN] field_names = {field_names}.") raise ValueError(f"Mismatch between array shape and field names for {base_path}.") map1 = {int(row[0]): row for row in array1} @@ -325,7 +371,6 @@ def summarize_aggregated_diff(aggregated1, aggregated2, field_names_per_object, - def check_pass_fail(overall_summary): overall_pass = True for base_path, summary in overall_summary.items(): @@ -378,7 +423,6 @@ def check_pass_fail(overall_summary): aggregated1 = read_and_aggregate_hdf5_series(baseline_file_pattern, base_path_to_fields) aggregated2 = read_and_aggregate_hdf5_series(restart_file_pattern, base_path_to_fields) - print_aggregated_diff_table(aggregated1, aggregated2, field_names_per_object) overall_summary = summarize_aggregated_diff(aggregated1, aggregated2, field_names_per_object) @@ -394,5 +438,7 @@ def check_pass_fail(overall_summary): passed = check_pass_fail(overall_summary) + if not passed: + print_aggregated_diff_table(aggregated1, aggregated2, field_names_per_object) sys.exit(1) From e3892f1fac148d4b52c707c016bd78d01f97dcd5 Mon Sep 17 00:00:00 2001 From: Randolph Settgast Date: Sun, 27 Apr 2025 20:54:55 -0700 Subject: [PATCH 15/19] use scaling from coords for displacement --- scripts/parallelRestartDiff.py | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/scripts/parallelRestartDiff.py b/scripts/parallelRestartDiff.py index 9f71c84bb64..3d66a67b78e 100644 --- a/scripts/parallelRestartDiff.py +++ b/scripts/parallelRestartDiff.py @@ -100,8 +100,8 @@ def read_and_aggregate_hdf5_series(file_pattern, paths_to_read): group = f[coord_path] dataset = group['__values__'] coords = np.asarray(dataset) - if '__dimensions__' in dataset.attrs: - dims = dataset.attrs['__dimensions__'] + if '__dimensions__' in group: + dims = np.asarray(group['__dimensions__']) coords = coords.reshape(dims) elif coords.ndim == 1: coords = coords.reshape((-1, 3)) @@ -354,9 +354,17 @@ def summarize_aggregated_diff(aggregated1, aggregated2, field_names_per_object, for i in range(4, len(field_names)): val1, val2 = row1[i], row2[i] delta = abs(val2 - val1) - if delta > field_tolerance * field_max_abs[i-4]: + + field_name = field_names[i] + if 'displacement' in field_name.lower(): # special rule for displacement-like fields + scale = max_coord_norm + else: + scale = field_max_abs[i-4] + + if delta > field_tolerance * scale: field_mismatches += 1 + overall_summary[base_path] = { "total_indices": len(all_indices), "missing_in_1": missing_in_1, From 1033e6ef9cd3498c65ac8343813e577312b2efeb Mon Sep 17 00:00:00 2001 From: Randolph Settgast Date: Sun, 27 Apr 2025 20:59:08 -0700 Subject: [PATCH 16/19] revert test --- .../unitTests/meshTests/testVTKImport.cpp | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/src/coreComponents/unitTests/meshTests/testVTKImport.cpp b/src/coreComponents/unitTests/meshTests/testVTKImport.cpp index b435a0729f2..5ca9043b0c3 100644 --- a/src/coreComponents/unitTests/meshTests/testVTKImport.cpp +++ b/src/coreComponents/unitTests/meshTests/testVTKImport.cpp @@ -410,19 +410,19 @@ TEST( VTKImport, cube ) } }; - std::set< string > const meshFiles{ //"cube.vtk", - "cube_STRUCTURED_POINTS.vtk", - "cube_RECTILINEAR_GRID.vtk", - "cube_STRUCTURED_GRID.vtk", - "cube_UNSTRUCTURED_GRID.vtk", - "cube.vtu", - //"cube.pvtu", - "cube.vts", - "cube.pvts", - "cube.vtr", - "cube.pvtr", - "cube.vti", - "cube.pvti" }; + std::set< string > const meshFiles{ "cube.vtk", + "cube_STRUCTURED_POINTS.vtk", + "cube_RECTILINEAR_GRID.vtk", + "cube_STRUCTURED_GRID.vtk", + "cube_UNSTRUCTURED_GRID.vtk", + "cube.vtu", + //"cube.pvtu", + "cube.vts", + "cube.pvts", + "cube.vtr", + "cube.pvtr", + "cube.vti", + "cube.pvti" }; for( string const & meshFile: meshFiles ) { TestMeshImport( testMeshDir + "/" + meshFile, validate ); From eae71115e16e58c531b9e7f673481d0a95d938cf Mon Sep 17 00:00:00 2001 From: Randolph Settgast Date: Mon, 28 Apr 2025 16:19:35 -0700 Subject: [PATCH 17/19] change testVTKImport answers --- src/coreComponents/unitTests/meshTests/testVTKImport.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/coreComponents/unitTests/meshTests/testVTKImport.cpp b/src/coreComponents/unitTests/meshTests/testVTKImport.cpp index 5ca9043b0c3..096d4a8d5f2 100644 --- a/src/coreComponents/unitTests/meshTests/testVTKImport.cpp +++ b/src/coreComponents/unitTests/meshTests/testVTKImport.cpp @@ -370,12 +370,12 @@ TEST( VTKImport, cube ) // The "2" set are all the boundary nodes (64 - 8 inside nodes = 56), // minus an extra node that belongs to regions -1 and 9 only. SortedArray< localIndex > const & nodesRegion2 = cellBlockManager.getNodeSets().at( "2" ); - ASSERT_EQ( nodesRegion2.size(), expectedSwap( 55, { 39, 27 } ) ); + ASSERT_EQ( nodesRegion2.size(), expectedSwap( 55, { 38, 28 } ) ); // Region "9" has only one quad, on the greater `x` direction. // This hex will belong to MPI rank 1. SortedArray< localIndex > const & nodesRegion9 = cellBlockManager.getNodeSets().at( "9" ); - ASSERT_EQ( nodesRegion9.size(), expectedSwap( 4, { 0, 4 } ) ); + ASSERT_EQ( nodesRegion9.size(), expectedSwap( 4, { 4, 0 } ) ); // FIXME How to get the CellBlock as a function of the region, without knowing the naming pattern. // 1 elements type on 3 regions ("-1", "3", "9") = 3 sub-groups @@ -383,7 +383,7 @@ TEST( VTKImport, cube ) { { { "hexahedra", expectedSwap( 1, { 1, 0 } ) }, - { "3_hexahedra", expectedSwap( 25, { 17, 8 } ) }, + { "3_hexahedra", expectedSwap( 25, { 16, 9 } ) }, { "9_hexahedra", expectedSwap( 1, { 0, 1 } ) } } }; @@ -391,6 +391,7 @@ TEST( VTKImport, cube ) for( const auto & nameAndSize : expectedCellBlocks ) { + printf( "Checking cell block %s\n", nameAndSize.first.c_str() ); ASSERT_TRUE( cellBlockManager.getCellBlocks().hasGroup< CellBlockABC >( nameAndSize.first ) ); // here pb From dfa74ce3feba8eaa8adb79e365c1a83160cab7ae Mon Sep 17 00:00:00 2001 From: Randolph Settgast Date: Mon, 28 Apr 2025 17:16:27 -0700 Subject: [PATCH 18/19] swap values in testVTKImport --- src/coreComponents/LvArray | 2 +- src/coreComponents/unitTests/meshTests/testVTKImport.cpp | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/coreComponents/LvArray b/src/coreComponents/LvArray index f49ffcc4b19..e848125162b 160000 --- a/src/coreComponents/LvArray +++ b/src/coreComponents/LvArray @@ -1 +1 @@ -Subproject commit f49ffcc4b196da07a38b97091b90127304223e6d +Subproject commit e848125162b5b6af76d2dd40c8cfa7fd6ee18cbe diff --git a/src/coreComponents/unitTests/meshTests/testVTKImport.cpp b/src/coreComponents/unitTests/meshTests/testVTKImport.cpp index 096d4a8d5f2..c08be4d73ac 100644 --- a/src/coreComponents/unitTests/meshTests/testVTKImport.cpp +++ b/src/coreComponents/unitTests/meshTests/testVTKImport.cpp @@ -384,14 +384,13 @@ TEST( VTKImport, cube ) { { "hexahedra", expectedSwap( 1, { 1, 0 } ) }, { "3_hexahedra", expectedSwap( 25, { 16, 9 } ) }, - { "9_hexahedra", expectedSwap( 1, { 0, 1 } ) } + { "9_hexahedra", expectedSwap( 1, { 1, 0 } ) } } }; ASSERT_EQ( cellBlockManager.getCellBlocks().numSubGroups(), expectedCellBlocks.size() ); for( const auto & nameAndSize : expectedCellBlocks ) { - printf( "Checking cell block %s\n", nameAndSize.first.c_str() ); ASSERT_TRUE( cellBlockManager.getCellBlocks().hasGroup< CellBlockABC >( nameAndSize.first ) ); // here pb From 5fee171e97f4568e8b1de5f2ff1dc40e8b9e37af Mon Sep 17 00:00:00 2001 From: Randolph Settgast Date: Mon, 28 Apr 2025 21:14:32 -0700 Subject: [PATCH 19/19] update baselines --- .integrated_tests.yaml | 2 +- BASELINE_NOTES.md | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.integrated_tests.yaml b/.integrated_tests.yaml index bf7afd893c2..a498d6793e6 100644 --- a/.integrated_tests.yaml +++ b/.integrated_tests.yaml @@ -1,6 +1,6 @@ baselines: bucket: geosx - baseline: integratedTests/baseline_integratedTests-pr3624-11053-ae011c7 + baseline: integratedTests/baseline_integratedTests-pr3626-11189-dfa74ce allow_fail: all: '' diff --git a/BASELINE_NOTES.md b/BASELINE_NOTES.md index a4978e78ce9..654ee07b99c 100644 --- a/BASELINE_NOTES.md +++ b/BASELINE_NOTES.md @@ -6,7 +6,11 @@ This file is designed to track changes to the integrated test baselines. Any developer who updates the baseline ID in the .integrated_tests.yaml file is expected to create an entry in this file with the pull request number, date, and their justification for rebaselining. These notes should be in reverse-chronological order, and use the following time format: (YYYY-MM-DD). -PR #3624 (2025-04-15) +PR #3626 (2025-04-28) +===================== +Update in VTK caused change in partitioning for reading vtk meshes. Verified baselines using new scripts/parallelRestartDiff.py + +PR #3624 (2025-04-15) ===================== Bugfix for time step cut in sequential, minor time step logic change when a cut occurs.