Revert "add patched xpmem, libxml%gcc to nudge concretizer"

This reverts commit 1d7a27a.
C2SM · May 22, 2024 · 5a1e9dc · 5a1e9dc
1 parent 8798abd
commit 5a1e9dc
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 132 deletions.
diff --git a/repos/alps/packages/xpmem/package.py b/repos/alps/packages/xpmem/package.py
diff --git a/repos/alps/packages/xpmem/xpmem_v2.6.5-36.patch b/repos/alps/packages/xpmem/xpmem_v2.6.5-36.patch
diff --git a/test/system_test.py b/test/system_test.py
@@ -313,8 +313,8 @@ def test_install_2024_1_gcc(self):
         spack_install_and_test('icon @2024.1-1 %gcc')
 
     @pytest.mark.no_daint
-    def test_install_2_6_6_nvhpc(self):
-        spack_install_and_test('icon @2.6.6 %nvhpc ^libxml2%gcc')
+    def test_install_2024_1_nvhpc(self):
+        spack_install_and_test('icon @2024.1-1 %nvhpc')
 
     @pytest.mark.no_daint  # libxml2 %nvhpc fails to build
     def test_install_conditional_dependencies(self):
@@ -327,7 +327,7 @@ def test_install_conditional_dependencies(self):
         # +mpi triggers mpi
         # gpu=openacc+cuda triggers cuda
         spack_install_and_test(
-            'icon @nwp-master %nvhpc +grib2 +eccodes-definitions +ecrad +art +dace gpu=openacc+cuda +mpi-gpu +realloc-buf +pgi-inlib ~aes ~jsbach ~ocean ~coupling ~rte-rrtmgp ~loop-exchange ~async-io-rma +mixed-precision ^libxml2%gcc'
+            'icon @2024.1-1 %nvhpc +coupling +rttov serialization=create +emvorado +mpi gpu=openacc+cuda'
         )
 
     @pytest.mark.no_daint  # no time for that