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

…to nessi-2023.06-gnuplot/5.4.4-GCCcore/11.3.0

.github/workflows/tests_archdetect.yml

@@ -9,16 +9,17 @@ jobs:
     strategy:
       matrix:
         proc_cpuinfo:
-          - x86_64/intel/haswell/archspec-linux-E5-2680-v3
+          - x86_64/intel/broadwell/archspec-linux-E5-2683-v4
           - x86_64/intel/skylake_avx512/archspec-linux-6132
           - x86_64/amd/zen2/Azure-CentOS7-7V12
-          - x86_64/amd/zen3/Azure-CentOS7-7V73X
           # commented out since these targets are currently not supported in pilot.nessi.no repo
           # (and some tests assume that the corresponding subdirectory in software layer is there)
-          # - ppc64le/power9le/unknown-power9le
           # - aarch64/neoverse-n1/Azure-Ubuntu20-Altra
           # - aarch64/neoverse-n1/AWS-awslinux-graviton2
           # - aarch64/neoverse-v1/AWS-awslinux-graviton3
+          # - ppc64le/power9le/unknown-power9le
+          # - x86_64/intel/haswell/archspec-linux-E5-2680-v3
+          # - x86_64/amd/zen3/Azure-CentOS7-7V73X
       fail-fast: false
     steps:
     - name: checkout
@@ -62,7 +63,7 @@ jobs:
               echo "Test for ${{matrix.proc_cpuinfo}} FAILED: $CPU_ARCHES" >&2
               exit 1
           fi
-          # Check all those architectures actually exist (if this EESSI version has been populated already)
+          # Check all those architectures actually exist (if this NESSI version has been populated already)
           if [ -d ${EESSI_PREFIX}/software/linux ]; then
             for dir in $(echo "$CPU_ARCHES" | tr ':' '\n'); do
                 # Search all EESSI versions as we may drop support at some point

.github/workflows/tests_scripts.yml

@@ -35,6 +35,15 @@ jobs:
       run: |
         ./install_apptainer_ubuntu.sh
 
+    - name: prepare repos info for NESSI
+      run: |
+        curl -Ls https://github.com/NorESSI/filesystem-layer/tarball/v0.4.1 | tar xzf - --strip-components=1 --no-wildcards-match-slash --wildcards '*/repos/'
+
+    - name: list available repos
+      run: |
+        export EESSI_REPOS_CFG_DIR_OVERRIDE=${PWD}/repos
+        ./eessi_container.sh --list-repos
+
     - name: test load_easybuild_module.sh script
       run: |
         # bind current directory into container as /software-layer
@@ -72,7 +81,8 @@ jobs:
 
           # run wrapper script + capture & check output
           out="${PWD}/eb-${EB_VERSION}.out"
-          ./eessi_container.sh --access rw --mode run --verbose /software-layer/run_in_compat_layer_env.sh /software-layer/eb-${EB_VERSION}.sh 2>&1 | tee ${out}
+          export EESSI_REPOS_CFG_DIR_OVERRIDE=${PWD}/repos
+          ./eessi_container.sh --access rw --mode run --verbose --repository nessi.no-2023.06-software /software-layer/run_in_compat_layer_env.sh /software-layer/eb-${EB_VERSION}.sh 2>&1 | tee ${out}
           pattern="^This is EasyBuild ${EB_VERSION} "
           grep "${pattern}" ${out} || (echo "Pattern '${pattern}' not found in output!" && exit 1)
         done
@@ -83,14 +93,16 @@ jobs:
           export SINGULARITY_BIND="${PWD}:/software-layer"
           # force using x86_64/generic, to avoid triggering an installation from scratch
           sed -i "s@./EESSI-install-software.sh@\"export EESSI_SOFTWARE_SUBDIR_OVERRIDE='x86_64/generic'; ./EESSI-install-software.sh\"@g" install_software_layer.sh
-          ./eessi_container.sh --mode run --verbose /software-layer/install_software_layer.sh
+          export EESSI_REPOS_CFG_DIR_OVERRIDE=${PWD}/repos
+          ./eessi_container.sh --mode run --verbose --repository nessi.no-2023.06-software /software-layer/install_software_layer.sh
 
     - name: test create_directory_tarballs.sh script
       run: |
           # bind current directory into container as /software-layer
           export SINGULARITY_BIND="${PWD}:/software-layer"
           # scripts need to be copied to /tmp,
           # since create_directory_tarballs.sh must be accessible from within build container
-          ./eessi_container.sh --mode run --verbose /software-layer/create_directory_tarballs.sh 2023.06
+          export EESSI_REPOS_CFG_DIR_OVERRIDE=${PWD}/repos
+          ./eessi_container.sh --mode run --verbose --repository nessi.no-2023.06-software /software-layer/create_directory_tarballs.sh 2023.06
           # check if tarballs have been produced
           ls -l *.tar.gz

init/arch_specs/eessi_arch_x86.spec

@@ -1,7 +1,9 @@
 # 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
+# 2024-01-23: comment out haswell as it is not supported by NESSI and causes CI
+# to fail
+# "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
+# "x86_64/amd/zen3"		"AuthenticAMD"	"avx2 fma vaes"		# AMD Milan, Milan-X

tests/archdetect/x86_64/intel/broadwell/archspec-linux-E5-2683-v4.all.output

@@ -0,0 +1 @@
+x86_64/intel/broadwell:x86_64/generic

tests/archdetect/x86_64/intel/broadwell/archspec-linux-E5-2683-v4.cpuinfo

@@ -0,0 +1,27 @@
+processor	: 0
+vendor_id	: GenuineIntel
+cpu family	: 6
+model		: 79
+model name	: Intel(R) Xeon(R) CPU E5-2683 v4 @ 2.10GHz
+stepping	: 1
+microcode	: 0xb000014
+cpu MHz		: 3000.000
+cache size	: 40960 KB
+physical id	: 0
+siblings	: 32
+core id		: 0
+cpu cores	: 16
+apicid		: 0
+initial apicid	: 0
+fpu		: yes
+fpu_exception	: yes
+cpuid level	: 20
+wp		: yes
+flags		: fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe syscall nx pdpe1gb rdtscp lm constant_tsc arch_perfmon pebs bts rep_good nopl xtopology nonstop_tsc cpuid aperfmperf pni pclmulqdq dtes64 monitor ds_cpl vmx smx est tm2 ssse3 sdbg fma cx16 xtpr pdcm pcid dca sse4_1 sse4_2 x2apic movbe popcnt aes xsave avx f16c rdrand lahf_lm abm 3dnowprefetch cpuid_fault epb cat_l3 cdp_l3 invpcid_single pti intel_ppin tpr_shadow vnmi flexpriority ept vpid ept_ad fsgsbase tsc_adjust bmi1 hle avx2 smep bmi2 erms invpcid rtm cqm rdt_a rdseed adx smap intel_pt xsaveopt cqm_llc cqm_occup_llc cqm_mbm_total cqm_mbm_local dtherm ida arat pln pts
+vmx flags	: vnmi preemption_timer posted_intr invvpid ept_x_only ept_ad ept_1gb flexpriority apicv tsc_offset vtpr mtf vapic ept vpid unrestricted_guest vapic_reg vid ple shadow_vmcs pml
+bugs		: cpu_meltdown spectre_v1 spectre_v2 spec_store_bypass l1tf mds swapgs taa itlb_multihit mmio_stale_data
+bogomips	: 4199.76
+clflush size	: 64
+cache_alignment	: 64
+address sizes	: 46 bits physical, 48 bits virtual
+power management:

tests/archdetect/x86_64/intel/broadwell/archspec-linux-E5-2683-v4.output

@@ -0,0 +1 @@
+x86_64/intel/broadwell

tests/archdetect/x86_64/intel/skylake_avx512/archspec-linux-6132.all.output

@@ -1 +1 @@
-x86_64/intel/skylake_avx512:x86_64/intel/haswell:x86_64/generic
+x86_64/intel/skylake_avx512:x86_64/intel/broadwell:x86_64/generic