Fix a few bugs

Author: ocaisa

.github/workflows/scripts/verify_eessi_environment.py

@@ -40,7 +40,8 @@ def check_env_endswith(var1, var2):
         expected_eessi_accel_arch = os.getenv("EESSI_ACCELERATOR_TARGET_OVERRIDE", default=None)
 
         # Verify the software and accelerator targets are set correctly
-        check_env_equals("EESSI_SOFTWARE_SUBDIR_OVERRIDE", "EESSI_SOFTWARE_SUBDIR")
+        if os.getenv("EESSI_SOFTWARE_SUBDIR_OVERRIDE", default=None):
+            check_env_equals("EESSI_SOFTWARE_SUBDIR_OVERRIDE", "EESSI_SOFTWARE_SUBDIR")
         if expected_eessi_accel_arch:
             # EESSI_ACCEL_SUBDIR is what is detected by archdetect (or respects EESSI_ACCELERATOR_TARGET_OVERRIDE)
             check_env_equals("EESSI_ACCELERATOR_TARGET_OVERRIDE", "EESSI_ACCEL_SUBDIR")

init/modules/EESSI/2023.06.lua

@@ -145,28 +145,31 @@ if not (archdetect_accel == nil or archdetect_accel == '') then
     eessiDebug("Checking if " .. eessi_module_path_accel .. " exists")
     if not isDir(eessi_module_path_accel) then
         -- fall back to major version GPU arch if the exact one is not an option (i.e, 7.5 -> 7.0)
+        local original_archdetect_accel = archdetect_accel
         archdetect_accel =  archdetect_accel:sub(1,-2) .. "0"
-        eessiDebug("No directory for " .. archdetect_accel .. ", trying " .. archdetect_accel)
+        eessiDebug("No directory for " .. original_archdetect_accel .. ", trying " .. archdetect_accel)
         eessi_module_path_accel = pathJoin(eessi_accel_software_path, archdetect_accel, eessi_modules_subdir)
     end
     if isDir(eessi_module_path_accel) then
         -- set the accelerator target based on what actually exists
         setenv("EESSI_ACCELERATOR_TARGET", archdetect_accel)
         setenv("EESSI_MODULEPATH_ACCEL", eessi_module_path_accel)
-        prepend_path("MODULEPATH", eessi_module_path_accel)
-        eessiDebug("Using accelerator modules at: " .. eessi_module_path_accel)
+        if ( mode() ~= "spider" ) then
+            prepend_path("MODULEPATH", eessi_module_path_accel)
+            eessiDebug("Using accelerator modules at: " .. eessi_module_path_accel)
+        end
     end
 end
 
 -- prepend the site module path last so it has priority
 prepend_path("MODULEPATH", eessi_site_module_path)
+eessiDebug("Adding " .. eessi_site_module_path .. " to MODULEPATH")
 if isDir(eessi_module_path_accel) then
     eessi_module_path_site_accel = string.gsub(eessi_module_path_accel, "versions", "host_injections")
     setenv("EESSI_SITE_MODULEPATH_ACCEL", eessi_module_path_site_accel)
     prepend_path("MODULEPATH", eessi_module_path_site_accel)
     eessiDebug("Using site accelerator modules at: " .. eessi_module_path_site_accel)
 end
-eessiDebug("Adding " .. eessi_site_module_path .. " to MODULEPATH")
 if mode() == "load" then
     LmodMessage("EESSI/" .. eessi_version .. " loaded successfully")
 end