Skip to content

Update E3SM to use Kokkos 5.1.0 #8632

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
tcclevenger wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Update E3SM to use Kokkos 5.1.0 #8632

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
36e2df0
Update EKAT
tcclevenger May 13, 2026
7d1e66b
Update Trilinos and Albany paths on PM-CPU and Chrysalis
tcclevenger Jul 16, 2026
6865f8c
Replace outdated view.stride_x() with view.stride(x)
tcclevenger Aug 14, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions cime_config/machines/config_machines.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -306,8 +306,8 @@
<env name="SZ_ROOT">$SHELL{if [ -z "$SZ_ROOT" ]; then echo /global/cfs/cdirs/e3sm/3rdparty/sz/2.1.12.5/gcc-native-12.3; else echo "$SZ_ROOT"; fi}</env>
<env name="ZFP_ROOT">$SHELL{if [ -z "$ZFP_ROOT" ]; then echo /global/cfs/cdirs/e3sm/3rdparty/zfp/1.0.1/gcc-native-12.3; else echo "$ZFP_ROOT"; fi}</env>
<env name="BLA_VENDOR">Generic</env>
<env name="Albany_ROOT">$SHELL{if [ -z "$Albany_ROOT" ]; then echo /global/common/software/e3sm/albany/2025.11.14/gcc/12.3; else echo "$Albany_ROOT"; fi}</env>
<env name="Trilinos_ROOT">$SHELL{if [ -z "$Trilinos_ROOT" ]; then echo /global/common/software/e3sm/trilinos/2025.10.01/gcc/12.3; else echo "$Trilinos_ROOT"; fi}</env>
<env name="Albany_ROOT">$SHELL{if [ -z "$Albany_ROOT" ]; then echo /global/common/software/e3sm/albany/2026.05.21/gcc/14.3; else echo "$Albany_ROOT"; fi}</env>
<env name="Trilinos_ROOT">$SHELL{if [ -z "$Trilinos_ROOT" ]; then echo /global/common/software/e3sm/trilinos/2026.05.21/gcc/14.3; else echo "$Trilinos_ROOT"; fi}</env>
</environment_variables>
<environment_variables compiler="nvidia" mpilib="mpich">
<env name="PKG_CONFIG_PATH">/global/cfs/cdirs/e3sm/3rdparty/protobuf/21.6/nvidia-24.5/lib/pkgconfig:$ENV{PKG_CONFIG_PATH}</env>
Expand Down Expand Up @@ -2864,8 +2864,8 @@
</environment_variables>
<environment_variables compiler="gnu" mpilib="openmpi">
<env name="MOAB_ROOT">$SHELL{if [ -z "$MOAB_ROOT" ]; then echo /lcrc/soft/climate/moab/chrysalis/gnu; else echo "$MOAB_ROOT"; fi}</env>
<env name="Albany_ROOT">$SHELL{if [ -z "$Albany_ROOT" ]; then echo /lcrc/group/e3sm/soft/albany/2024.03.26/gcc/9.2.0; else echo "$Albany_ROOT"; fi}</env>
<env name="Trilinos_ROOT">$SHELL{if [ -z "$Trilinos_ROOT" ]; then echo /lcrc/group/e3sm/soft/trilinos/15.1.1/gcc/9.2.0; else echo "$Trilinos_ROOT"; fi}</env>
<env name="Albany_ROOT">$SHELL{if [ -z "$Albany_ROOT" ]; then echo /lcrc/group/e3sm/soft/albany/2026.05.26/gcc/11.2.0; else echo "$Albany_ROOT"; fi}</env>
<env name="Trilinos_ROOT">$SHELL{if [ -z "$Trilinos_ROOT" ]; then echo /lcrc/group/e3sm/soft/trilinos/17.0.0/gcc/11.2.0; else echo "$Trilinos_ROOT"; fi}</env>
<env name="ADIOS2_ROOT">$SHELL{if [ -z "$ADIOS2_ROOT" ]; then echo /lcrc/soft/climate/adios2/2.10.2/openmpi-4.1.6/gcc-11.2.0; else echo "$ADIOS2_ROOT"; fi}</env>
<env name="BLOSC2_ROOT">$SHELL{if [ -z "$BLOSC2_ROOT" ]; then echo /lcrc/soft/climate/c-blosc2/2.15.2/gcc-11.2.0; else echo "$BLOSC2_ROOT"; fi}</env>
<env name="SZ_ROOT">$SHELL{if [ -z "$SZ_ROOT" ]; then echo /lcrc/soft/climate/sz/2.1.12.5/gcc-11.2.0; else echo "$SZ_ROOT"; fi}</env>
Expand Down
12 changes: 6 additions & 6 deletions components/eamxx/src/share/field/field_pyutils.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,25 +21,25 @@ void get_ptr_and_strides (std::vector<ssize_t>& strides, const void*& p, const F
case 1:
{
auto v = f.get_view<const T*,HD>();
strides[0] = v.stride_0()*sizeof(T);
strides[0] = v.stride(0)*sizeof(T);
p = v.data();
break;
}
case 2:
{
auto v = f.get_view<const T**,HD>();
strides[0] = v.stride_0()*sizeof(T);
strides[1] = v.stride_1()*sizeof(T);
strides[0] = v.stride(0)*sizeof(T);
strides[1] = v.stride(1)*sizeof(T);
p = v.data();
break;
}
break;
case 3:
{
auto v = f.get_view<const T***,HD>();
strides[0] = v.stride_0()*sizeof(T);
strides[1] = v.stride_1()*sizeof(T);
strides[2] = v.stride_2()*sizeof(T);
strides[0] = v.stride(0)*sizeof(T);
strides[1] = v.stride(1)*sizeof(T);
strides[2] = v.stride(2)*sizeof(T);
p = v.data();
break;
}
Expand Down
2 changes: 1 addition & 1 deletion externals/ekat
Open in desktop
Submodule ekat updated 6 files
+7 −0 CMakeLists.txt
+1 −0 cacts.yaml
+1 −1 extern/kokkos
+1 −1 src/kokkos/ekat_kokkos_meta.hpp
+1 −1 src/kokkos/ekat_team_policy_utils.hpp
+8 −3 src/pack/ekat_pack.hpp
Loading