Ubuntu euler (#956)

* inital update * remove blas variant, remove serialbox * remove old extensions * Delete sysconfigs/tsa/modules.yaml * do not use upstreams * py-toolz available in upstream spack * GitHub Action: Apply Pep8-formatting * remove upstreams * add version 0.12.3 * cython@2 for [email protected] * GitHub Action: Apply Pep8-formatting * inherit from upstream, introduce v 2.4.0 * GitHub Action: Apply Pep8-formatting * lock pip to :23.0 for py-cmake * lock eckit-version for infero * temporary deactivate testsuite for int2lm * Revert "temporary deactivate testsuite for int2lm" This reverts commit 2834f46. * remove gmake on Daint * remove deprecated config * add gmake again * Remove faulty classification as "spack locking problem" * [python] no default ssl package * [fdb] Remove package and tests * [fckit] Remove package and tests * [numpy] Remove package and tests. * Revert "[fckit] Remove package and tests" This reverts commit fe41fc2. * Fix FDB related tests (#920) * test:fix(pytorch-fortran): try explicit dependency on (c/g)make%gcc * upd: point to icon-c2sm branch spack_v0.21.1 * Update system_test.py * GitHub Action: Apply Pep8-formatting * upd: cosmo spack env * skip failing tests * GitHub Action: Apply Pep8-formatting * add link to latest spack version * downgrade icon4py,gt4py mostly to build-tests, add fdb again * GitHub Action: Apply Pep8-formatting * add upstreams for Daint * add upstream to config * adapt unit-test * Use single-thread make for flexpart-cosmo * Update system_test.py * Fixes to gt4py in v0.21.1 (#937) * locking typing extensions version * Update system_test.py * Update system_test.py * Update system_test.py * GitHub Action: Apply Pep8-formatting --------- Co-authored-by: Abishek Gopal <[email protected]> Co-authored-by: github-actions <[email protected]> * Update system_test.py (#938) * drop test for nvhpc-cpu ICON * cleanup * [py-gt4py] fixes to typing-extensions versions (#939) * fixes to typing-extensions versions * GitHub Action: Apply Pep8-formatting * Adding typing-extensions v4.10.0 * fixing typo in versions --------- Co-authored-by: github-actions <[email protected]> * remove irrelevant test * [cdo] Remove conflict * use upstream from Euler * allow host mismatch * add patch for boz-literals * remove unused import that causes trouble on Euler * replace copy_tree with install_tree * add compiler again * add gcc 8.5.0 for COSMO * remove patch * fix cosmo package --------- Co-authored-by: Jonas Jucker <[email protected]> Co-authored-by: Dominic Hofer <[email protected]> Co-authored-by: github-actions <[email protected]> Co-authored-by: Victoria Cherkas <[email protected]> Co-authored-by: Matthieu <[email protected]> Co-authored-by: Michael Jähn <[email protected]> Co-authored-by: abishekg7 <[email protected]> Co-authored-by: Abishek Gopal <[email protected]> Co-authored-by: Dominic Hofer <[email protected]>
C2SM · Jun 25, 2024 · 320c455 · 320c455
1 parent fd16d04
commit 320c455
Show file tree

Hide file tree

Showing 8 changed files with 36 additions and 231 deletions.
diff --git a/repos/c2sm/packages/cosmo/package.py b/repos/c2sm/packages/cosmo/package.py
@@ -208,7 +208,7 @@ def setup_build_environment(self, env):
             env.set(
                 'NETCDFL', '-L' + self.spec['netcdf-fortran'].prefix +
                 '/lib -lnetcdff -L' + self.spec['netcdf-c'].prefix +
-                '/lib64 -lnetcdf')
+                '/lib -lnetcdf')
             env.set('NETCDFI',
                     '-I' + self.spec['netcdf-fortran'].prefix + '/include')
 
@@ -230,7 +230,7 @@ def setup_build_environment(self, env):
 
         # MPI library
         if self.mpi_spec.name == 'openmpi':
-            env.set('MPIL', '-L' + self.mpi_spec.prefix + ' -lmpi_cxx')
+            env.set('MPIL', '-L' + self.mpi_spec.prefix + ' -lmpi')
 
         else:
             env.set('MPIL', '-L' + self.spec['mpi'].prefix + ' -lmpich')

diff --git a/repos/c2sm/packages/fdb-fortran/package.py b/repos/c2sm/packages/fdb-fortran/package.py
@@ -1,5 +1,4 @@
 from spack import *
-from distutils.dir_util import copy_tree
 
 
 class FdbFortran(CMakePackage):

diff --git a/repos/c2sm/packages/flexpart-cosmo/package.py b/repos/c2sm/packages/flexpart-cosmo/package.py
@@ -5,8 +5,7 @@
 
 #
 from spack import *
-from distutils.dir_util import copy_tree
-from llnl.util.filesystem import working_dir
+from llnl.util.filesystem import working_dir, install_tree
 
 
 class FlexpartCosmo(MakefilePackage):
@@ -51,5 +50,5 @@ def install(self, spec, prefix):
         mkdir(prefix.share)
         mkdir(prefix.share + '/test/')
         mkdir(prefix.share + '/options/')
-        copy_tree('options/', prefix.share + '/options/')
+        install_tree('options/', prefix.share + '/options/')
         install('bin/FLEXPART', prefix.bin)
diff --git a/sysconfigs/euler/compilers.yaml b/sysconfigs/euler/compilers.yaml
@@ -1,13 +1,29 @@
 compilers:
+# upstream 2024-05
 - compiler:
-    spec: gcc@=9.3.0
+    spec: gcc@=13.2.0
     paths:
-      cc: /cluster/apps/gcc-4.8.5/gcc-9.3.0-mjmsvu3362usxjr7tas4ywkd2e4ko5x3/bin/gcc
-      cxx: /cluster/apps/gcc-4.8.5/gcc-9.3.0-mjmsvu3362usxjr7tas4ywkd2e4ko5x3/bin/g++
-      f77: /cluster/apps/gcc-4.8.5/gcc-9.3.0-mjmsvu3362usxjr7tas4ywkd2e4ko5x3/bin/gfortran
-      fc: /cluster/apps/gcc-4.8.5/gcc-9.3.0-mjmsvu3362usxjr7tas4ywkd2e4ko5x3/bin/gfortran
+      cc: /cluster/software/stacks/2024-05/spack/opt/spack/linux-ubuntu22.04-x86_64_v3/gcc-11.4.0/gcc-13.2.0-6t2bdhlkrktlyopht3nbmjz3emlsqeog/bin/gcc
+      cxx: /cluster/software/stacks/2024-05/spack/opt/spack/linux-ubuntu22.04-x86_64_v3/gcc-11.4.0/gcc-13.2.0-6t2bdhlkrktlyopht3nbmjz3emlsqeog/bin/g++
+      f77: /cluster/software/stacks/2024-05/spack/opt/spack/linux-ubuntu22.04-x86_64_v3/gcc-11.4.0/gcc-13.2.0-6t2bdhlkrktlyopht3nbmjz3emlsqeog/bin/gfortran
+      fc: /cluster/software/stacks/2024-05/spack/opt/spack/linux-ubuntu22.04-x86_64_v3/gcc-11.4.0/gcc-13.2.0-6t2bdhlkrktlyopht3nbmjz3emlsqeog/bin/gfortran
     flags: {}
-    operating_system: centos7
+    operating_system: ubuntu22.04
+    target: x86_64
+    modules: []
+    environment: {}
+    extra_rpaths: []
+
+# upstream 2024-04
+- compiler:
+    spec: gcc@=8.5.0
+    paths:
+      cc: /cluster/software/stacks/2024-04/spack/opt/spack/linux-ubuntu22.04-x86_64_v3/gcc-11.4.0/gcc-8.5.0-negtblh6hyfq2jghbmz6pz56l64sa4t3/bin/gcc
+      cxx: /cluster/software/stacks/2024-04/spack/opt/spack/linux-ubuntu22.04-x86_64_v3/gcc-11.4.0/gcc-8.5.0-negtblh6hyfq2jghbmz6pz56l64sa4t3/bin/g++
+      f77: /cluster/software/stacks/2024-04/spack/opt/spack/linux-ubuntu22.04-x86_64_v3/gcc-11.4.0/gcc-8.5.0-negtblh6hyfq2jghbmz6pz56l64sa4t3/bin/gfortran
+      fc: /cluster/software/stacks/2024-04/spack/opt/spack/linux-ubuntu22.04-x86_64_v3/gcc-11.4.0/gcc-8.5.0-negtblh6hyfq2jghbmz6pz56l64sa4t3/bin/gfortran
+    flags: {}
+    operating_system: ubuntu22.04
     target: x86_64
     modules: []
     environment: {}

diff --git a/sysconfigs/euler/concretizer.yaml b/sysconfigs/euler/concretizer.yaml
@@ -1,2 +1,4 @@
 concretizer:
-  reuse: true
+  reuse: true
+  targets:
+    host_compatible: false
diff --git a/sysconfigs/euler/packages.yaml b/sysconfigs/euler/packages.yaml
diff --git a/sysconfigs/euler/repos.yaml b/sysconfigs/euler/repos.yaml
@@ -1,2 +1,3 @@
 repos:
-  - '$spack/../repos/c2sm'
+  - '$spack/../repos/c2sm'
+  - /cluster/software/repo/2024-05
diff --git a/sysconfigs/euler/upstreams.yaml b/sysconfigs/euler/upstreams.yaml
@@ -0,0 +1,5 @@
+upstreams:
+  2024-05:
+    install_tree: /cluster/software/stacks/2024-05/spack/opt/spack
+  2024-04:
+    install_tree: /cluster/software/stacks/2024-04/spack/opt/spack