From 6f726328424fce66d65ec025d4191aa4de6afa5d Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Mon, 30 Sep 2024 16:54:19 +0200 Subject: [PATCH 1/2] disable using x86_64/amd/zen3 installations when x86_64/amd/zen4 is detected --- init/eessi_environment_variables | 10 ---------- init/modules/EESSI/2023.06.lua | 9 --------- 2 files changed, 19 deletions(-) diff --git a/init/eessi_environment_variables b/init/eessi_environment_variables index 8c10b1fca8..1f16204b36 100644 --- a/init/eessi_environment_variables +++ b/init/eessi_environment_variables @@ -48,16 +48,6 @@ if [ -d $EESSI_PREFIX ]; then fi if [ ! -z $EESSI_SOFTWARE_SUBDIR ]; then - # use x86_64/amd/zen3 for now when AMD Genoa (Zen4) CPU is detected, - # since optimized software installations for Zen4 are a work-in-progress, - # see https://gitlab.com/eessi/support/-/issues/37 - if [[ "${EESSI_SOFTWARE_SUBDIR}" == "x86_64/amd/zen4" ]]; then - if [ -z $EESSI_SOFTWARE_SUBDIR_OVERRIDE ]; then - export EESSI_SOFTWARE_SUBDIR="x86_64/amd/zen3" - echo -e "\e[33mSticking to ${EESSI_SOFTWARE_SUBDIR} for now, since optimized installations for AMD Genoa (Zen4) are a work in progress, see https://gitlab.com/eessi/support/-/issues/37 for more information\e[0m" - fi - fi - show_msg "Using ${EESSI_SOFTWARE_SUBDIR} as software subdirectory." export EESSI_SOFTWARE_PATH=$EESSI_PREFIX/software/$EESSI_OS_TYPE/$EESSI_SOFTWARE_SUBDIR diff --git a/init/modules/EESSI/2023.06.lua b/init/modules/EESSI/2023.06.lua index 32aaf6c07f..e45eb6fa5f 100644 --- a/init/modules/EESSI/2023.06.lua +++ b/init/modules/EESSI/2023.06.lua @@ -28,15 +28,6 @@ function archdetect_cpu() local archdetect_options = os.getenv("EESSI_ARCHDETECT_OPTIONS") or "" for archdetect_filter_cpu in string.gmatch(archdetect_options, "([^" .. ":" .. "]+)") do if isDir(pathJoin(eessi_prefix, "software", eessi_os_type, archdetect_filter_cpu, "software")) then - -- use x86_64/amd/zen3 for now when AMD Genoa (Zen4) CPU is detected, - -- since optimized software installations for Zen4 are a work-in-progress, - -- see https://gitlab.com/eessi/support/-/issues/37 - if archdetect_filter_cpu == "x86_64/amd/zen4" then - archdetect_filter_cpu = "x86_64/amd/zen3" - if mode() == "load" then - LmodMessage("Sticking to " .. archdetect_filter_cpu .. " for now, since optimized installations for AMD Genoa (Zen4) are a work in progress.") - end - end return archdetect_filter_cpu end end From 91169047826f26a1713b9ab876c9735e2d50f1a3 Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Sat, 25 Jan 2025 10:35:09 +0100 Subject: [PATCH 2/2] disable using x86_64/amd/zen3 when x86_64/amd/zen4 in EESSI/2023.06 module --- init/modules/EESSI/2023.06.lua | 9 --------- 1 file changed, 9 deletions(-) diff --git a/init/modules/EESSI/2023.06.lua b/init/modules/EESSI/2023.06.lua index eb1cd1753b..d5105e89fc 100644 --- a/init/modules/EESSI/2023.06.lua +++ b/init/modules/EESSI/2023.06.lua @@ -49,15 +49,6 @@ function archdetect_cpu() -- We loop over the list, and return the highest matching arch for which a directory exists for this EESSI version for archdetect_filter_cpu in string.gmatch(archdetect_options, "([^" .. ":" .. "]+)") do if isDir(pathJoin(eessi_prefix, "software", eessi_os_type, archdetect_filter_cpu, "software")) then - -- use x86_64/amd/zen3 for now when AMD Genoa (Zen4) CPU is detected, - -- since optimized software installations for Zen4 are a work-in-progress, - -- see https://gitlab.com/eessi/support/-/issues/37 - if (archdetect_filter_cpu == "x86_64/amd/zen4" and not os.getenv("EESSI_SOFTWARE_SUBDIR_OVERRIDE") == "x86_64/amd/zen4") then - archdetect_filter_cpu = "x86_64/amd/zen3" - if mode() == "load" then - LmodMessage("Sticking to " .. archdetect_filter_cpu .. " for now, since optimized installations for AMD Genoa (Zen4) are a work in progress.") - end - end eessiDebug("Selected archdetect CPU: " .. archdetect_filter_cpu) return archdetect_filter_cpu end