Skip to content

Commit 28f8bef

Browse files
loganharbourloganharbour
authored
Merge pull request #32404 from lindsayad/fix-cuda-typo
Update packages: mpi, petsc, libmesh, mfem, code-server; fix openblas; download umpire
2 parents d0387f5 + 2b78e40 commit 28f8bef

41 files changed

Lines changed: 321 additions & 100 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎apptainer/moose-dev.def‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ Fingerprints: 0CFFCAB55E806363601C442D211817B01E0911DB
125125
export MOOSE_JOBS={{ MOOSE_JOBS }}
126126

127127
# Pinned versions
128-
CODE_SERVER_VERSION=4.109.2
128+
CODE_SERVER_VERSION=4.109.5
129129
{% if PROFILING is defined %}
130130
GPERFTOOLS_VERSION=2.18
131131
GO_VERSION=1.26.0
@@ -234,16 +234,13 @@ Fingerprints: 0CFFCAB55E806363601C442D211817B01E0911DB
234234
source activate ${MINIFORGE_DIR}/envs/${PYTORCH_CONDA_ENV}
235235
pip3 install --no-cache -r ${PYTORCH_DIR}/requirements.txt
236236

237-
# Need BLAS and LAPACK libs for torch in neml2
238-
dnf install -y openblas-devel
239-
240237
# Require CUDA if we have cuda available
241238
if [ -n "$CUDA_DIR" ]; then
242239
# 7.0 V100 (sawtooth), 8.0 A100 (hoodoo), 8.6 A2 (milangpubuild), 8.9 L4 (rod, cone)
243240
export TORCH_CUDA_ARCH_LIST="7.0;8.0;8.6;8.9"
244-
BUILD_PYTORCH_FLAGS+=("-DUSA_CUDA:BOOL=ON" "-DCUDA_TOOLKIT_ROOT_DIR=${CUDA_DIR}")
241+
BUILD_PYTORCH_FLAGS+=("-DUSE_CUDA:BOOL=ON" "-DCUDA_TOOLKIT_ROOT_DIR=${CUDA_DIR}")
245242
else
246-
BUILD_PYTORCH_FLAGS+=("-DUSA_CUDA:BOOL=OFF")
243+
BUILD_PYTORCH_FLAGS+=("-DUSE_CUDA:BOOL=OFF")
247244
fi
248245
# Build and install pytorch
249246
mkdir -p $LIBTORCH_DIR/logs
@@ -255,6 +252,8 @@ Fingerprints: 0CFFCAB55E806363601C442D211817B01E0911DB
255252
-DCMAKE_BUILD_TYPE:STRING=Release \
256253
-DCMAKE_INSTALL_PREFIX:PATH=${LIBTORCH_DIR} \
257254
-DBUILD_PYTHON:BOOL=OFF \
255+
-DCMAKE_INCLUDE_PATH:PATH=${PETSC_DIR}/include \
256+
-DCMAKE_LIBRARY_PATH:PATH=${PETSC_DIR}/lib \
258257
-DUSE_BLAS:BOOL=ON \
259258
-DBLAS:STRING=OpenBLAS \
260259
-DUSE_LAPACK:BOOL=ON \

‎apptainer/mpi.def‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,19 +10,19 @@
1010

1111
Bootstrap: docker
1212
{%- if ALTERNATE_FROM == "clang" %}
13-
From: ghcr.io/idaholab/moose-mpibase/rocky:8.10-clang20.1.8-mpich5.0.0_0
13+
From: ghcr.io/idaholab/moose-mpibase/rocky:8.10-clang20.1.8-mpich5.0.0_2026.03.09
1414
{%- elif ALTERNATE_FROM == "clang_min" %}
15-
From: ghcr.io/idaholab/moose-mpibase/rocky:8.10-clang14.0.6-mpich5.0.0_0
15+
From: ghcr.io/idaholab/moose-mpibase/rocky:8.10-clang14.0.6-mpich5.0.0_2026.03.09
1616
{%- elif ALTERNATE_FROM == "cuda" %}
17-
From: ghcr.io/idaholab/moose-mpibase/rocky:8.10-cuda12.9.1-gcc13.3.1-mpich5.0.0-openmpi5.0.9
17+
From: ghcr.io/idaholab/moose-mpibase/rocky:8.10-cuda12.9.1-gcc13.3.1-mpich5.0.0-openmpi5.0.10_2026.03.09
1818
{%- elif ALTERNATE_FROM == "gcc_min" %}
19-
From: ghcr.io/idaholab/moose-mpibase/rocky:8.10-gcc9.2.1-mpich5.0.0_0
19+
From: ghcr.io/idaholab/moose-mpibase/rocky:8.10-gcc9.2.1-mpich5.0.0_2026.03.09
2020
{%- elif ALTERNATE_FROM == "intel" %}
21-
From: ghcr.io/idaholab/moose-mpibase/rocky:8.10-oneapi2025.3.2-mpich4.3.2_0
21+
From: ghcr.io/idaholab/moose-mpibase/rocky:8.10-oneapi2025.3.2-mpich4.3.2_2026.03.09
2222
{%- elif ALTERNATE_FROM == "rocky9" %}
23-
From: ghcr.io/idaholab/moose-mpibase/rocky:9.7-gcc13.3.1-mpich4.3.2-openmpi5.0.9_0
23+
From: ghcr.io/idaholab/moose-mpibase/rocky:9.7-gcc13.3.1-mpich4.3.2-openmpi5.0.10_2026.03.09
2424
{%- else %}
25-
From: ghcr.io/idaholab/moose-mpibase/rocky:8.10-gcc13.3.1-mpich5.0.0-openmpi5.0.9_0
25+
From: ghcr.io/idaholab/moose-mpibase/rocky:8.10-gcc13.3.1-mpich5.0.0-openmpi5.0.10_2026.03.09
2626
{%- endif %}
2727

2828
%environment

‎conda/libmesh-vtk/conda_build_config.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ mpi:
33
- openmpi
44

55
moose_mpi:
6-
- moose-mpi 2026.02.16
6+
- moose-mpi 2026.03.19
77

88
#### Darwin SDK SYSROOT
99
CONDA_BUILD_SYSROOT: # [osx]

‎conda/libmesh-vtk/meta.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# libmesh/*
44
#
55
# As well as any directions pertaining to modifying those files.
6-
{% set build = 0 %}
6+
{% set build = 1 %}
77
{% set vtk_version = "9.6.0" %}
88
{% set vtk_friendly_version = vtk_version.split('.')[:2] | join('.') %}
99
{% set sha256 = "d77d180694faafdc816578b9a53651f6790e799615811bfbb91018661a3bb8f2" %}

‎conda/libmesh/conda_build_config.yaml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@ mpi:
33
- openmpi
44

55
moose_petsc:
6-
- moose-petsc 3.24.4 mpich_0
7-
- moose-petsc 3.24.4 openmpi_0
6+
- moose-petsc 3.24.5 mpich_0
7+
- moose-petsc 3.24.5 openmpi_0
88

99
moose_libmesh_vtk:
10-
- moose-libmesh-vtk 9.6.0 mpich_0
11-
- moose-libmesh-vtk 9.6.0 openmpi_0
10+
- moose-libmesh-vtk 9.6.0 mpich_1
11+
- moose-libmesh-vtk 9.6.0 openmpi_1
1212

1313
zip_keys:
1414
- mpi

‎conda/libmesh/meta.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
# As well as any directions pertaining to modifying those files.
66
# ALSO: Follow the directions in scripts/tests/versioner_hashes.yaml
77
{% set build = 0 %}
8-
{% set version = "2026.02.18_f8a1758" %}
8+
{% set version = "2026.03.17_3463d95" %}
99

1010
package:
1111
name: moose-libmesh

‎conda/moose-dev/conda_build_config.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ mpi:
33
- openmpi
44

55
moose_libmesh:
6-
- moose-libmesh 2026.02.18_f8a1758 mpich_0
7-
- moose-libmesh 2026.02.18_f8a1758 openmpi_0
6+
- moose-libmesh 2026.03.17_3463d95 mpich_0
7+
- moose-libmesh 2026.03.17_3463d95 openmpi_0
88

99
moose_wasp:
1010
- moose-wasp 2025.09.19_02960f1

‎conda/moose-dev/meta.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# REMEMBER TO UPDATE the .yaml files for the following packages:
33
# moose/conda_build_config.yaml
44
# As well as any directions pertaining to modifying those files.
5-
{% set version = "2026.02.20" %}
5+
{% set version = "2026.03.19" %}
66

77
package:
88
name: moose-dev

‎conda/moose/conda_build_config.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ mpi:
22
- mpich
33

44
moose_dev:
5-
- moose-dev 2026.02.20
5+
- moose-dev 2026.03.19
66

77
#### Darwin SDK SYSROOT
88
CONDA_BUILD_SYSROOT: # [osx]

‎conda/mpi/conda_build_config.yaml‎

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ mpi_version:
66
# MPICH version
77
- 4.3.2
88
# OpenMPI version
9-
- 5.0.8
9+
- 5.0.10
1010

1111
mpi_friendly_name:
1212
- MPICH
@@ -40,19 +40,19 @@ moose_cmake:
4040

4141
### If you change these versions, change also conda/wasp/*, conda/seacas/*
4242
moose_cc:
43-
- gcc 14.3.0 h0dff253_17 # [linux]
44-
- clang 19.1.7 default_h1323312_7 # [not arm64 and osx]
45-
- clang 19.1.7 default_hf9bcbb7_7 # [arm64]
43+
- gcc 14.3.0 h0dff253_18 # [linux]
44+
- clang 19.1.7 default_h1323312_8 # [not arm64 and osx]
45+
- clang 19.1.7 default_hf9bcbb7_8 # [arm64]
4646

4747
### If you change these versions, change also conda/wasp/*, conda/seacas/*
4848
moose_cxx:
49-
- gxx 14.3.0 h76987e4_17 # [linux]
50-
- clangxx 19.1.7 default_h9089c59_7 # [not arm64 and osx]
51-
- clangxx 19.1.7 default_hc995acf_7 # [arm64]
49+
- gxx 14.3.0 h76987e4_18 # [linux]
50+
- clangxx 19.1.7 default_h9089c59_8 # [not arm64 and osx]
51+
- clangxx 19.1.7 default_hc995acf_8 # [arm64]
5252

5353
### If you change these versions, change also conda/seacas/*
5454
moose_gfortran:
55-
- gfortran 14.3.0 h76987e4_17 # [linux]
55+
- gfortran 14.3.0 h76987e4_18 # [linux]
5656
- gfortran 14.3.0 hcc3c99d_0 # [not arm64 and osx]
5757
- gfortran 14.3.0 h3ef1dbf_0 # [arm64]
5858

@@ -68,29 +68,29 @@ moose_cxxcompiler:
6868
- clangxx_osx-arm64 # [arm64]
6969

7070
moose_libgfortran5:
71-
- libgfortran5 15.2.0 h68bc16d_17 # [linux]
72-
- libgfortran5 15.2.0 hd16e46c_17 # [not arm64 and osx]
73-
- libgfortran5 15.2.0 hdae7583_17 # [arm64]
71+
- libgfortran5 15.2.0 h68bc16d_18 # [linux]
72+
- libgfortran5 15.2.0 hd16e46c_18 # [not arm64 and osx]
73+
- libgfortran5 15.2.0 hdae7583_18 # [arm64]
7474

7575
moose_gcc_impl: # [linux]
76-
- gcc_impl_linux-64 # [linux]
76+
- gcc_impl_linux-64 # [linux]
7777

7878
moose_gfortran_impl: # [linux]
79-
- gfortran_impl_linux-64 14.3.0 h1a219da_17 # [linux]
79+
- gfortran_impl_linux-64 14.3.0 h1a219da_18 # [linux]
8080

8181
### Below are pinings created at the time of render
8282
### based on above content. If any of the above
8383
### content changes, modification will be needed below
8484
moose_libstdcxx: # [linux]
85-
- libstdcxx 15.2.0 h934c35e_17 # [linux]
85+
- libstdcxx 15.2.0 h934c35e_18 # [linux]
8686

8787
moose_libstdcxx_devel: # [linux]
88-
- libstdcxx-devel_linux-64 14.3.0 h9f08a49_117 # [linux]
88+
- libstdcxx-devel_linux-64 14.3.0 h9f08a49_118 # [linux]
8989

9090
moose_libcxx:
91-
- libcxx 21.1.8 ha0f52bf_2 # [linux]
92-
- libcxx 21.1.8 h4fb565c_2 # [not arm64 and osx]
93-
- libcxx 21.1.8 h55c6f16_2 # [arm64]
91+
- libcxx 22.1.0 ha0f52bf_1 # [linux]
92+
- libcxx 22.1.0 h19cb2f5_1 # [not arm64 and osx]
93+
- libcxx 22.1.0 h55c6f16_1 # [arm64]
9494

9595
moose_libzlib:
9696
- libzlib 1.3.1 hb9d3cd8_2 # [linux]
@@ -118,16 +118,16 @@ moose_clang_osx: # [osx]
118118
- clangxx_osx-arm64 19.1.7 h75f8d18_31 # [arm64]
119119

120120
moose_llvm_openmp: # [osx]
121-
- llvm-openmp 21.1.8 h472b3d1_0 # [not arm64 and osx]
122-
- llvm-openmp 21.1.8 h4a912ad_0 # [arm64]
121+
- llvm-openmp 22.1.0 h0d3cbff_0 # [not arm64 and osx]
122+
- llvm-openmp 22.1.0 hc7d1edf_0 # [arm64]
123123

124124
moose_llvm_tools: # [osx]
125125
- llvm-tools 19.1.7 hb0207f0_2 # [not arm64 and osx]
126126
- llvm-tools 19.1.7 h855ad52_2 # [arm64]
127127

128128
moose_libclang: # [osx]
129129
- libclang-cpp19.1 19.1.7 default_hd70426c_7 # [not arm64 and osx]
130-
- libclang-cpp19.1 19.1.7 default_hf3020a7_7 # [arm64]
130+
- libclang-cpp19.1 19.1.7 default_hf3020a7_8 # [arm64]
131131

132132
#### Darwin SDK SYSROOT
133133
CONDA_BUILD_SYSROOT: # [osx]

0 commit comments

Comments
 (0)