Update spack to v1.1.x

docs/CodeDevelopment.rst

@@ -21,7 +21,7 @@ For more information about environments in general, consider reading the
     spack:
       # add package specs to the `specs` list
       specs:
-      - icon@develop%nvhpc +ecrad +rte-rrtmgp +cuda
+      - icon-nwp@develop%nvhpc +ecrad +rte-rrtmgp +cuda
       - eccodes@2.19.0%nvhpc
       - nvidia-blas%nvhpc
       - nvidia-lapack%nvhpc
@@ -30,8 +30,8 @@ For more information about environments in general, consider reading the
       concretizer:
         unify: true
       develop:
-        icon:
-          spec: icon@develop%nvhpc +ecrad +rte-rrtmgp +cuda
+        icon-nwp:
+          spec: icon-nwp@develop%nvhpc +ecrad +rte-rrtmgp +cuda
           path: ../../../../
 
 The key part of the environments is the ``develop`` keyword.

docs/QuickStart.rst

@@ -43,15 +43,15 @@ To get information about a package, query Spack
 
   $ spack info <package>
   # e.g.
-  $ spack info icon
+  $ spack info icon-nwp
 
 To see what ``spack install`` would install, ask for a spec
 
 .. code-block:: console
 
   $ spack spec <variant>
   # e.g.
-  $ spack spec icon @master +ocean
+  $ spack spec icon-nwp @master +ocean
 
 An unspecfied variant (e.g. ``ocean``) can be concretized to ANY of its values. Spack isn't required to use the default value when a variant is unspecified. The default value only serves as a tiebreaker.
 
@@ -61,7 +61,7 @@ To install a package
 
   $ spack install <variant>
   # e.g.
-  $ spack install icon @master %gcc +ocean
+  $ spack install icon-nwp @master %gcc +ocean
 
 To locate your install, query Spack
 
@@ -131,7 +131,7 @@ To install the environment and so ICON, type
 
 .. code-block:: console
 
-    $ spack develop --path $(pwd) icon@develop
+    $ spack develop --path $(pwd) icon-nwp@develop
     $ spack install
 
 Example to build ICON for CPU with NVHPC on Balfrin:
@@ -140,7 +140,7 @@ Example to build ICON for CPU with NVHPC on Balfrin:
 
     $ SPACK_TAG=$(cat "config/cscs/SPACK_TAG_MCH")
     $ spack env activate -d config/cscs/spack/mch_cpu_double
-    $ spack develop --path $(pwd) icon@develop
+    $ spack develop --path $(pwd) icon-nwp@develop
     $ spack install
 
 ..  attention::
@@ -154,7 +154,7 @@ Out-of-source builds are possible as follows:
     $ mkdir cpu
     $ spack env activate -d config/cscs/spack/mch_cpu_double
     $ # tell spack to build icon in folder cpu
-    $ spack develop --path $(pwd) --build-directory cpu icon@develop
+    $ spack develop --path $(pwd) --build-directory cpu icon-nwp@develop
     $ spack install
 
 By executing the commands above, spack will add some lines directly into ``spack.yaml``:
@@ -163,7 +163,7 @@ By executing the commands above, spack will add some lines directly into ``spack
 
   spack:
     packages:
-      icon:
+      icon-nwp:
         package_attributes:
           build_directory: /scratch/mch/juckerj/icon-nwp/cpu
 

repos/c2sm/packages/ghex/package.py

@@ -21,6 +21,7 @@ class Ghex(CMakePackage, CudaPackage, ROCmPackage):
     version("0.3.0", tag="v0.3.0", submodules=True)
     version("master", branch="master", submodules=True)
 
+    depends_on("c", type="build")
     depends_on("cxx", type="build")
 
     generator("ninja")
@@ -86,7 +87,7 @@ def cmake_args(self):
             arch_str = ";".join(spec.variants["cuda_arch"].value)
             args.append(self.define("CMAKE_CUDA_ARCHITECTURES", arch_str))
             args.append(self.define("GHEX_USE_GPU", True))
-            args.append(self.define("GHEX_GPU_TYPE", "NVIDIA"))
+            args.append(self.define("GHEX_GPU_TYPE", "CUDA"))
 
         if "+rocm" in spec and spec.variants["amdgpu_target"].value != "none":
             arch_str = ";".join(spec.variants["amdgpu_target"].value)

repos/c2sm/packages/icon-exclaim/package.py

@@ -1,7 +1,10 @@
-from spack.pkg.c2sm.icon import Icon
 import shutil
 import os
+
 import spack.error as error
+from spack.package import *
+
+from spack.pkg.c2sm.icon_nwp import IconNwp
 
 
 def validate_variant_dsl(pkg, name, value):
@@ -13,10 +16,18 @@ def validate_variant_dsl(pkg, name, value):
         )
 
 
-class IconExclaim(Icon):
+class IconExclaim(IconNwp):
+    """ICON - is a modeling framework for weather, climate, and environmental
+    prediction.
+    It solves the full three-dimensional non-hydrostatic and compressible
+    Navier-Stokes equations on an icosahedral grid and allows seamless
+    predictions from local to global scales.
+    This is for additional options from the upstream ICON-NWP for exclaime
+    specific features."""
+
     git = "git@github.com:C2SM/icon-exclaim.git"
 
-    maintainers("jonasjucker", "huppd")
+    maintainers("stelliom", "leclairm", "huppd")
 
     version("develop", branch="icon-dsl", submodules=True)