Move mpi workaround

C2SM · Nov 13, 2024 · 7b68f2e · 7b68f2e
1 parent e4d3aac
commit 7b68f2e
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 7 deletions.
diff --git a/repos/c2sm/packages/icon-mch/package.py b/repos/c2sm/packages/icon-mch/package.py
@@ -65,11 +65,6 @@ class IconMch(SpackIcon):
     depends_on('netcdf-fortran %nvhpc', when='%nvhpc')
     depends_on('netcdf-fortran %gcc', when='%gcc')
 
-    # WORKAROUND: A build and link dependency should imply that the same compiler is used. This enforces it.
-    with when('+mpi'):
-        depends_on('mpi %nvhpc', when='%nvhpc')
-        depends_on('mpi %gcc', when='%gcc')
-
     def configure_args(self):
         args = super().configure_args()
         super_libs = args.pop()

diff --git a/test/system_test.py b/test/system_test.py
@@ -40,7 +40,7 @@ def test_install_icon_c2sm(compiler):
 
 @pytest.mark.parametrize("compiler", ['gcc', 'nvhpc'])
 def test_install_icon_mch(compiler):
-    spack_install(f'icon-mch %{compiler}')
+    spack_install(f'icon-mch %{compiler} ^cray-mpich%{compiler}')
 
 
 def test_install_icon_mch_conditional_dependencies():
@@ -52,7 +52,7 @@ def test_install_icon_mch_conditional_dependencies():
     # gpu=nvidia-80 triggers cuda
 
     spack_install(
-        'icon-mch %nvhpc +coupling serialization=create +emvorado +mpi gpu=nvidia-80'
+        'icon-mch %nvhpc +coupling serialization=create +emvorado +mpi gpu=nvidia-80 ^cray-mpich%nvhpc'
     )