Update to compass v1.2.0-alpha.4 and mache v1.10.0

compass/version.py

@@ -1 +1 @@
-__version__ = '1.2.0-alpha.3'
+__version__ = '1.2.0-alpha.4'

conda/albany_supported.txt

@@ -1,6 +1,5 @@
 # a list of supported machine, compiler and mpi combinations for Albany
 
-anvil, gnu, mvapich
 anvil, gnu, openmpi
 chrysalis, gnu, openmpi
 compy, gnu, openmpi

conda/bootstrap.py

@@ -354,7 +354,7 @@ def get_env_vars(machine, compiler, mpilib):
 
 
 def build_spack_env(config, update_spack, machine, compiler, mpi, spack_env,
-                    spack_base, spack_template_path, env_vars, tmpdir):
+                    spack_base, spack_template_path, env_vars, tmpdir, logger):
 
     albany = config.get('deploy', 'albany')
     esmf = config.get('deploy', 'esmf')
@@ -392,7 +392,7 @@ def build_spack_env(config, update_spack, machine, compiler, mpi, spack_env,
         specs.append(f'scorpio@{scorpio}+pnetcdf~timing+internal-timing~tools+malloc')
 
     if albany != 'None':
-        specs.append(f'albany@{albany}+mpas')
+        specs.append(f'albany@{albany}+mpas+cxx17')
 
     yaml_template = f'{spack_template_path}/{machine}_{compiler}_{mpi}.yaml'
     if not os.path.exists(yaml_template):
@@ -412,6 +412,7 @@ def build_spack_env(config, update_spack, machine, compiler, mpi, spack_env,
             files = glob.glob(os.path.join(include_path, f'{prefix}*'))
             for filename in files:
                 os.remove(filename)
+        set_ld_library_path(spack_branch_base, spack_env, logger)
 
     spack_script = get_spack_script(
         spack_path=spack_branch_base, env_name=spack_env, compiler=compiler,
@@ -460,6 +461,15 @@ def build_spack_env(config, update_spack, machine, compiler, mpi, spack_env,
     return spack_branch_base, spack_script, env_vars
 
 
+def set_ld_library_path(spack_branch_base, spack_env, logger):
+    commands = \
+        f'source {spack_branch_base}/share/spack/setup-env.sh; ' \
+        f'spack env activate {spack_env}; ' \
+        f'spack config add modules:prefix_inspections:lib:[LD_LIBRARY_PATH]; ' \
+        f'spack config add modules:prefix_inspections:lib64:[LD_LIBRARY_PATH]'
+    check_call(commands, logger=logger)
+
+
 def write_load_compass(template_path, activ_path, conda_base, env_type,
                        activ_suffix, prefix, env_name, spack_script, machine,
                        env_vars, env_only, source_path, without_openmp):
@@ -863,7 +873,7 @@ def main():
                 spack_branch_base, spack_script, env_vars = build_spack_env(
                     config, args.update_spack, machine, compiler, mpi,
                     spack_env, spack_base, spack_template_path, env_vars,
-                    args.tmpdir)
+                    args.tmpdir, logger)
                 spack_script = f'echo Loading Spack environment...\n' \
                                f'{spack_script}\n' \
                                f'echo Done.\n' \

conda/compass_env/spec-file.template

@@ -15,7 +15,7 @@ jigsaw=0.9.14
 jigsawpy=0.3.3
 jupyter
 lxml
-mache=1.9.0
+mache=1.10.0
 matplotlib-base
 metis
 mpas_tools=0.17.0

conda/configure_compass_env.py

@@ -53,7 +53,7 @@ def setup_install_env(env_name, activate_base, use_local, logger, recreate,
         channels = '--use-local'
     else:
         channels = ''
-    packages = 'progressbar2 jinja2 "mache=1.9.0"'
+    packages = 'progressbar2 jinja2 "mache=1.10.0"'
     if recreate or not os.path.exists(env_path):
         print('Setting up a conda environment for installing compass\n')
         commands = '{}; ' \

conda/recipe/meta.yaml

@@ -1,5 +1,5 @@
 {% set name = "compass" %}
-{% set version = "1.2.0alpha.3" %}
+{% set version = "1.2.0alpha.4" %}
 {% set build = 0 %}
 
 {% if mpi == "nompi" %}
@@ -52,7 +52,7 @@ requirements:
     - jigsawpy 0.3.3
     - jupyter
     - lxml
-    - mache 1.9.0
+    - mache 1.10.0
     - matplotlib-base
     - metis
     - mpas_tools 0.17.0

conda/unsupported.txt

@@ -3,9 +3,15 @@
 # no spack available
 anvil, gnu, impi
 chrysalis, gnu, impi
+chrysalis, oneapi-ifx, openmpi
+chrysalis, oneapi-ifx, impi
 compy, intel, mvapich2
 compy, pgi, impi
 compy, pgi, mvapich2
+pm-cpu, nvidia, mpich
+pm-cpu, aocc, mpich
+pm-cpu, amdclang, mpich
+
 
 # compiles but tests unreliable (errors or hanging),
 # see https://github.com/MPAS-Dev/compass/issues/336

docs/developers_guide/machines/cori.rst

@@ -16,7 +16,7 @@ Then, you can build the MPAS model with
 
 .. code-block:: bash
 
-    make [DEBUG=true] [OPENMP=true] intel-nersc
+    make [DEBUG=true] [OPENMP=true] intel-cray
 
 cori-haswell, gnu
 -----------------
@@ -31,4 +31,4 @@ Then, you can build the MPAS model with
 
 .. code-block:: bash
 
-    make [DEBUG=true] [OPENMP=true] [ALBANY=true] gnu-nersc
+    make [DEBUG=true] [OPENMP=true] [ALBANY=true] gnu-cray

docs/developers_guide/machines/index.rst

@@ -61,11 +61,11 @@ the MPAS model.
 |              +------------+-----------+-------------------+
 |              | gnu        | openmpi   | gfortran          |
 +--------------+------------+-----------+-------------------+
-| cori-haswell | intel      | mpt       | intel-nersc       |
+| cori-haswell | intel      | mpt       | intel-cray        |
 |              +------------+-----------+-------------------+
-|              | gnu        | mpt       | gnu-nersc         |
+|              | gnu        | mpt       | gnu-cray          |
 +--------------+------------+-----------+-------------------+
-| pm-cpu       | gnu        | mpich     | gnu-nersc         |
+| pm-cpu       | gnu        | mpich     | gnu-cray          |
 +--------------+------------+-----------+-------------------+
 
 Below are specifics for each supported machine

docs/developers_guide/machines/perlmutter.rst

@@ -15,4 +15,4 @@ Then, you can build the MPAS model with
 
 .. code-block:: bash
 
-    make [DEBUG=true] gnu-nersc
+    make [DEBUG=true] gnu-cray

docs/users_guide/machines/anvil.rst

@@ -105,7 +105,7 @@ variables:
 
 .. code-block:: bash
 
-    source /lcrc/soft/climate/compass/anvil/load_latest_compass_gnu_mvapich.sh
+    source /lcrc/soft/climate/compass/anvil/load_latest_compass_gnu_openmpi.sh
 
 To build the MPAS model with
 

docs/users_guide/machines/cori.rst

@@ -138,7 +138,7 @@ To build the MPAS model with
 
 .. code-block:: bash
 
-    make [DEBUG=true] [OPENMP=true] intel-nersc
+    make [DEBUG=true] [OPENMP=true] intel-cray
 
 
 Gnu on Cori-Haswell
@@ -155,7 +155,7 @@ To build the MPAS model with
 
 .. code-block:: bash
 
-    make [DEBUG=true] [OPENMP=true] [ALBANY=true] gnu-nersc
+    make [DEBUG=true] [OPENMP=true] [ALBANY=true] gnu-cray
 
 
 Jupyter notebook on remote data

docs/users_guide/machines/perlmutter.rst

@@ -152,7 +152,7 @@ To build the MPAS model with
 
 .. code-block:: bash
 
-    make [DEBUG=true] [OPENMP=true] [ALBANY=true] gnu-nersc
+    make [DEBUG=true] [OPENMP=true] [ALBANY=true] gnu-cray
 
 
 Jupyter notebook on remote data

utils/matrix/setup_matrix.py

@@ -36,10 +36,10 @@
         ('intel', 'impi'): 'intel-mpi',
         ('gnu', 'openmpi'): 'gfortran'},
     'cori-haswell': {
-        ('intel', 'mpt'): 'intel-nersc',
-        ('gnu', 'mpt'): 'gnu-nersc'},
+        ('intel', 'mpt'): 'intel-cray',
+        ('gnu', 'mpt'): 'gnu-cray'},
     'pm-cpu': {
-        ('gnu', 'mpich'): 'gnu-nersc'},
+        ('gnu', 'mpich'): 'gnu-cray'},
     'conda-linux': {
         ('gfortran', 'mpich'): 'gfortran',
         ('gfortran', 'openmpi'): 'gfortran'},