diff --git a/conda/libmesh/meta.yaml b/conda/libmesh/meta.yaml index 117c25003b6b..38157f20c223 100644 --- a/conda/libmesh/meta.yaml +++ b/conda/libmesh/meta.yaml @@ -4,7 +4,7 @@ # # As well as any directions pertaining to modifying those files. # ALSO: Follow the directions in scripts/tests/versioner_hashes.yaml -{% set build = 0 %} +{% set build = 1 %} {% set version = "2026.04.13_0185b8b" %} package: @@ -30,7 +30,7 @@ build: # things that depend on this moose-libmesh must use the # exact moose-petsc and moose-libmesh-vtk that this was # built with - - moose-petsc 3.24.6 {{ mpi }}_0 + - moose-petsc 3.24.6 {{ mpi }}_1 - moose-libmesh-vtk 9.6.1 {{ mpi }}_0 requirements: @@ -45,7 +45,7 @@ requirements: - pkg-config host: - {{ mpi }} {{ mpi_version }} - - moose-petsc 3.24.6 {{ mpi }}_0 + - moose-petsc 3.24.6 {{ mpi }}_1 - moose-libmesh-vtk 9.6.1 {{ mpi }}_0 - _openmp_mutex # [linux] - hdf5 {{ hdf5 }} @@ -58,7 +58,7 @@ requirements: - llvm-openmp # [osx] - zlib run: - - moose-petsc 3.24.6 {{ mpi }}_0 + - moose-petsc 3.24.6 {{ mpi }}_1 - moose-libmesh-vtk 9.6.1 {{ mpi }}_0 test: diff --git a/conda/moose-dev/meta.yaml b/conda/moose-dev/meta.yaml index ca798fc64919..efac21f5d16e 100644 --- a/conda/moose-dev/meta.yaml +++ b/conda/moose-dev/meta.yaml @@ -2,7 +2,7 @@ # REMEMBER TO UPDATE the .yaml files for the following packages: # moose/conda_build_config.yaml # As well as any directions pertaining to modifying those files. -{% set version = "2026.04.21" %} +{% set version = "2026.04.27" %} package: name: moose-dev @@ -20,14 +20,14 @@ build: # things that depend on this moose-dev must use the # exact moose-* packages that this was built with - moose-build 2026.04.21 {{ mpi }} - - moose-libmesh 2026.04.13_0185b8b {{ mpi }}_0 + - moose-libmesh 2026.04.13_0185b8b {{ mpi }}_1 - moose-wasp 2025.09.19_02960f1 build_6 - moose-tools 2026.04.21 requirements: run: - moose-build 2026.04.21 {{ mpi }} - - moose-libmesh 2026.04.13_0185b8b {{ mpi }}_0 + - moose-libmesh 2026.04.13_0185b8b {{ mpi }}_1 - moose-wasp 2025.09.19_02960f1 build_6 - moose-tools 2026.04.21 run_constrained: diff --git a/conda/moose/meta.yaml b/conda/moose/meta.yaml index f47e86ddcbbe..5792e04a354d 100644 --- a/conda/moose/meta.yaml +++ b/conda/moose/meta.yaml @@ -29,7 +29,7 @@ requirements: - {{ compiler('fortran') }} - {{ stdlib('c') }} # for libmesh libtool - - moose-libmesh 2026.04.13_0185b8b {{ mpi }}_0 + - moose-libmesh 2026.04.13_0185b8b {{ mpi }}_1 # build utilities - make - packaging @@ -46,12 +46,12 @@ requirements: - libfabric {{ libfabric }} # [linux] {% endif %} - libpng - - moose-libmesh 2026.04.13_0185b8b {{ mpi }}_0 + - moose-libmesh 2026.04.13_0185b8b {{ mpi }}_1 - moose-wasp 2025.09.19_02960f1 build_6 - zlib run: - {{ mpi }} {{ mpi_version }} - - moose-libmesh 2026.04.13_0185b8b {{ mpi }}_0 + - moose-libmesh 2026.04.13_0185b8b {{ mpi }}_1 - moose-wasp 2025.09.19_02960f1 build_6 # c++ compiler for jit - gxx_linux-64 {{ cxx_compiler_version }}.* # [linux] diff --git a/conda/petsc/build.sh b/conda/petsc/build.sh index bfc2021d5ccf..cf7ea612f7b3 100755 --- a/conda/petsc/build.sh +++ b/conda/petsc/build.sh @@ -103,7 +103,14 @@ done # Strip GCC runtime libs on mac if [[ $(uname) == Darwin ]]; then echo "Stripping GCC runtime libs" - sed -i '' 's/-lemutls_w//g; s/-lheapt_w//g; s/-lgcc_s\.1[^ ]*//g' "$PREFIX"/lib/pkgconfig/PETSc.pc "$PREFIX"/lib/petsc/conf/petscvariables + sed -i '' 's/-lemutls_w//g; s/-lheapt_w//g; s/-lgcc_s\.1[^ ]*//g' \ + "$PREFIX"/lib/pkgconfig/PETSc.pc \ + "$PREFIX"/lib/petsc/conf/petscvariables \ + "$PREFIX"/lib/cmake/scalapack-*/scalapack-targets.cmake + # scalapack-targets.cmake also embeds absolute paths from the CI build machine + # that conda relocation doesn't reach; strip any -rpath/-L not under $PREFIX + perl -i -pe "s|-Wl,-rpath,(?!\Q${PREFIX}\E)\S+||g; s|-L(?!\Q${PREFIX}\E)/\S+||g" \ + "$PREFIX"/lib/cmake/scalapack-*/scalapack-targets.cmake fi echo "Removing example files" diff --git a/conda/petsc/meta.yaml b/conda/petsc/meta.yaml index 575c71c1456d..6c087f349267 100644 --- a/conda/petsc/meta.yaml +++ b/conda/petsc/meta.yaml @@ -7,7 +7,7 @@ # # As well as any directions pertaining to modifying those files. # ALSO: Follow the directions in scripts/tests/versioner_hashes.yaml -{% set build = 0 %} +{% set build = 1 %} {% set version = "3.24.6" %} package: diff --git a/scripts/tests/versioner_hashes.yaml b/scripts/tests/versioner_hashes.yaml index d3a73b016bf9..d196bfeeb1f6 100644 --- a/scripts/tests/versioner_hashes.yaml +++ b/scripts/tests/versioner_hashes.yaml @@ -1764,3 +1764,37 @@ d41b47a41b7edac3875e308fb77df6069de32269: # 32404 wasp: full_version: 2025.09.19_02960f1_5 hash: 9ce59ea +da772997f54eb4330d1a7d4b7c8f3e51666318a7: # 32846 + build: + full_version: 2026.04.21 + hash: ae2c988 + libmesh: + full_version: 2026.04.13_0185b8b_1 + hash: 016c380 + libmesh-vtk: + full_version: 9.6.1_0 + hash: de4f8ad + moose-dev: + full_version: 2026.04.27 + hash: 78704f0 + mpi: + full_version: 2026.04.21 + hash: f6f315e + petsc: + full_version: 3.24.6_1 + hash: e8cacaf + pprof: + full_version: 2026.03.01_a15ffb7 + hash: '4869696' + pyhit: + full_version: 2026.04.21 + hash: 1528d6d + seacas: + full_version: 2025.10.14_3 + hash: 2115cf6 + tools: + full_version: 2026.04.21 + hash: eef89ae + wasp: + full_version: 2025.09.19_02960f1_6 + hash: 4b8a7ec diff --git a/scripts/versioner.yaml b/scripts/versioner.yaml index 576e52e09305..779dd484702a 100644 --- a/scripts/versioner.yaml +++ b/scripts/versioner.yaml @@ -44,7 +44,7 @@ packages: # dependers: libmesh, moose-dev petsc: version: 3.24.6 - build_number: 0 + build_number: 1 conda: conda/petsc templates: conda/petsc/meta.yaml.template: conda/petsc/meta.yaml @@ -63,7 +63,7 @@ packages: # dependers: moose-dev libmesh: version: 2026.04.13_0185b8b - build_number: 0 + build_number: 1 conda: conda/libmesh templates: conda/libmesh/meta.yaml.template: conda/libmesh/meta.yaml @@ -111,7 +111,7 @@ packages: conda/pyhit/meta.yaml.template: conda/pyhit/meta.yaml # dependers: none moose-dev: - version: 2026.04.21 + version: 2026.04.27 conda: conda/moose-dev templates: conda/moose-dev/meta.yaml.template: conda/moose-dev/meta.yaml