Update to 2.0.0

conda/meta.yaml

@@ -1,5 +1,5 @@
 {% set name = "mache" %}
-{% set version = "1.31.0" %}
+{% set version = "2.0.0rc2" %}
 
 package:
   name: {{ name|lower }}

mache/cime_machine_config/config_machines.xml

@@ -3492,24 +3492,24 @@
     <COMPILERS>oneapi-ifxgpu,oneapi-ifx</COMPILERS>
     <MPILIBS>mpich,mpich1024</MPILIBS>
     <PROJECT>E3SM_Dec</PROJECT>
-    <SAVE_TIMING_DIR>/lus/flare/projects/E3SM_Dec/performance_archive</SAVE_TIMING_DIR>
+    <SAVE_TIMING_DIR>/lus/flare/projects/E3SMinput/baselines</SAVE_TIMING_DIR>
     <SAVE_TIMING_DIR_PROJECTS>.*</SAVE_TIMING_DIR_PROJECTS>
     <CIME_OUTPUT_ROOT>/lus/flare/projects/$PROJECT/$USER/scratch</CIME_OUTPUT_ROOT>
-    <DIN_LOC_ROOT>/lus/flare/projects/E3SM_Dec/inputdata</DIN_LOC_ROOT>
-    <DIN_LOC_ROOT_CLMFORC>/lus/flare/projects/E3SM_Dec/inputdata/atm/datm7</DIN_LOC_ROOT_CLMFORC>
+    <DIN_LOC_ROOT>/lus/flare/projects/E3SMinput/data</DIN_LOC_ROOT>
+    <DIN_LOC_ROOT_CLMFORC>/lus/flare/projects/E3SMinput/data/atm/datm7</DIN_LOC_ROOT_CLMFORC>
     <DOUT_S_ROOT>$CIME_OUTPUT_ROOT/archive/$CASE</DOUT_S_ROOT>
-    <BASELINE_ROOT>/lus/flare/projects/E3SM_Dec/baselines/$COMPILER</BASELINE_ROOT>
-    <CCSM_CPRNC>/lus/flare/projects/E3SM_Dec/tools/cprnc/cprnc</CCSM_CPRNC>
+    <BASELINE_ROOT>/lus/flare/projects/E3SMinput/baselines/$COMPILER</BASELINE_ROOT>
+    <CCSM_CPRNC>/lus/flare/projects/E3SMinput/tools/cprnc/cprnc</CCSM_CPRNC>
     <GMAKE_J>16</GMAKE_J>
-    <TESTS>e3sm_developer</TESTS>
+    <TESTS>e3sm_integration</TESTS>
     <NTEST_PARALLEL_JOBS>4</NTEST_PARALLEL_JOBS>
     <BATCH_SYSTEM>pbspro</BATCH_SYSTEM>
     <SUPPORTED_BY>e3sm</SUPPORTED_BY>
     <MAX_TASKS_PER_NODE>102</MAX_TASKS_PER_NODE>
     <MAX_TASKS_PER_NODE compiler="oneapi-ifxgpu">96</MAX_TASKS_PER_NODE>
     <MAX_MPITASKS_PER_NODE>102</MAX_MPITASKS_PER_NODE>
     <MAX_MPITASKS_PER_NODE compiler="oneapi-ifxgpu">12</MAX_MPITASKS_PER_NODE>
-    <PROJECT_REQUIRED>FALSE</PROJECT_REQUIRED>
+    <PROJECT_REQUIRED>TRUE</PROJECT_REQUIRED>
     <mpirun mpilib="default">
       <executable>mpiexec</executable>
       <!--executable>numactl -m 2-3 mpiexec</executable--><!--for HBM runs-->
@@ -3529,9 +3529,13 @@
       <cmd_path lang="csh">module</cmd_path>
       <cmd_path lang="python">/usr/share/lmod/lmod/libexec/lmod python</cmd_path>
       <modules>
-        <command name="load">cmake/3.30.5</command>
-        <command name="load">oneapi/release/2025.0.5</command>
-      </modules>
+        <command name="use">/lus/flare/projects/E3SMinput/soft/modulefiles</command>
+        <command name="load">cmake/3.31.8</command>
+        <command name="load">oneapi/release/2025.2.0</command>
+        <command name="load">netcdf/4.9.3c-4.6.2f</command>
+        <command name="load">pnetcdf/1.14.0</command>
+        <command name="load">adios2/2.10.2</command>
+        </modules>
       <modules mpilib="mpich1024">
         <command name="load">mpich-config/collective-tuning/1024</command>
       </modules>
@@ -3540,16 +3544,6 @@
     <EXEROOT>$CIME_OUTPUT_ROOT/$CASE/bld</EXEROOT>
     <MAX_GB_OLD_TEST_DATA>0</MAX_GB_OLD_TEST_DATA>
     <environment_variables>
-        <env name="NETCDF_PATH">/lus/flare/projects/E3SM_Dec/soft/netcdf/4.9.2c-4.6.1f/oneapi.eng.2024.07.30.002</env>
-        <env name="PNETCDF_PATH">/lus/flare/projects/E3SM_Dec/soft/pnetcdf/1.14.0/oneapi.eng.2024.07.30.002</env>
-        <env name="LD_LIBRARY_PATH">/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}</env>
-        <env name="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}</env>
-        <env name="PKG_CONFIG_PATH">/lus/flare/projects/E3SM_Dec/soft/protobuf/21.6/oneapi.release.2025.0.5/lib/pkgconfig:$ENV{PKG_CONFIG_PATH}</env>
-        <env name="ADIOS2_ROOT">$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}</env>
-        <env name="BLOSC2_ROOT">$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}</env>
-        <env name="MGARD_ROOT">$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}</env>
-        <env name="SZ_ROOT">$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}</env>
-        <env name="ZFP_ROOT">$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}</env>
         <env name="FI_CXI_DEFAULT_CQ_SIZE">131072</env>
         <env name="FI_CXI_CQ_FILL_PERCENT">20</env>
         <env name="RLIMITS"> </env>
@@ -3574,7 +3568,7 @@
         <env name="romio_cb_write">disable</env>
         <env name="GATOR_INITIAL_MB">4000MB</env>
         <env name="GATOR_DISABLE">0</env>
-        <env name="GPU_TILE_COMPACT">/lus/flare/projects/E3SM_Dec/tools/mpi_wrapper_utils/gpu_tile_compact.sh</env>
+        <env name="GPU_TILE_COMPACT">/lus/flare/projects/E3SMinput/tools/mpi_wrapper_utils/gpu_tile_compact.sh</env>
         <env name="RANKS_BIND">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</env>
         <env name="ZES_ENABLE_SYSMAN">1</env>
         <!-- default is ZE_FLAT_DEVICE_HIERARCHY=COMPOSITE: enable this to run 4 MPI/tile or 48 MPI/node

mache/spack/templates/aurora_oneapi-ifx_mpich.yaml

@@ -1,4 +1,4 @@
-{%- set compiler = "oneapi@2025.0.5" %}
+{%- set compiler = "oneapi@2025.2.0" %}
 {%- set mpi = "[email protected]" %}
 
 spack:
@@ -32,8 +32,8 @@ spack:
       buildable: false
     cmake:
       externals:
-      - spec: cmake@3.30.5
-        prefix: /opt/aurora/24.347.0/spack/unified/0.9.2/install/linux-sles15-x86_64/gcc-13.3.0/cmake-3.30.5-igar7ts
+      - spec: cmake@3.31.8
+        prefix: /opt/aurora/25.190.0/spack/unified/0.10.1/install/linux-sles15-x86_64/gcc-13.3.0/cmake-3.31.8-mvhtj5u/bin/cmake
       buildable: false
     curl:
       externals:
@@ -53,17 +53,12 @@ spack:
     gmake:
       externals:
       - spec: [email protected]
-        prefix: /opt/aurora/24.347.0/spack/unified/0.9.2/install/linux-sles15-x86_64/gcc-13.3.0/gmake-4.4.1-wza7sk4
-      buildable: false
-    libiconv:
-      externals:
-      - spec: [email protected]
-        prefix: /opt/aurora/24.347.0/spack/unified/0.9.2/install/linux-sles15-x86_64/gcc-13.3.0/libiconv-1.17-jjpb4sl
+        prefix: /opt/aurora/25.190.0/spack/unified/0.10.1/install/linux-sles15-x86_64/gcc-13.3.0/gmake-4.4.1-wza7sk4
       buildable: false
     libxml2:
       externals:
       - spec: [email protected]
-        prefix: /opt/aurora/24.347.0/spack/unified/0.9.2/install/linux-sles15-x86_64/gcc-13.3.0/libxml2-2.13.5-jxhkqdj
+        prefix: /opt/aurora/25.190.0/spack/unified/0.10.1/install/linux-sles15-x86_64/gcc-13.3.0/libxml2-2.13.5-dhzcbk4
       buildable: false
     openssl:
       externals:
@@ -89,48 +84,48 @@ spack:
       externals:
       - spec: {{ compiler }}
         modules:
-        - oneapi/release/2025.0.5
+        - oneapi/release/2025.2.0
       buildable: false
     gcc-runtime:
       externals:
       - spec: [email protected]
-        prefix: /opt/aurora/24.347.0/spack/unified/0.9.2/install/linux-sles15-x86_64/gcc-13.3.0/gcc-runtime-13.3.0-ghotoln
+        prefix: /opt/aurora/25.190.0/spack/unified/0.10.1/install/linux-sles15-x86_64/gcc-13.3.0/gcc-runtime-13.3.0-ghotoln
       buildable: false
     mpich:
       externals:
       - spec: {{ mpi }}%{{ compiler }}
-        prefix: /opt/aurora/24.347.0/spack/unified/0.9.2/install/linux-sles15-x86_64/oneapi-2025.0.5/mpich-develop-git.6037a7a-sxnhr7p
+        prefix: /opt/aurora/25.190.0/spack/unified/0.10.1/install/linux-sles15-x86_64/oneapi-2025.2.0/mpich-develop-git.6037a7a-cym6jg6
       buildable: false
 {%- if e3sm_hdf5_netcdf %}
     hdf5:
       externals:
-      - spec: [email protected].5+cxx+fortran+hl+mpi
-        prefix: /lus/flare/projects/E3SM_Dec/soft/hdf5/1.14.5/oneapi.eng.2024.07.30.002/
+      - spec: [email protected].6+cxx+fortran+hl+mpi
+        prefix: /lus/flare/projects/E3SMinput/soft/hdf5/1.14.6/oneapi.2025.2.0
       buildable: false
     netcdf-c:
       externals:
-      - spec: [email protected].2+mpi~parallel-netcdf
-        prefix: /lus/flare/projects/E3SM_Dec/soft/netcdf/4.9.2c-4.6.1f/oneapi.eng.2024.07.30.002
+      - spec: [email protected].3+mpi~parallel-netcdf
+        prefix: /lus/flare/projects/E3SMinput/soft/netcdf/4.9.3c-4.6.2f/oneapi.2025.2.0
       buildable: false
     netcdf-fortran:
       externals:
-      - spec: [email protected].1
-        prefix: /lus/flare/projects/E3SM_Dec/soft/netcdf/4.9.2c-4.6.1f/oneapi.eng.2024.07.30.002
+      - spec: [email protected].2
+        prefix: /lus/flare/projects/E3SMinput/soft/netcdf/4.9.3c-4.6.2f/oneapi.2025.2.0
       buildable: false
     parallel-netcdf:
       externals:
-      - spec: parallel-netcdf@1.11.0+cxx+fortran
-        prefix: /lus/flare/projects/E3SM_Dec/soft/pnetcdf/1.14.0/oneapi.eng.2024.07.30.002
+      - spec: parallel-netcdf@1.14.0+cxx+fortran
+        prefix: /lus/flare/projects/E3SMinput/soft/pnetcdf/1.14.0/oneapi.2025.2.0
       buildable: false
 {%- endif %}
   compilers:
   - compiler:
       spec: {{ compiler }}
       paths:
-        cc: /opt/aurora/24.347.0/oneapi/compiler/latest/bin/icx
-        cxx: /opt/aurora/24.347.0/oneapi/compiler/latest/bin/icpx
-        f77: /opt/aurora/24.347.0/oneapi/compiler/latest/bin/ifx
-        fc: /opt/aurora/24.347.0/oneapi/compiler/latest/bin/ifx
+        cc: /opt/aurora/25.190.0/oneapi/compiler/latest/bin/icx
+        cxx: /opt/aurora/25.190.0/oneapi/compiler/latest/bin/icpx
+        f77: /opt/aurora/25.190.0/oneapi/compiler/latest/bin/ifx
+        fc: /opt/aurora/25.190.0/oneapi/compiler/latest/bin/ifx
       flags: {}
       operating_system: sles15
       target: x86_64

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.0rc2'