Merge branch 'nessi.no-2023.06' of gh-nessi:NorESSI/software-layer in…

…to nessi.no-2023.06-EasyBuild/4.9.0/system

create_directory_tarballs.sh

@@ -42,7 +42,7 @@ echo_green "Done! Created tarball ${tarname}."
 tartmp=$(mktemp -t -d scripts.XXXXX)
 mkdir "${tartmp}/${version}"
 tarname="eessi-${version}-scripts-$(date +%s).tar.gz"
-curl -Ls ${SOFTWARE_LAYER_TARBALL_URL} | tar xzf - -C "${tartmp}/${version}" --strip-components=1 --no-wildcards-match-slash --wildcards '*/scripts/'
+curl -Ls ${SOFTWARE_LAYER_TARBALL_URL} | tar xzf - -C "${tartmp}/${version}" --strip-components=1 --no-wildcards-match-slash --wildcards '*/scripts/u*' '*/scripts/gpu_support/'
 tar czf "${tarname}" -C "${tartmp}" "${version}"
 rm -rf "${tartmp}"
 

eb_hooks.py

@@ -202,7 +202,7 @@ def parse_hook_openblas_relax_lapack_tests_num_errors(ec, eprefix):
                 orig_value = ec[cfg_option]
                 ec[cfg_option] = 302
                 print_msg("Maximum number of failing LAPACK tests with numerical errors for %s relaxed to %s (was %s)",
-                      ec.name, ec[cfg_option], orig_value)             ec.name, ec[cfg_option], orig_value)
+                          ec.name, ec[cfg_option], orig_value)
             else:
                 print_msg("Not changing option %s for %s on non-AARCH64", cfg_option, ec.name)
     else:

init/arch_specs/eessi_arch_arm.spec

@@ -1,6 +1,6 @@
 # ARM CPU architecture specifications
 # Software path in EESSI 	| Vendor ID 	| List of defining CPU features
-"aarch64/neoverse-n1"	"ARM"		"asimd"		# Ampere Altra
-"aarch64/neoverse-n1"	""		"asimd"		# AWS Graviton2
-"aarch64/neoverse-v1"	"ARM"		"asimd svei8mm" 
-"aarch64/neoverse-v1"	""		"asimd svei8mm"	# AWS Graviton3
+"aarch64/neoverse_n1"	"ARM"		"asimd"		# Ampere Altra
+"aarch64/neoverse_n1"	""		"asimd"		# AWS Graviton2
+"aarch64/neoverse_v1"	"ARM"		"asimd svei8mm"
+"aarch64/neoverse_v1"	""		"asimd svei8mm"	# AWS Graviton3

init/arch_specs/eessi_arch_x86.spec

@@ -1,6 +1,7 @@
 # x86_64 CPU architecture specifications
 # Software path in EESSI 	| Vendor ID 	| List of defining CPU features
-"x86_64/intel/haswell"		"GenuineIntel"	"avx2 fma" 		# Intel Haswell, Broadwell
+"x86_64/intel/haswell"		"GenuineIntel"	"avx2 fma"		# Intel Haswell
+"x86_64/intel/broadwell"	"GenuineIntel"	"avx2 fma rdseed adx"	# Intel Broadwell
 "x86_64/intel/skylake_avx512"	"GenuineIntel"	"avx2 fma avx512f avx512bw avx512cd avx512dq avx512vl"	# Intel Skylake, Cascade Lake
 "x86_64/amd/zen2"		"AuthenticAMD"	"avx2 fma"		# AMD Rome
 "x86_64/amd/zen3"		"AuthenticAMD"	"avx2 fma vaes"		# AMD Milan, Milan-X

init/bash

@@ -5,6 +5,7 @@ function show_msg {
     echo "$msg"
   fi
 }
+
 # The following method should be safe, but might break if file is a symlink
 # (could switch to $(dirname "$(readlink -f "$BASH_SOURCE")") in that case)
 source $(dirname "$BASH_SOURCE")/eessi_environment_variables
@@ -23,7 +24,7 @@ if [ $? -eq 0 ]; then
     source $EESSI_EPREFIX/usr/share/Lmod/init/bash
 
     # prepend location of modules for EESSI software stack to $MODULEPATH
-    show_msg "Prepending $EESSI_MODULEPATH to \$MODULEPATH..." >> $output
+    show_msg "Prepending $EESSI_MODULEPATH to \$MODULEPATH..."
     module use $EESSI_MODULEPATH
 
     #show_msg ""

init/eessi_defaults

@@ -11,6 +11,5 @@
 export EESSI_CVMFS_REPO="${EESSI_CVMFS_REPO_OVERRIDE:=/cvmfs/pilot.nessi.no}"
 export EESSI_VERSION="${EESSI_VERSION_OVERRIDE:=2023.06}"
 # use archdetect by default, unless otherwise specified
-# 2024-01-16: switch back to archspec with NESSI for now
-export EESSI_USE_ARCHDETECT="${EESSI_USE_ARCHDETECT:=0}"
-export EESSI_USE_ARCHSPEC="${EESSI_USE_ARCHSPEC:=1}"
+export EESSI_USE_ARCHDETECT="${EESSI_USE_ARCHDETECT:=1}"
+export EESSI_USE_ARCHSPEC="${EESSI_USE_ARCHSPEC:=0}"