Merge branch 'main' of gitlab.epfl.ch:SCITAS/software-stack/scitas-software-stacks

ci/install_compilers.sh

@@ -73,6 +73,13 @@ for c in  "core_compilers" "compilers"; do
     fi
 done
 
+export target=$(jq -Mrc '
+.stack.targets
+ | to_entries
+ | .[]
+ | select(.key == env.environment)
+ | .value' ${STACK_CONFIG})
+
 compilers_specs=$(jq -Mr '
 .stack
  | .system_arch as $arch
@@ -89,14 +96,15 @@ system_compiler=$(jq -Mrc '
 ' ${STACK_CONFIG})
 
 core_compilers=$(jq -Mrc '.stack
+ | .system_arch as $arch
  | .system_compiler + .core_compilers
- | map("\(.compiler)@\(.version)")
+ | map("\(.compiler)@\(.version) \($arch)")
 ' ${STACK_CONFIG})
 
 compilers=$(jq -Mrc '.stack
  | .compilers
  | map(select(.constraint == null))
- | map("\(.compiler)@\(.version)")
+ | map("\(.compiler)@\(.version) target=\(env.target)")
 ' ${STACK_CONFIG})
 
 echo "definitions:" > ${SPACK_SYSTEM_CONFIG_PATH}/compiler_definitions.yaml
@@ -123,7 +131,7 @@ jq -Mrc '
  | .system_arch as $arch
  | .compilers
  | to_entries
- | map(" - compiler_\(.key): [\(.value.compiler)@\(.value.version)]")
+ | map(" - compiler_\(.key): [\(.value.compiler)@\(.value.version) target=\(env.target)]")
  | .[]
 '  ${STACK_CONFIG} >> ${SPACK_SYSTEM_CONFIG_PATH}/compiler_definitions.yaml
 

ci/setup_spack.sh

@@ -84,3 +84,19 @@ spack/bin/spack buildcache keys \
 #spack/bin/spack buildcache update-index /buildcache
 
 cp ${STACK_CONFIG_PATH}/packages_${environment}.yaml ${SPACK_SYSTEM_CONFIG_PATH}/packages_env.yaml
+
+echo "packages:" > ${SPACK_SYSTEM_CONFIG_PATH}/packages_system.yaml
+export system_compiler=$(jq -Mrc '
+.stack
+ | .system_arch as $arch
+ | .system_compiler
+ | to_entries
+ | .[].value
+ | "\(.compiler)@\(.version) \($arch)"
+' ${STACK_CONFIG})
+
+jq -Mrc '
+.stack.system_packages
+ | map("  \(.):\n    require:\n    - spec: \"%\(env.system_compiler)\"")
+ | .[]
+' ${STACK_CONFIG} >> ${SPACK_SYSTEM_CONFIG_PATH}/packages_system.yaml

stacks/pinot-noir/config.json

@@ -22,6 +22,13 @@
                 "version": "11.4.1"
             }
         },
+        "targets": {
+            "helvetios": "skylake_avx512",
+            "izar": "cascadelake",
+            "jed": "icelake",
+            "kuma_l40s": "zen4",
+            "kuma_h100": "zen4"
+        },
         "compilers": {
             "gcc_stable": {
                 "compiler": "gcc",
@@ -45,7 +52,32 @@
                 "version": "4.2.0",
                 "constraint": "env['environment'] in ['jed']"
             }
-
-        }
+        },
+        "system_packages": [
+            "autoconf",
+            "automake",
+            "autotools",
+            "ca-certificates-mozilla",
+            "cmake",
+            "diffutils",
+            "expat",
+            "findutils",
+            "freetype",
+            "gettext",
+            "glibc",
+            "gmake",
+            "gnuplot",
+            "libevent",
+            "m4",
+            "ncurses",
+            "openssl",
+            "pcre",
+            "perl",
+            "pkgconf",
+            "readline",
+            "sqlite",
+            "texinfo",
+            "zlib-ng"
+        ]
     }
 }

stacks/pinot-noir/spack.yaml

@@ -2,7 +2,7 @@ spack:
   include:
       - compiler_definitions.yaml
       - packages_env.yaml
-
+      - packages_system.yaml
   definitions:
     # -------------------------------------------------------------------------
     # PE definition