From 71da85e103a42d9de91ec2fc2a38fa0c6f083d05 Mon Sep 17 00:00:00 2001 From: Xylar Asay-Davis Date: Thu, 2 Oct 2025 14:46:49 +0200 Subject: [PATCH 1/9] Update to v2.0.0rc1 --- conda/meta.yaml | 2 +- mache/version.py | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/conda/meta.yaml b/conda/meta.yaml index e6b3289f..c4648292 100644 --- a/conda/meta.yaml +++ b/conda/meta.yaml @@ -1,5 +1,5 @@ {% set name = "mache" %} -{% set version = "1.31.0" %} +{% set version = "2.0.0rc1" %} package: name: {{ name|lower }} diff --git a/mache/version.py b/mache/version.py index 5891a17e..50b70f37 100644 --- a/mache/version.py +++ b/mache/version.py @@ -1,2 +1,3 @@ -__version_info__ = (1, 32, 0) -__version__ = '.'.join(str(vi) for vi in __version_info__) +__version_info__ = (2, 0, 0) +# __version__ = '.'.join(str(vi) for vi in __version_info__) +__version__ = '2.0.0rc1' From 662ec16d95c64b2f6f318983ea92b16e8f5406c8 Mon Sep 17 00:00:00 2001 From: Xylar Asay-Davis Date: Tue, 28 Oct 2025 10:20:45 +0100 Subject: [PATCH 2/9] Update to v2.0.0rc2 --- conda/meta.yaml | 2 +- mache/version.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/conda/meta.yaml b/conda/meta.yaml index c4648292..0f4ea02c 100644 --- a/conda/meta.yaml +++ b/conda/meta.yaml @@ -1,5 +1,5 @@ {% set name = "mache" %} -{% set version = "2.0.0rc1" %} +{% set version = "2.0.0rc2" %} package: name: {{ name|lower }} diff --git a/mache/version.py b/mache/version.py index 50b70f37..2a61ed4c 100644 --- a/mache/version.py +++ b/mache/version.py @@ -1,3 +1,3 @@ __version_info__ = (2, 0, 0) # __version__ = '.'.join(str(vi) for vi in __version_info__) -__version__ = '2.0.0rc1' +__version__ = '2.0.0rc2' From 483ddd7f9d5f5f5df8fb2c147a3ccc96a80eb3dc Mon Sep 17 00:00:00 2001 From: Andrew Nolan Date: Wed, 29 Oct 2025 20:00:15 +0000 Subject: [PATCH 3/9] Update config_machines.xml This bring in changes to Aurora modules and corresponds to E3SM commit hash: f29cfa46f9033d8ffb6848f1bca8d9e8d284043f --- mache/cime_machine_config/config_machines.xml | 38 ++++++++----------- 1 file changed, 16 insertions(+), 22 deletions(-) diff --git a/mache/cime_machine_config/config_machines.xml b/mache/cime_machine_config/config_machines.xml index bf37c0a1..cf1fbde6 100644 --- a/mache/cime_machine_config/config_machines.xml +++ b/mache/cime_machine_config/config_machines.xml @@ -3492,16 +3492,16 @@ oneapi-ifxgpu,oneapi-ifx mpich,mpich1024 E3SM_Dec - /lus/flare/projects/E3SM_Dec/performance_archive + /lus/flare/projects/E3SMinput/baselines .* /lus/flare/projects/$PROJECT/$USER/scratch - /lus/flare/projects/E3SM_Dec/inputdata - /lus/flare/projects/E3SM_Dec/inputdata/atm/datm7 + /lus/flare/projects/E3SMinput/data + /lus/flare/projects/E3SMinput/data/atm/datm7 $CIME_OUTPUT_ROOT/archive/$CASE - /lus/flare/projects/E3SM_Dec/baselines/$COMPILER - /lus/flare/projects/E3SM_Dec/tools/cprnc/cprnc + /lus/flare/projects/E3SMinput/baselines/$COMPILER + /lus/flare/projects/E3SMinput/tools/cprnc/cprnc 16 - e3sm_developer + e3sm_integration 4 pbspro e3sm @@ -3509,7 +3509,7 @@ 96 102 12 - FALSE + TRUE mpiexec @@ -3529,9 +3529,13 @@ module /usr/share/lmod/lmod/libexec/lmod python - cmake/3.30.5 - oneapi/release/2025.0.5 - + /lus/flare/projects/E3SMinput/soft/modulefiles + cmake/3.31.8 + oneapi/release/2025.2.0 + netcdf/4.9.3c-4.6.2f + pnetcdf/1.14.0 + adios2/2.10.2 + mpich-config/collective-tuning/1024 @@ -3540,16 +3544,6 @@ $CIME_OUTPUT_ROOT/$CASE/bld 0 - /lus/flare/projects/E3SM_Dec/soft/netcdf/4.9.2c-4.6.1f/oneapi.eng.2024.07.30.002 - /lus/flare/projects/E3SM_Dec/soft/pnetcdf/1.14.0/oneapi.eng.2024.07.30.002 - /lus/flare/projects/E3SM_Dec/soft/pnetcdf/1.14.0/oneapi.eng.2024.07.30.002/lib:/lus/flare/projects/E3SM_Dec/soft/netcdf/4.9.2c-4.6.1f/oneapi.eng.2024.07.30.002/lib:$ENV{LD_LIBRARY_PATH} - /lus/flare/projects/E3SM_Dec/soft/pnetcdf/1.14.0/oneapi.eng.2024.07.30.002/bin:/lus/flare/projects/E3SM_Dec/soft/netcdf/4.9.2c-4.6.1f/oneapi.eng.2024.07.30.002/bin:$ENV{PATH} - /lus/flare/projects/E3SM_Dec/soft/protobuf/21.6/oneapi.release.2025.0.5/lib/pkgconfig:$ENV{PKG_CONFIG_PATH} - $SHELL{if [ -z "$ADIOS2_ROOT" ]; then echo /lus/flare/projects/E3SM_Dec/soft/adios2/2.10.2/oneapi.release.2025.0.5; else echo "$ADIOS2_ROOT"; fi} - $SHELL{if [ -z "$BLOSC2_ROOT" ]; then echo /lus/flare/projects/E3SM_Dec/soft/c-blosc2/2.15.2/oneapi.release.2025.0.5; else echo "$BLOSC2_ROOT"; fi} - $SHELL{if [ -z "$MGARD_ROOT" ]; then echo /lus/flare/projects/E3SM_Dec/soft/mgard/1.5.2/oneapi.release.2025.0.5; else echo "$MGARD_ROOT"; fi} - $SHELL{if [ -z "$SZ_ROOT" ]; then echo /lus/flare/projects/E3SM_Dec/soft/sz/2.1.12.5/oneapi.release.2025.0.5; else echo "$SZ_ROOT"; fi} - $SHELL{if [ -z "$ZFP_ROOT" ]; then echo /lus/flare/projects/E3SM_Dec/soft/zfp/1.0.1/oneapi.release.2025.0.5; else echo "$ZFP_ROOT"; fi} 131072 20 @@ -3574,7 +3568,7 @@ disable 4000MB 0 - /lus/flare/projects/E3SM_Dec/tools/mpi_wrapper_utils/gpu_tile_compact.sh + /lus/flare/projects/E3SMinput/tools/mpi_wrapper_utils/gpu_tile_compact.sh list:1-8:9-16:17-24:25-32:33-40:41-48:53-60:61-68:69-76:77-84:85-92:93-100 --gpu-bind list:0.0:0.1:1.0:1.1:2.0:2.1:3.0:3.1:4.0:4.1:5.0:5.1 --mem-bind list:0:0:0:0:0:0:1:1:1:1:1:1 1