Merge remote-tracking branch 'origin/main' into slimplify

C2SM · Sep 30, 2024 · 7970583 · 7970583
2 parents c7edf11 + 19b45f4
commit 7970583
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 8 deletions.
diff --git a/repo/packages/icon/package.py b/repo/packages/icon/package.py
@@ -541,15 +541,14 @@ def configure_args(self):
                 'NVCC={0}'.format(self.spec['cuda'].prefix.bin.nvcc)
             ])
 
-            libs += self.spec['cuda'].libs
+            # -cuda is an umbrella flag for NVHPC
+            # that pulls in all the needed CUDA libraries and wrappers
+            # It can't go into libs as spack prepends -l
+            flags['LDFLAGS'].append('-cuda')
 
             cuda_host_compiler = self.compiler.cxx
             cuda_host_compiler_stdcxx_libs = self.compiler.stdcxx_libs
 
-            if 'none' in self.spec.variants['dsl'].value:
-                flags['NVCFLAGS'].extend(
-                    ['-ccbin {0}'.format(cuda_host_compiler)])
-
             flags['NVCFLAGS'].extend([
                 '-g', '-O3',
                 '-arch=sm_{0}'.format(self.spec.variants['cuda_arch'].value[0])

diff --git a/repo/packages/py-gt4py/package.py b/repo/packages/py-gt4py/package.py
@@ -16,9 +16,9 @@ class PyGt4py(PythonPackage):
     url = "[email protected]:GridTools/gt4py.git"
 
     version('main', branch='main', git=url)
+    version('1.0.3.9', tag='icon4py_20240912')
     version('1.0.3.8', tag='icon4py_20240711')
     version('1.0.3.7', tag='icon4py_20240521')
-    version('1.0.3.3', tag='icon4py_20240229')
 
     maintainers = ['samkellerhals']
 

diff --git a/repo/packages/py-icon4py/package.py b/repo/packages/py-icon4py/package.py
@@ -21,7 +21,7 @@ class PyIcon4py(PythonPackage):
     maintainers = ["agopal", "samkellerhals"]
 
     version("main", branch="main")
-    version("0.0.12", tag="v0.0.12")
+    version("0.0.13", tag="v0.0.13")
 
     depends_on("py-wheel", type="build")
     depends_on("py-setuptools", type="build")

diff --git a/test/system_test.py b/test/system_test.py
@@ -123,7 +123,7 @@ def test_install_py_gridtools_cpp_install_default():
     spack_install('py-gridtools-cpp')
 
 
-@pytest.mark.parametrize("version", ['1.0.3.3', '1.0.3.7', '1.0.3.8'])
+@pytest.mark.parametrize("version", ['1.0.3.7', '1.0.3.8', '1.0.3.9'])
 def test_install_py_gt4py_for_version(version):
     spack_install(f'py-gt4py @{version}')