Edits to support icon-dsl on Daint

packages/icon/package.py

@@ -23,6 +23,10 @@ class Icon(AutotoolsPackage):
             branch='test_spec',
             git='ssh://[email protected]/C2SM/icon-exclaim.git',
             submodules=True)
+    version('gt4py',
+            branch='icon-dsl',
+            git='ssh://[email protected]/C2SM/icon-exclaim.git',
+            submodules=True)
     version('nwp-master',
             git='ssh://[email protected]/icon/icon-nwp.git',
             submodules=True)
@@ -131,7 +135,7 @@ class Icon(AutotoolsPackage):
         description=
         'Enable extension of eccodes with center specific definition files')
 
-    depends_on('py-icon4py@0.0.1%gcc')
+    depends_on('py-icon4py@main%gcc')
     depends_on('gridtools@master%gcc')
 
     depends_on('infero +quiet', when='+infero')
@@ -562,10 +566,8 @@ def configure_args(self):
                 cuda_host_compiler = self.compiler.cxx
                 cuda_host_compiler_stdcxx_libs = self.compiler.stdcxx_libs
 
-            config_vars['NVCFLAGS'].extend([
-                '-ccbin {0}'.format(cuda_host_compiler), '-g', '-O3',
-                '-arch=sm_{0}'.format(gpu)
-            ])
+            config_vars['NVCFLAGS'].extend(
+                ['-g', '-O3', '-arch=sm_{0}'.format(gpu)])
             # cuda_host_compiler_stdcxx_libs might contain compiler-specific
             # flags (i.e. not the linker -l<library> flags), therefore we put
             # the value to the config_flags directly.

packages/nvidia-blas/package.py

@@ -30,6 +30,13 @@ def libs(self):
                               shared=True,
                               recursive=True)
 
+    @property
+    def headers(self):
+
+        headers = ["cblas.h"]
+
+        return find_headers(headers, root=self.prefix, recursive=True)
+
     def install(self, spec, prefix):
         raise InstallError(
             self.spec.format('{name} is not installable, you need to specify '

packages/nvidia-lapack/package.py

@@ -30,6 +30,13 @@ def libs(self):
                               shared=True,
                               recursive=True)
 
+    @property
+    def headers(self):
+
+        headers = ["lapack.h"]
+
+        return find_headers(headers, root=self.prefix, recursive=True)
+
     def install(self, spec, prefix):
         raise InstallError(
             self.spec.format('{name} is not installable, you need to specify '

packages/py-gt4py/package.py

@@ -23,7 +23,7 @@ class PyGt4py(PythonPackage):
     # Build dependencies
     depends_on('py-wheel', type='build')
     depends_on('py-cython', type='build')
-    depends_on('py-setuptools@59.4:', type='build')
+    depends_on('py-setuptools@60.6.0', type='build')
 
     depends_on('[email protected]:', type=('build', 'run'))
     depends_on('[email protected]:', type=('build', 'run'))
@@ -37,22 +37,21 @@ class PyGt4py(PythonPackage):
     depends_on('[email protected]:', type=('build', 'run'))
     depends_on('[email protected]:', type=('build', 'run'))
     depends_on('[email protected]: +cython', type=('build', 'run'))
-    depends_on('py-deepdiff', type=('build', 'run'))
+    depends_on('py-deepdiff@5.6:', type=('build', 'run'))
     depends_on('[email protected]:', type=('build', 'run'))
     depends_on('[email protected]:', type=('build', 'run'))
     depends_on('[email protected]:', type=('build', 'run'))
     depends_on('[email protected]:', type=('build', 'run'))
     depends_on('[email protected]:', type=('build', 'run'))
     depends_on('[email protected]:', type=('build', 'run'))
     depends_on('[email protected]:', type=('build', 'run'))
-    depends_on('[email protected]:', type=('build', 'run'))
+    depends_on('[email protected].2:', type=('build', 'run'))
     depends_on('[email protected]: +blas +lapack', type=('build', 'run'))
     depends_on('[email protected]:', type=('build', 'run'))
     depends_on('[email protected]:', type=('build', 'run'))
     depends_on('[email protected]:', type=('build', 'run'))
     depends_on('[email protected]:', type=('build', 'run'))
-    depends_on('[email protected]:', type=('build', 'run'))
-    depends_on('[email protected]:', type=('build', 'run'))
+    depends_on('[email protected]:', type=('build', 'run'))
     depends_on('[email protected]:', type=('build', 'run'))
     depends_on('[email protected]:', type=('build', 'run'))
     depends_on('[email protected]:', type=('build', 'run'))

packages/py-icon4py/package.py

@@ -55,7 +55,9 @@ def install(self, spec, prefix):
             args.append('.')
 
         pip = inspect.getmodule(self).pip
-        build_dirs = ['common', 'pyutils', 'testutils', 'atm_dyn_iconam']
+        build_dirs = [
+            'common', 'pyutils', 'testutils', 'liskov', 'atm_dyn_iconam'
+        ]
         for dir in build_dirs:
             with working_dir(os.path.join(self.stage.source_path, dir)):
                 pip(*args)

packages/py-setuptools/package.py

@@ -0,0 +1,11 @@
+from spack.package import *
+from spack.pkg.builtin.py_setuptools import PySetuptools as SpackPySetuptools
+
+
+class PySetuptools(SpackPySetuptools):
+    """A Python utility that aids in the process of downloading, building,
+       upgrading, installing, and uninstalling Python packages."""
+
+    version('60.6.0',
+            sha256=
+            'eb83b1012ae6bf436901c2a2cee35d45b7260f31fd4b65fd1e50a9f99c11d7f8')

packages/py-typing-extensions/package.py

@@ -5,6 +5,9 @@
 class PyTypingExtensions(SpackPyTypingExtensions):
     """Backported and Experimental Type Hints for Python 3.7+"""
 
+    version("4.5.0",
+            sha256=
+            "5cb5f4a79139d699607b3ef622a1dedafa84e115ab0024e0d9c044a9479ca7cb")
     version("4.2.0",
             sha256=
             "f1c24655a0da0d1b67f07e17a5e6b2a105894e6824b92096378bb3668ef02376")