Allow usage of implicit declarations in mpip and extrae (sigh)

Add packages which you might expect in OS image and thus build with system compiler
Define compilers in terms of CPE wrappers and modules
2024-07-01 09:46:44 -05:00 · 2024-07-01 09:44:27 -05:00 · 2024-07-01 09:29:51 -05:00 · 2024-06-27 10:55:39 -05:00 · 2024-06-27 07:27:42 -05:00 · 2024-06-27 07:27:41 -05:00
3 changed files with 295 additions and 236 deletions
--- a/config-hlrs/compilers.yaml
+++ b/config-hlrs/compilers.yaml
@ -1,43 +1,45 @@
 compilers:
 - compiler:
-    spec: aocc@=4.1.0
+    spec: cce@=18.0.0
    paths:
-      cc: /opt/hlrs/non-spack/release/23.1.0/compiler/aocc/4.1.0/bin/clang
-      cxx: /opt/hlrs/non-spack/release/23.1.0/compiler/aocc/4.1.0/bin/clang++
-      f77: /opt/hlrs/non-spack/release/23.1.0/compiler/aocc/4.1.0/bin/flang
-      fc: /opt/hlrs/non-spack/release/23.1.0/compiler/aocc/4.1.0/bin/flang
-    flags:
-      cflags: null
-      cxxflags: null
-      fflags: null
-    operating_system: rocky8
-    target: x86_64
-    modules: []
-    environment: {}
-    extra_rpaths: []
- compiler:
-    spec: gcc@=12.3.0
-    paths:
-      cc: /opt/hlrs/non-spack/release/23.1.0/compiler/gcc/12.3.0/bin/gcc
-      cxx: /opt/hlrs/non-spack/release/23.1.0/compiler/gcc/12.3.0/bin/g++
-      f77: /opt/hlrs/non-spack/release/23.1.0/compiler/gcc/12.3.0/bin/gfortran
-      fc: /opt/hlrs/non-spack/release/23.1.0/compiler/gcc/12.3.0/bin/gfortran
+      cc: cc
+      cxx: CC
+      f77: ftn
+      fc: ftn
    flags: {}
-    operating_system: rocky8
+    operating_system: sles15
    target: x86_64
-    modules: []
+    modules:
+    - PrgEnv-cray
+    - cce/18.0
    environment: {}
    extra_rpaths: []
 - compiler:
-    spec: gcc@=8.5.0
+    spec: gcc@=13.2.1
+    paths:
+      cc: cc
+      cxx: CC
+      f77: ftn
+      fc: ftn
+    flags: {}
+    operating_system: sles15
+    target: x86_64
+    modules:
+    - PrgEnv-gnu
+    - gcc-native/13.2
+    environment: {}
+    extra_rpaths: []
+- compiler:
+    spec: gcc@=7.5.0
    paths:
      cc: /usr/bin/gcc
      cxx: /usr/bin/g++
      f77: /usr/bin/gfortran
      fc: /usr/bin/gfortran
    flags: {}
-    operating_system: rocky8
+    operating_system: sles15
    target: x86_64
    modules: []
    environment: {}
    extra_rpaths: []
+
--- a/config-hlrs/packages.yaml
+++ b/config-hlrs/packages.yaml
@ -1,93 +1,73 @@
 packages:
  all:
-#    compiler: [gcc@12.3.0, aocc@4.1.0]
-#    compiler: [gcc@8.5.0]
    providers:
-      mpi: [mpt, openmpi]
-      pkgconfig: [pkgconf]
-  openmpi:
+      mpi: [cray-mpich]
+      blas: [cray-libsci]
+      lapack: [cray-libsci]
+      scalapack: [cray-libsci]
+      pkgconf: [pkg-config]
+      zlib-ng: [zlib]
+  cray-mpich:
    externals:
-    - spec: openmpi@4.1.6%gcc@=12.3.0~cuda~cxx~cxx_exceptions~java~memchecker+pmi~static~wrapper-rpath
-        fabrics=ucx schedulers=slurm,tm
-      prefix: /opt/hlrs/non-spack/release/23.1.0/mpi/openmpi/4.1.6-gcc-12.3.0
-    - spec: openmpi@4.1.6%aocc@=4.1.0~cuda~cxx~cxx_exceptions~java~memchecker+pmi~static~wrapper-rpath
-        fabrics=ucx schedulers=slurm,tm
-      prefix: /opt/hlrs/non-spack/release/23.1.0/mpi/openmpi/4.1.6-aocc-4.1.0
+    - spec: cray-mpich@8.1.30%gcc
+      prefix: /opt/cray/pe/mpich/8.1.30/ofi/gnu/12.3
+      modules:
+      - libfabric/1.15.2.0
+    - spec: cray-mpich@8.1.30%cce
+      prefix: /opt/cray/pe/mpich/8.1.30/ofi/cray/17.0
+      modules:
+      - libfabric/1.15.2.0
    buildable: false
-  mpt:
+  libfabric:
    externals:
-      # We have to generate compiler-specific modulefiles in order to
-      # e.g. set custom Fortran modules path. It's hence not possible
-      # to use a single spec based on gcc@8.5.0 although a single spec
-      # would be meaningful due to the _prebuilt_ fashion of MPT.
-    - spec: mpt@2.28%gcc@=12.3.0
-      prefix: /opt/hlrs/non-spack/mpi/mpt/mpt-2.28
-    - spec: mpt@2.28%aocc@=4.1.0
-      prefix: /opt/hlrs/non-spack/mpi/mpt/mpt-2.28
-    buildable: False
-  binutils:
+    - spec: libfabric@1.15.2 fabrics=cxi,tcp,udp
+      prefix: /opt/cray/libfabric/1.15.2.0
+    buildable: false
+  cray-libsci:
    externals:
-    - spec: binutils@2.30.123
+    - spec: cray-libsci@24.03.0%gcc
+      prefix: /opt/cray/pe/libsci/24.03.0/gnu/12.3/x86_64
+      modules:
+      - cray-libsci/24.03.0
+    - spec: cray-libsci@24.03.0%cce
+      prefix: /opt/cray/pe/libsci/24.03.0/cray/17.0/x86_64
+      modules:
+      - cray-libsci/24.03.0
+    buildable: false
+# Packages which have not been discovered by spack external find 
+# and packages which are not in the OS image but low-level.
+# Declare libs as externals only if a -devel OS package is installed
+  elfutils:
+    externals:
+    - spec: elfutils@0.185
      prefix: /usr
    buildable: false
+  numactl:
+    externals:
+    - spec: numactl@2.0.14
+      prefix: /usr
+    buildable: false
+  libxml2:
+    externals:
+    - spec: libxml2@2.9.14
+    buildable: false
+  libdwarf:
+    require: '%gcc@7.5'
+  zstd:
+    require: '%gcc@7.5'
+  zlib:     # zlib@1.2.11 is available but deprecated
+    require: '%gcc@7.5'
+  zlib-ng:
+    require: '%gcc@7.5'
+# packages which have been discovered by spack external find --all
  python:
    externals:
-    - spec: python@3.6.8+bz2+crypt+ctypes+dbm+lzma+nis+pyexpat~pythoncmd+readline+sqlite3+ssl~tkinter+uuid+zlib
-      prefix: /usr
-    buildable: false
-  cmake:
-    externals:
-    - spec: cmake@3.26.5
-      prefix: /usr
-    buildable: false
-  autoconf:
-    externals:
-    - spec: autoconf@2.69
-      prefix: /usr
-    buildable: false
-  automake:
-    externals:
-    - spec: automake@1.16.1
-      prefix: /usr
-    buildable: false
-  bash:
-    externals:
-    - spec: bash@4.4.20
-      prefix: /usr
-    buildable: false
-  berkeley-db:
-    externals:
-    - spec: berkeley-db@5.3.28
-      prefix: /usr
-    buildable: false
-  bison:
-    externals:
-    - spec: bison@3.0.4
-      prefix: /usr
-    buildable: false
-  bzip2:
-    externals:
-    - spec: bzip2@1.0.6
-      prefix: /usr
-    buildable: false
-  coreutils:
-    externals:
-    - spec: coreutils@8.30
-      prefix: /usr
-    buildable: false
-  cpio:
-    externals:
-    - spec: cpio@2.12
+    - spec: python@3.6.15+bz2+crypt+ctypes+dbm+lzma+nis+pyexpat~pythoncmd+readline+sqlite3+ssl~tkinter+uuid+zlib
      prefix: /usr
    buildable: false
  curl:
    externals:
-    - spec: curl@7.61.1+gssapi+ldap+nghttp2
-      prefix: /usr
-    buildable: false
-  diffutils:
-    externals:
-    - spec: diffutils@3.6
+    - spec: curl@8.0.1+gssapi+ldap+nghttp2
      prefix: /usr
    buildable: false
  dos2unix:
@ -95,39 +75,14 @@ packages:
    - spec: dos2unix@7.4.0
      prefix: /usr
    buildable: false
-  file:
+  openssl:
    externals:
-    - spec: file@5.33
+    - spec: openssl@1.1.1l
      prefix: /usr
    buildable: false
-  findutils:
+  bzip2:
    externals:
-    - spec: findutils@4.6.0
-      prefix: /usr
-    buildable: false
-  flex:
-    externals:
-    - spec: flex@2.6.1+lex
-      prefix: /usr
-    buildable: false
-  gawk:
-    externals:
-    - spec: gawk@4.2.1
-      prefix: /usr
-    buildable: false
-  gettext:
-    externals:
-    - spec: gettext@0.19.8.1
-      prefix: /usr
-    buildable: false
-  ghostscript:
-    externals:
-    - spec: ghostscript@9.27
-      prefix: /usr
-    buildable: false
-  git:
-    externals:
-    - spec: git@2.39.3~tcltk
+    - spec: bzip2@1.0.8
      prefix: /usr
    buildable: false
  gmake:
@ -135,116 +90,19 @@ packages:
    - spec: gmake@4.2.1
      prefix: /usr
    buildable: false
-  groff:
+  coreutils:
    externals:
-    - spec: groff@1.22.3
-      prefix: /usr
-    buildable: false
-  hwloc:
-    externals:
-    - spec: hwloc@2.2.0
-      prefix: /usr
-    buildable: false
-  krb5:
-    externals:
-    - spec: krb5@1.18.2
-      prefix: /usr
-    buildable: false
-  libfuse:
-    externals:
-    - spec: libfuse@2.9.7
-      prefix: /usr
-    - spec: libfuse@3.3.0
-      prefix: /usr
-    buildable: false
-  libtool:
-    externals:
-    - spec: libtool@2.4.6
-      prefix: /usr
-    buildable: false
-  lustre:
-    externals:
-    - spec: lustre@2.12.9_ddn38
-      prefix: /usr
-    buildable: false
-  m4:
-    externals:
-    - spec: m4@1.4.18
-      prefix: /usr
-    buildable: false
-  ncurses:
-    externals:
-    - spec: ncurses@6.1.20180224+termlib abi=6
+    - spec: coreutils@8.32
      prefix: /usr
    buildable: false
  openjdk:
    externals:
-    - spec: openjdk@1.8.0_402-b06
+    - spec: openjdk@11.0.19_0-suse-150000.3.96.1-x8664
      prefix: /usr
    buildable: false
-  openssh:
+  binutils:
    externals:
-    - spec: openssh@8.0p1
-      prefix: /usr
-    buildable: false
-  openssl:
-    externals:
-    - spec: openssl@1.1.1k
-      prefix: /usr
-    buildable: false
-  perl:
-    externals:
-    - spec: perl@5.26.3~cpanm+opcode+open+shared+threads
-      prefix: /usr
-    buildable: false
-  pkgconf:
-    externals:
-    - spec: pkgconf@1.4.2
-      prefix: /usr
-    buildable: false
-  rdma-core:
-    externals:
-    - spec: rdma-core@43.0
-      prefix: /usr
-    buildable: false
-  rsync:
-    externals:
-    - spec: rsync@3.1.3
-      prefix: /usr
-    buildable: false
-  sed:
-    externals:
-    - spec: sed@4.5
-      prefix: /usr
-    buildable: false
-  sqlite:
-    externals:
-    - spec: sqlite@3.26.0+fts~functions+rtree
-      prefix: /usr
-    buildable: false
-  subversion:
-    externals:
-    - spec: subversion@1.10.2
-      prefix: /usr
-    buildable: false
-  swig:
-    externals:
-    - spec: swig@3.0.12
-      prefix: /usr
-    buildable: false
-  tar:
-    externals:
-    - spec: tar@1.30
-      prefix: /usr
-    buildable: false
-  which:
-    externals:
-    - spec: which@2.21
-      prefix: /usr
-    buildable: false
-  xz:
-    externals:
-    - spec: xz@5.2.4
+    - spec: binutils@2.39.0
      prefix: /usr
    buildable: false
  zip:
@ -252,3 +110,190 @@ packages:
    - spec: zip@3.0
      prefix: /usr
    buildable: false
+  cpio:
+    externals:
+    - spec: cpio@2.13
+      prefix: /usr
+    buildable: false
+  subversion:
+    externals:
+    - spec: subversion@1.14.1
+      prefix: /usr
+    buildable: false
+  xz:
+    externals:
+    - spec: xz@5.2.3
+      prefix: /usr
+    buildable: false
+  lustre:
+    externals:
+    - spec: lustre@2.15.0.7_rc2_cray_25_ga33b7d9
+      prefix: /usr
+    buildable: false
+  bison:
+    externals:
+    - spec: bison@3.0.4
+      prefix: /usr
+    buildable: false
+  git:
+    externals:
+    - spec: git@2.35.3+tcltk
+      prefix: /usr
+    buildable: false
+  go:
+    externals:
+    - spec: go@1.18.10
+      prefix: /usr
+    buildable: false
+  hwloc:
+    externals:
+    - spec: hwloc@2.8.0
+      prefix: /usr
+    buildable: false
+  gnupg:
+    externals:
+    - spec: gnupg@2.2.27
+      prefix: /usr
+    buildable: false
+  rdma-core:
+    externals:
+    - spec: rdma-core@38.3
+      prefix: /usr
+    buildable: false
+  groff:
+    externals:
+    - spec: groff@1.22.4
+      prefix: /usr
+    buildable: false
+  ghostscript:
+    externals:
+    - spec: ghostscript@9.52
+      prefix: /usr
+    buildable: false
+  cvs:
+    externals:
+    - spec: cvs@1.12.13
+      prefix: /usr
+    buildable: false
+  go-bootstrap:
+    externals:
+    - spec: go-bootstrap@1.18.10
+      prefix: /usr
+    buildable: false
+  cmake:
+    externals:
+    - spec: cmake@3.20.4
+      prefix: /usr
+    buildable: false
+  ncurses:
+    externals:
+    - spec: ncurses@6.1.20180317+termlib abi=6
+      prefix: /usr
+    buildable: false
+  bash:
+    externals:
+    - spec: bash@4.4.23
+      prefix: /usr
+    buildable: false
+  pkg-config:
+    externals:
+    - spec: pkg-config@0.29.2
+      prefix: /usr
+    buildable: false
+  flex:
+    externals:
+    - spec: flex@2.6.4+lex
+      prefix: /usr
+    buildable: false
+  rsync:
+    externals:
+    - spec: rsync@3.2.3
+      prefix: /usr
+    buildable: false
+  sed:
+    externals:
+    - spec: sed@4.4
+      prefix: /usr
+    buildable: false
+  gettext:
+    externals:
+    - spec: gettext@0.20.2
+      prefix: /usr
+    buildable: false
+  automake:
+    externals:
+    - spec: automake@1.15.1
+      prefix: /usr
+    buildable: false
+  m4:
+    externals:
+    - spec: m4@1.4.18
+      prefix: /usr
+    buildable: false
+  which:
+    externals:
+    - spec: which@2.21
+      prefix: /usr
+    buildable: false
+  file:
+    externals:
+    - spec: file@5.32
+      prefix: /usr
+    buildable: false
+  perl:
+    externals:
+    - spec: perl@5.26.1~cpanm+opcode+open+shared+threads
+      prefix: /usr
+    buildable: false
+  ruby:
+    externals:
+    - spec: ruby@2.5.9
+      prefix: /usr
+    buildable: false
+  autoconf:
+    externals:
+    - spec: autoconf@2.69
+      prefix: /usr
+    buildable: false
+  gawk:
+    externals:
+    - spec: gawk@4.2.1
+      prefix: /usr
+    buildable: false
+  diffutils:
+    externals:
+    - spec: diffutils@3.6
+      prefix: /usr
+    buildable: false
+  tar:
+    externals:
+    - spec: tar@1.34
+      prefix: /usr
+    buildable: false
+  openssh:
+    externals:
+    - spec: openssh@8.4p1
+      prefix: /usr
+    buildable: false
+  sqlite:
+    externals:
+    - spec: sqlite@3.39.3+fts~functions+rtree
+      prefix: /usr
+    buildable: false
+  findutils:
+    externals:
+    - spec: findutils@4.8.0
+      prefix: /usr
+    buildable: false
+  libtool:
+    externals:
+    - spec: libtool@2.4.6
+      prefix: /usr
+    buildable: false
+  libfuse:
+    externals:
+    - spec: libfuse@2.9.7
+      prefix: /usr
+    - spec: libfuse@3.10.5
+      prefix: /usr
+    buildable: false
--- a/environments/hlrs/spack.yaml
+++ b/environments/hlrs/spack.yaml
@ -1,10 +1,22 @@
-# This is a Spack Environment file.
-#
-# It describes a set of packages to be installed, along with
-# configuration settings.
+# This is a Spack Environment file fot he main HLRS software stack
 spack:
+#  definitions:
+#    core_compiler: [gcc@7.5]
+#    compilers: [gcc@13.2, cce@18.0]    
+#  packages:
+#    all:
+#      compiler: [gcc@13.2, cce@18.0]
  # add package specs to the `specs` list
-  specs: []
+  specs:
+    - matrix:    # modules for low-level tools
+      - [libunwind, papi]
+      - ['%gcc@7.5']
+#      - [$%core_compiler]
+    - matrix:
+      - [mpip, extrae]
+      - ['cflags="-Wno-error=implicit-function-declaration -Wno-error=implicit-int"']
+      - [^mpi]
+      - ['%gcc@13.2', '%cce@18.0'] 
  view: false
  concretizer:
    unify: when_possible
Author	SHA1	Message	Date
Jose Gracia	f6c3102345	Allow usage of implicit declarations in mpip and extrae (sigh)	2024-07-01 09:46:44 -05:00
Jose Gracia	4a5fef92cc	Add packages which you might expect in OS image and thus build with system compiler	2024-07-01 09:44:27 -05:00
Jose Gracia	9347a7a8ef	Define compilers in terms of CPE wrappers and modules	2024-07-01 09:29:51 -05:00
Jose Gracia	9dd9c29847	Declare provider for pkg-conf	2024-06-27 10:55:39 -05:00
Jose Gracia	40e3cab5ce	Add some test packages to hlrs environment	2024-06-27 07:27:42 -05:00
Jose Gracia	927f3567bc	Add cray-libsci to packages	2024-06-27 07:27:41 -05:00
Jose Gracia	306e1e96fc	Add cray-mpich and dependencies to packages	2024-06-27 07:27:41 -05:00
Jose Gracia	0f89706e95	Add redoak CPE 24.03 compilers	2024-06-27 07:27:41 -05:00
Jose Gracia	b9ee619e79	Add external OS packages to clean packages.yaml	2024-06-26 04:01:17 -05:00