Try to sync bash and lmod again

Author: ocaisa

.github/workflows/tests_eessi_module.yml

@@ -123,7 +123,6 @@ jobs:
           # source script version sets environment variables to force archdetect, ignore these
           unset EESSI_USE_ARCHSPEC
           unset EESSI_USE_ARCHDETECT
-          unset EESSI_ARCHDETECT_OPTIONS
           env | grep -E '(^EESSI_|^LMOD_RC|^LMOD_PACKAGE_PATH|^MODULEPATH)' | sort > "${sourceoutfile}"
           
           # Now compare the two results

init/bash

@@ -26,12 +26,16 @@ if [ $? -eq 0 ]; then
     # prepend location of modules for EESSI software stack to $MODULEPATH
     show_msg "Prepending $EESSI_MODULEPATH to \$MODULEPATH..."
     module use $EESSI_MODULEPATH
+    
+    if [ ! -z ${EESSI_MODULEPATH_ACCEL} ]; then
+        show_msg "Prepending $EESSI_MODULEPATH_ACCEL to \$MODULEPATH..."
+        module use $EESSI_MODULEPATH_ACCEL
+    fi
+    
     show_msg "Prepending site path $EESSI_SITE_MODULEPATH to \$MODULEPATH..."
     module use $EESSI_SITE_MODULEPATH
 
     if [ ! -z ${EESSI_MODULEPATH_ACCEL} ]; then
-        show_msg "Prepending $EESSI_MODULEPATH_ACCEL to \$MODULEPATH..."
-        module use $EESSI_MODULEPATH_ACCEL
         show_msg "Prepending $EESSI_SITE_MODULEPATH_ACCEL to \$MODULEPATH..."
         module use $EESSI_SITE_MODULEPATH_ACCEL
     fi

init/eessi_environment_variables

@@ -67,8 +67,14 @@ if [ -d $EESSI_PREFIX ]; then
               EESSI_ACCEL_SOFTWARE_SUBDIR=${EESSI_ACCEL_SOFTWARE_SUBDIR_OVERRIDE:-$EESSI_SOFTWARE_SUBDIR}
               # path to where accel/* subdirectory is located
               EESSI_ACCEL_SOFTWARE_PATH=${EESSI_PREFIX}/software/${EESSI_OS_TYPE}/${EESSI_ACCEL_SOFTWARE_SUBDIR}
+              if [ -d $EESSI_ACCEL_SOFTWARE_PATH/${EESSI_ACCEL_SUBDIR} ]; then
+                  # We should try to use the fallback compute capability
+                  show_msg "archdetect found no supported accelerator ${EESSI_ACCEL_SUBDIR}, falling back to ${EESSI_ACCEL_SUBDIR::-1}0"
+                  EESSI_ACCEL_SUBDIR="${EESSI_ACCEL_SUBDIR::-1}0"
+              fi
               if [ -d $EESSI_ACCEL_SOFTWARE_PATH/${EESSI_ACCEL_SUBDIR} ]; then
                   show_msg "archdetect found supported accelerator for CPU target ${EESSI_ACCEL_SOFTWARE_SUBDIR}: ${EESSI_ACCEL_SUBDIR}"
+                  export EESSI_ACCELERATOR_TARGET=${EESSI_ACCEL_SUBDIR}
               else
                   show_msg "No matching path found in ${EESSI_ACCEL_SOFTWARE_SUBDIR} for accelerator detected by archdetect (${EESSI_ACCEL_SUBDIR})"
               fi