Merge pull request #109 from xylar/update_cmake_for_albany

Remove system cmake from all spack templates

Author: xylar

.pre-commit-config.yaml

@@ -1,4 +1,4 @@
-exclude: "docs|.git|conda/meta.yaml"
+exclude: "docs|.git"
 default_stages: [commit]
 fail_fast: true
 
@@ -8,7 +8,6 @@ repos:
     hooks:
       - id: trailing-whitespace
       - id: end-of-file-fixer
-      - id: check-yaml
 
   # Can run individually with `pre-commit run isort --all-files`
   - repo: https://github.com/PyCQA/isort

README.rst

@@ -70,8 +70,6 @@ will be recognized from the host name:
 
 * anvil
 
-* badger
-
 * chrysalis
 
 * compy
@@ -253,10 +251,10 @@ first log on to an LCRC machine, then run:
 
 .. code-block:: bash
 
-    mache sync diags to badger -u <username>
+    mache sync diags to chicoma-cpu -u <username>
 
-where ``<username>`` is your account name on the non-LCRC machine (``badger``
-in this example).
+where ``<username>`` is your account name on the non-LCRC machine
+(``chicoma-cpu`` in this example).
 
 License
 -------

conda/meta.yaml

@@ -1,5 +1,5 @@
 {% set name = "mache" %}
-{% set version = "1.12.0" %}
+{% set version = "1.13.0rc1" %}
 
 package:
   name: {{ name|lower }}

mache/discover.py

@@ -25,8 +25,6 @@ def discover_machine(quiet=False):
         machine = 'andes'
     elif hostname.startswith('blueslogin'):
         machine = 'anvil'
-    elif hostname.startswith('ba-fe'):
-        machine = 'badger'
     elif hostname.startswith('ch-fe'):
         if not quiet:
             warnings.warn('defaulting to chicoma-cpu.  Use -m chicoma-gpu if '
@@ -39,9 +37,6 @@ def discover_machine(quiet=False):
     elif hostname.startswith('cooley'):
         machine = 'cooley'
     elif hostname.startswith('cori'):
-        if not quiet:
-            warnings.warn('defaulting to cori-haswell.  Explicitly specify '
-                          'cori-knl as the machine if you wish to run on KNL.')
         machine = 'cori-haswell'
     elif 'NERSC_HOST' in os.environ:
         hostname = os.environ['NERSC_HOST']

mache/machines/badger.cfg

@@ -1,6 +1,5 @@
 spack:
   specs:
-  - cmake
   - gcc
   - mvapich2
 {% if e3sm_lapack %}
@@ -88,13 +87,6 @@ spack:
       - spec: [email protected]
         prefix: /gpfs/fs1/soft/chrysalis/spack/opt/spack/linux-centos8-x86_64/intel-20.0.4/zlib-1.2.11-dudhhig
       buildable: false
-    cmake:
-      externals:
-      - spec: [email protected]
-        prefix: /gpfs/fs1/software/centos7/spack-latest/opt/spack/linux-centos7-x86_64/gcc-6.5.0/cmake-3.20.3-vedypwm
-        modules:
-        - cmake/3.20.3-vedypwm
-      buildable: false
     perl:
       externals:
       - spec: [email protected]

mache/machines/cori-knl.cfg

@@ -1,6 +1,5 @@
 spack:
   specs:
-  - cmake
   - gcc
   - openmpi
 {% if e3sm_lapack %}
@@ -88,13 +87,6 @@ spack:
       - spec: [email protected]
         prefix: /gpfs/fs1/soft/chrysalis/spack/opt/spack/linux-centos8-x86_64/intel-20.0.4/zlib-1.2.11-dudhhig
       buildable: false
-    cmake:
-      externals:
-      - spec: [email protected]
-        prefix: /gpfs/fs1/software/centos7/spack-latest/opt/spack/linux-centos7-x86_64/gcc-6.5.0/cmake-3.20.3-vedypwm
-        modules:
-        - cmake/3.20.3-vedypwm
-      buildable: false
     perl:
       externals:
       - spec: [email protected]

mache/spack/anvil_gnu_mvapich.yaml

@@ -1,6 +1,5 @@
 spack:
   specs:
-  - cmake
   - intel
   - intel-mpi
 {% if e3sm_lapack %}
@@ -88,13 +87,6 @@ spack:
       - spec: [email protected]
         prefix: /gpfs/fs1/soft/chrysalis/spack/opt/spack/linux-centos8-x86_64/intel-20.0.4/zlib-1.2.11-dudhhig
       buildable: false
-    cmake:
-      externals:
-      - spec: [email protected]
-        prefix: /gpfs/fs1/software/centos7/spack-latest/opt/spack/linux-centos7-x86_64/gcc-6.5.0/cmake-3.20.3-vedypwm
-        modules:
-        - cmake/3.20.3-vedypwm
-      buildable: false
     perl:
       externals:
       - spec: [email protected]

mache/spack/anvil_gnu_openmpi.yaml

@@ -1,6 +1,5 @@
 spack:
   specs:
-  - cmake
   - intel
   - mvapich2
 {% if e3sm_lapack %}
@@ -88,13 +87,6 @@ spack:
       - spec: [email protected]
         prefix: /gpfs/fs1/soft/chrysalis/spack/opt/spack/linux-centos8-x86_64/intel-20.0.4/zlib-1.2.11-dudhhig
       buildable: false
-    cmake:
-      externals:
-      - spec: [email protected]
-        prefix: /gpfs/fs1/software/centos7/spack-latest/opt/spack/linux-centos7-x86_64/gcc-6.5.0/cmake-3.20.3-vedypwm
-        modules:
-        - cmake/3.20.3-vedypwm
-      buildable: false
     perl:
       externals:
       - spec: [email protected]