Merge branch 'main' into combine_cc_targets

Author: bedroge

.github/workflows/scripts/verify_eessi_environment.py

@@ -32,6 +32,11 @@ def check_env_endswith(var1, var2):
     if not val1.endswith(val2):
         raise EnvVarError(f"'{var1}' must end with '{var2}':\n{var1}='{val1}'\n{var2}='{val2}'")
 
+def check_env_startswith(var1, var2):
+    val1, val2 = get_env_vars(var1, var2)
+    if not val1.startswith(val2):
+        raise EnvVarError(f"'{var1}' must start with '{var2}':\n{var1}='{val1}'\n{var2}='{val2}'")
+
 if __name__ == "__main__":
     try:
         # accelerator stuff is not guaranteed to exist
@@ -58,6 +63,13 @@ def check_env_endswith(var1, var2):
             check_env_contains("EESSI_SITE_MODULEPATH_ACCEL", "EESSI_SOFTWARE_SUBDIR")
             check_env_contains("EESSI_MODULEPATH_ACCEL", "EESSI_ACCELERATOR_TARGET")
             check_env_contains("EESSI_SITE_MODULEPATH_ACCEL", "EESSI_ACCELERATOR_TARGET")
+        # Verify that configuring an EESSI_SITE_SOFTWARE_PREFIX results in this prefix being
+        # the first part of EESSI_SITE_SOFTWARE_PATH
+        if os.getenv("EESSI_SITE_SOFTWARE_PREFIX"):
+            check_env_startswith("EESSI_SITE_SOFTWARE_PATH", "EESSI_SITE_SOFTWARE_PREFIX")
+            check_env_startswith("EESSI_SITE_MODULEPATH", "EESSI_SITE_SOFTWARE_PREFIX")
+            if expected_eessi_accel_arch:
+                check_env_startswith("EESSI_SITE_MODULEPATH_ACCEL", "EESSI_SITE_SOFTWARE_PREFIX")
         # Finally, verify that all the expected module path are included
         check_env_contains("MODULEPATH", "EESSI_MODULEPATH")
         check_env_contains("MODULEPATH", "EESSI_SITE_MODULEPATH")

.github/workflows/tests_archdetect.yml

@@ -19,6 +19,8 @@ jobs:
           - x86_64/amd/zen3/Azure-CentOS7-7V73X
           - x86_64/amd/zen4/Azure-Alma8-9V33X
           - x86_64/amd/zen4/Shinx-RHEL8-9654
+          - x86_64/amd/zen5/AWS-Rocky9-9R45
+          - x86_64/amd/zen5/RUG-AlmaLinux8-9575F
           - aarch64/a64fx/Deucalion-Rocky85
           - aarch64/neoverse_n1/Azure-Ubuntu20-Altra
           - aarch64/neoverse_n1/AWS-awslinux-graviton2

.github/workflows/tests_eessi_extend_module.yml

@@ -50,9 +50,13 @@ jobs:
           export MY_INSTALLATION_PATH=/tmp/easybuild
           export EASYBUILD_PREFIX=$MY_INSTALLATION_PATH
           eb EESSI-extend-easybuild.eb --rebuild
+          module unload EasyBuild
 
           # Verify that we can pick the installed version up
           module use $MY_INSTALLATION_PATH/modules/all
+          # Verify we can run "module show" on the module
+          module show EESSI-extend/${{matrix.eessi_version}}-easybuild
+          # Now load it and run additional checks
           module load EESSI-extend/${{matrix.eessi_version}}-easybuild
           echo $EBROOTEESSIMINEXTEND | grep $MY_INSTALLATION_PATH || { echo "ERROR: Installed version of EESSI-extend not picked up (loaded $EBROOTEESSIMINEXTEND)" >&2; exit 1; }
           # Do a test rebuild (with default and local hooks)

.github/workflows/tests_eessi_module.yml

@@ -171,6 +171,9 @@ jobs:
           FINAL_ACCELERATOR_TARGET_EXPECTED: accel/nvidia/cc80
         - EESSI_ACCELERATOR_TARGET_OVERRIDE: accel/nvidia/cc77  # deliberately chose a non-existent CUDA capability
           FINAL_ACCELERATOR_TARGET_EXPECTED: accel/nvidia/cc70  # this reverts to the fallback case (which does exist)
+          # Test if setting an EESSI_SITE_SOFTWARE_PREFIX works by setting that for the zen4 target
+        - EESSI_SOFTWARE_SUBDIR_OVERRIDE: x86_64/amd/zen4
+          EESSI_SITE_SOFTWARE_PREFIX: /tmp/site_prefix
 
     steps:
       - name: Check out software-layer repository
@@ -218,6 +221,18 @@ jobs:
           # Do (and undo) loading the EESSI module
           CPU_ARCH=$(./init/eessi_archdetect.sh -a cpupath)
           module load EESSI/${{matrix.EESSI_VERSION}}
+          # EESSI_SITE_MODULEPATH_ACCEL will only be set if this dir exists. We can most easily create it here
+          # where we have EESSI_SITE_SOFTWARE_PATH and EESSI_ACCEL_SOFTWARE_SUBDIR available
+          # Creating it here means the verify_eessi_environment.py can later on check that EESSI_SITE_MODULEPATH_ACCEL
+          # is set correctly
+          # First, we need to get the modules subdir. For this we strip EESSI_SITE_SOFTWARE_PATH from the start of
+          # EESSI_SITE_MODULEPATH
+          eessi_modules_subdir=${EESSI_SITE_MODULEPATH/$EESSI_SITE_SOFTWARE_PATH\//}
+          # Then, we make sure the target of /cvmfs/software.eessi.io/host_injections exists (or the 2nd mkdir fails)
+          mkdir -p /opt/eessi
+          # Then, we actually create the dir. Note that we use EESSI_ACCELERATOR_TARGET, as this represents the target
+          # _after_ any fallbacks
+          mkdir -p -v "$EESSI_SITE_SOFTWARE_PATH/$EESSI_ACCELERATOR_TARGET/$eessi_modules_subdir"
           module unload EESSI/${{matrix.EESSI_VERSION}}
           env | grep -v _ModuleTable | sort > "${module_cycled_file}"
 

EESSI-extend-easybuild.eb

@@ -133,7 +133,7 @@ if eessi_cvmfs_install then
     LmodError("You cannot use EESSI_CVMFS_INSTALL in combination with any other EESSI_*_INSTALL environment variables")
   end
   easybuild_installpath = os.getenv("EESSI_SOFTWARE_PATH")
-  -- enforce accelerator subdirectory usage for CVMFS installs (only if an accelerator install is requested)
+  -- Enforce accelerator subdirectory usage for CVMFS installs (only if an accelerator install is requested)
   if (eessi_accelerator_target ~= nil) and (cuda_compute_capability ~= nil or amd_compute_capability ~= nil) and (os.getenv("EESSI_ACCELERATOR_INSTALL") ~= nil) then
       easybuild_installpath = pathJoin(easybuild_installpath, eessi_accelerator_target)
   end
@@ -143,7 +143,7 @@ elseif eessi_site_install then
     LmodError("You cannot use EESSI_SITE_INSTALL in combination with any other EESSI_*_INSTALL environment variables")
   end
   easybuild_installpath = os.getenv("EESSI_SITE_SOFTWARE_PATH")
-  -- enforce accelerator subdirectory usage for site installs (only if an accelerator install is requested)
+  -- Enforce accelerator subdirectory usage for site installs (only if an accelerator install is requested)
   if (eessi_accelerator_target ~= nil) and (cuda_compute_capability ~= nil) and (os.getenv("EESSI_ACCELERATOR_INSTALL") ~= nil) then
       easybuild_installpath = pathJoin(easybuild_installpath, eessi_accelerator_target)
   end
@@ -232,7 +232,8 @@ end
 
 -- Make sure EasyBuild itself is loaded
 -- need to also handle the unload behaviour where the version is defined only before we unload
-easybuild_version = os.getenv("EBVERSIONEASYBUILD")
+-- (also provide a sensible default for cases like 'module show' where the modules are never loaded at all)
+easybuild_version = os.getenv("EBVERSIONEASYBUILD") or "5.1.1"
 if not ( isloaded("EasyBuild") ) then
     load(latest("EasyBuild"))
 end

EESSI-install-software.sh

@@ -147,6 +147,12 @@ else
       # Make sure EESSI_PREFIX and EESSI_OS_TYPE are set
       source $TOPDIR/init/minimal_eessi_env
 
+      # We've found that creation of new files and directories by unionfs (or any overlay fs) can fail if it
+      # runs on top of CVMFS because the lower-dir provided by CVMFS is not fully initialized. It seems
+      # these issues can be avoided simply by running an ls, to at least trigger the mount
+      echo ">> Trigger automounting of the repo ($EESSI_CVMFS_REPO) before creating new files, to avoid overlay issues"
+      ls -al $EESSI_CVMFS_REPO
+
       # make sure the the software and modules directory exist
       # (since it's expected by init/eessi_environment_variables when using archdetect and by the EESSI module)
       mkdir -p -v ${EESSI_PREFIX}/software/${EESSI_OS_TYPE}/${EESSI_SOFTWARE_SUBDIR_OVERRIDE}/{modules,software}
@@ -210,8 +216,9 @@ fi
 pr_diff=$(ls [0-9]*.diff | head -n 1)
 export PR_DIFF="$PWD/$pr_diff"
 
-# Only run install_scripts.sh if not in dev.eessi.io for security
-if [[ -z ${EESSI_DEV_PROJECT} ]]; then
+# Only run install_scripts.sh if not in dev.eessi.io (for security)
+# Also skip installing scripts for site-installs
+if [[ -z ${EESSI_DEV_PROJECT} && -z "${EESSI_SITE_INSTALL_FORCE}" ]]; then
     ${TOPDIR}/install_scripts.sh --prefix ${EESSI_CVMFS_REPO}/versions/${EESSI_VERSION} --eessi-version ${EESSI_VERSION}
 fi
 
@@ -221,6 +228,10 @@ module --force purge
 module unuse $MODULEPATH
 
 # Initialize the EESSI environment
+# Unset EESSI_SITE_SOFTWARE_PREFIX initially (& back it up for later restore), so that things like the CUDA
+# drivers and libraries are installed in /cvmfs/software.eessi.io, and not in the EESSI_SITE_SOFTWARE_PREFIX
+EESSI_SITE_SOFTWARE_PREFIX_BACKUP=${EESSI_SITE_SOFTWARE_PREFIX}
+unset EESSI_SITE_SOFTWARE_PREFIX
 module use $TOPDIR/init/modules
 module load EESSI/$EESSI_VERSION
 
@@ -237,6 +248,13 @@ if [ -d $EESSI_CVMFS_REPO ]; then
 else
     fatal_error "$EESSI_CVMFS_REPO is not available!"
 fi
+if [[ -n "$EESSI_CVMFS_REPO_OVERRIDE" && "$EESSI_CVMFS_REPO" != "$EESSI_CVMFS_REPO_OVERRIDE" ]]; then
+    if [ -d "$EESSI_CVMFS_REPO_OVERRIDE" ]; then
+        echo_green "$EESSI_CVMFS_REPO_OVERRIDE available, OK!"
+    else
+        fatal_error "$EESSI_CVMFS_REPO_OVERRIDE is not available!"
+    fi
+fi
 
 # Check that EESSI_SOFTWARE_SUBDIR now matches EESSI_SOFTWARE_SUBDIR_OVERRIDE
 if [[ -z ${EESSI_SOFTWARE_SUBDIR} ]]; then
@@ -257,7 +275,11 @@ export PYTHONUNBUFFERED=1
 #   ${EESSI_PREFIX}/software/${EESSI_OS_TYPE}/${EESSI_SOFTWARE_SUBDIR_OVERRIDE}
 # - .lmod/lmodrc.lua
 # - .lmod/SitePackage.lua
-_eessi_software_path=${EESSI_PREFIX}/software/${EESSI_OS_TYPE}/${EESSI_SOFTWARE_SUBDIR_OVERRIDE}
+if [[ -n "${EESSI_SITE_INSTALL_FORCE}" ]]; then
+    _eessi_software_path=${EESSI_CVMFS_REPO_OVERRIDE}/versions/${EESSI_VERSION_OVERRIDE:-${EESSI_VERSION}}/software/${EESSI_OS_TYPE}/${EESSI_SOFTWARE_SUBDIR_OVERRIDE}
+else
+    _eessi_software_path=${EESSI_PREFIX}/software/${EESSI_OS_TYPE}/${EESSI_SOFTWARE_SUBDIR_OVERRIDE}
+fi
 _lmod_cfg_dir=${_eessi_software_path}/.lmod
 _lmod_rc_file=${_lmod_cfg_dir}/lmodrc.lua
 if [ ! -f ${_lmod_rc_file} ]; then
@@ -266,7 +288,7 @@ if [ ! -f ${_lmod_rc_file} ]; then
     python3 ${TOPDIR}/create_lmodrc.py ${_eessi_software_path}
 fi
 _lmod_sitepackage_file=${_lmod_cfg_dir}/SitePackage.lua
-if [ ! -f ${_lmod_sitepackage_file} ]; then
+if [[ ! -f ${_lmod_sitepackage_file} && -z "${EESSI_SITE_INSTALL_FORCE}" ]]; then
     echo "Lmod file '${_lmod_sitepackage_file}' does not exist yet; creating it..."
     command -V python3
     python3 ${TOPDIR}/create_lmodsitepackage.py ${_eessi_software_path}
@@ -279,8 +301,16 @@ echo ">> Configuring EasyBuild..."
 module unload EESSI-extend
 unset EESSI_USER_INSTALL
 unset EESSI_PROJECT_INSTALL
-unset EESSI_SITE_INSTALL
-export EESSI_CVMFS_INSTALL=1
+if [[ -n "$EESSI_SITE_INSTALL_FORCE" ]]; then
+    msg="Forcing a site installation (EESSI_SITE_INSTALL_FORCE=${EESSI_SITE_INSTALL_FORCE})"
+    msg="$msg by setting EESSI_SITE_INSTALL=1 and unsetting EESSI_CVMFS_INSTALL"
+    echo $msg
+    export EESSI_SITE_INSTALL=1
+    unset EESSI_CVMFS_INSTALL
+else
+    unset EESSI_SITE_INSTALL
+    export EESSI_CVMFS_INSTALL=1
+fi
 
 # We now run 'source load_eessi_extend_module.sh' to load or install and load the
 #   EESSI-extend module which sets up all build environment settings.
@@ -293,6 +323,7 @@ export EESSI_CVMFS_INSTALL=1
 # NOTE 3, we have to set a default for EASYBUILD_INSTALLPATH here in cases the
 #   EESSI-extend module itself needs to be installed.
 export EASYBUILD_INSTALLPATH=${EESSI_PREFIX}/software/${EESSI_OS_TYPE}/${EESSI_SOFTWARE_SUBDIR_OVERRIDE}
+echo "EASYBUILD_INSTALLPATH set to $EASYBUILD_INSTALLPATH"
 
 # If in dev.eessi.io, allow building on top of software.eessi.io via EESSI-extend
 if [[ ! -z ${EESSI_DEV_PROJECT} ]]; then
@@ -338,9 +369,24 @@ fi
 # Install NVIDIA drivers in host_injections (if they exist)
 if nvidia_gpu_available; then
     echo "Installing NVIDIA drivers for use in prefix shell..."
-    ${EESSI_PREFIX}/scripts/gpu_support/nvidia/link_nvidia_host_libraries.sh
+    # Site installs override EESSI_CVMFS_REPO, but link_nvidia_host_libraries should always use the usptream EESSI CVMFS repo
+    EESSI_CVMFS_REPO=/cvmfs/software.eessi.io ${EESSI_PREFIX}/scripts/gpu_support/nvidia/link_nvidia_host_libraries.sh
 fi
 
+# Now that we are done with all installs that should go the /cvmfs/software.eessi.io
+# Reload the EESSI and EESSI-extend modules if we're doing a site install for which EESSI_SITE_SOFTWARE_PREFIX is set
+export EESSI_SITE_SOFTWARE_PREFIX=${EESSI_SITE_SOFTWARE_PREFIX_BACKUP}
+if [[ ! -z "${EESSI_SITE_INSTALL}" && ! -z "${EESSI_SITE_SOFTWARE_PREFIX}" ]]; then
+    echo "Doing a site install with EESSI_SITE_SOFTWARE_PREFIX '${EESSI_SITE_SOFTWARE_PREFIX}', so reloading EESSI and EESSI-extend"
+    EESSI_VERSION_BACKUP=${EESSI_VERSION}
+    module purge
+    echo "Loading EESSI/${EESSI_VERSION_BACKUP}"
+    module load EESSI/${EESSI_VERSION_BACKUP}
+    # Use --ignore_cache in case the current build was the one that installed this EESSI-extend module
+    echo "Loading EESSI-extend/${EESSI_VERSION}"
+    module load --ignore_cache EESSI-extend/${EESSI_VERSION}-easybuild
+    echo "EASYBUILD_INSTALLPATH=${EASYBUILD_INSTALLPATH}"
+fi
 
 if [ ! -z "${shared_fs_path}" ]; then
     shared_eb_sourcepath=${shared_fs_path}/easybuild/sources
@@ -381,12 +427,26 @@ else
     # "|| true" is used to make sure that the grep command always returns success
     rebuild_easystacks=$(echo "${changed_easystacks}" | (grep "/rebuilds/" || true))
     new_easystacks=$(echo "${changed_easystacks}" | (grep -v "/rebuilds/" || true))
+    echo "When processing easystack files:"
+    echo "EESSI_CVMFS_REPO=${EESSI_CVMFS_REPO}"
+    echo "EESSI_CVMFS_REPO_OVERRIDE=${EESSI_CVMFS_REPO_OVERRIDE}"
+    echo "EESSI_VERSION=${EESSI_VERSION}"
+    echo "EESSI_VERSION_OVERRIDE=${EESSI_VERSION_OVERRIDE}"
+    echo "EESSI_SOFTWARE_LAYER_VERSION_SUFFIX=${EESSI_SOFTWARE_LAYER_VERSION_SUFFIX}"
     for easystack_file in ${rebuild_easystacks} ${new_easystacks}; do
+        echo "Checking if easystack file ${easystack_file} is for the current EESSI_CVMFS_REPO and EESSI_VERSION"
 
         # make sure that easystack file being picked up is for EESSI version that we're building for...
-        echo "${easystack_file}" | grep -q "^easystacks/$(basename ${EESSI_CVMFS_REPO})/${EESSI_VERSION}${EESSI_SOFTWARE_LAYER_VERSION_SUFFIX}/"
+        # Preferentially check EESSI_CVMFS_REPO_OVERRIDE (since that is set for site builds), otherwise default to EESSI_CVMFS_REPO
+        echo "${easystack_file}" | grep -q "^easystacks/$(basename ${EESSI_CVMFS_REPO_OVERRIDE:-${EESSI_CVMFS_REPO}})/${EESSI_VERSION}${EESSI_SOFTWARE_LAYER_VERSION_SUFFIX}/"
         if [ $? -ne 0 ]; then
-            echo_yellow "Easystack file ${easystack_file} is not intended for EESSI version ${EESSI_VERSION}${EESSI_SOFTWARE_LAYER_VERSION_SUFFIX}, skipping it..."
+            # Check if this was even an easystack file for the right repository
+            echo "${easystack_file}" | grep -q "^easystacks/$(basename ${EESSI_CVMFS_REPO_OVERRIDE:-${EESSI_CVMFS_REPO}})"
+            if [ $? -ne 0 ]; then
+                echo_yellow "Easystack file ${easystack_file} is not intended for the repository ${EESSI_CVMFS_REPO_OVERRIDE:-${EESSI_CVMFS_REPO}}, skipping it..."
+            else
+                echo_yellow "Easystack file ${easystack_file} is not intended for EESSI version ${EESSI_VERSION}${EESSI_SOFTWARE_LAYER_VERSION_SUFFIX}, skipping it..."
+            fi
         else
             echo -e "Processing easystack file ${easystack_file}...\n\n"
 
@@ -443,31 +503,49 @@ else
     export LMOD_PACKAGE_PATH="${EASYBUILD_INSTALLPATH}/.lmod"
 fi
 
-lmod_rc_file="$LMOD_CONFIG_DIR/lmodrc.lua"
-echo "DEBUG: lmod_rc_file='${lmod_rc_file}'"
-if [[ ! -z ${EESSI_ACCELERATOR_TARGET} ]]; then
-    # EESSI_ACCELERATOR_TARGET is set, so let's remove the accelerator path from $lmod_rc_file
-    lmod_rc_file=$(echo ${lmod_rc_file} | sed "s@/${EESSI_ACCELERATOR_TARGET}@@")
-    echo "Path to lmodrc.lua changed to '${lmod_rc_file}'"
-fi
-lmodrc_changed=$(cat ${pr_diff} | grep '^+++' | cut -f2 -d' ' | sed 's@^[a-z]/@@g' | grep '^create_lmodrc.py$' > /dev/null; echo $?)
-if [ ! -f $lmod_rc_file ] || [ ${lmodrc_changed} == '0' ]; then
-    echo ">> Creating/updating Lmod RC file (${lmod_rc_file})..."
-    python3 $TOPDIR/create_lmodrc.py ${EASYBUILD_INSTALLPATH}
-    check_exit_code $? "$lmod_rc_file created" "Failed to create $lmod_rc_file"
+# If this is a site install, the old method of checking if lmodrc.lua was updated doesn't work
+# We simply skip that step for now - it's hardly ever changed anyway
+if [[ -z "${EESSI_SITE_INSTALL}" ]]; then
+    lmod_rc_file="$LMOD_CONFIG_DIR/lmodrc.lua"
+    echo "DEBUG: lmod_rc_file='${lmod_rc_file}'"
+    if [[ ! -z ${EESSI_ACCELERATOR_TARGET} ]]; then
+        # EESSI_ACCELERATOR_TARGET is set, so let's remove the accelerator path from $lmod_rc_file
+        lmod_rc_file=$(echo ${lmod_rc_file} | sed "s@/${EESSI_ACCELERATOR_TARGET}@@")
+        echo "Path to lmodrc.lua changed to '${lmod_rc_file}'"
+    fi
+    lmodrc_changed=$(cat ${pr_diff} | grep '^+++' | cut -f2 -d' ' | sed 's@^[a-z]/@@g' | grep '^create_lmodrc.py$' > /dev/null; echo $?)
+    if [ ! -f $lmod_rc_file ] || [ ${lmodrc_changed} == '0' ]; then
+        echo ">> Creating/updating Lmod RC file (${lmod_rc_file})..."
+        python3 $TOPDIR/create_lmodrc.py ${EASYBUILD_INSTALLPATH}
+        check_exit_code $? "$lmod_rc_file created" "Failed to create $lmod_rc_file"
+    fi
+else
+    # For site builds, create_lmodrc.py will _never_ be in the pr_diff, but it _might_ have changed upstream
+    # The only way to then trigger a redeploy is if we do something like
+    # python3 $TOPDIR/create_lmodrc.py $TMDPIR
+    # foo=$(diff $lmod_rc_file $TMPDIR/.lmod/lmodrc.lua)
+    # if [ -z $foo ]; then
+    #     python3 $TOPDIR/create_lmodrc.py ${EASYBUILD_INSTALLPATH}
+    # fi
+    # in order to detect if our deployed lmodrc.lua is different from the one that _would_ be newly generated
+    # However, we very rarely change these scripts anyway, so we don't implement this right now
+    echo "WARNING: there is currently no mechanism to detect if the lmodrc.lua should be updated."
 fi
 
-lmod_sitepackage_file="$LMOD_PACKAGE_PATH/SitePackage.lua"
-if [[ ! -z ${EESSI_ACCELERATOR_TARGET} ]]; then
-    # EESSI_ACCELERATOR_TARGET is set, so let's remove the accelerator path from $lmod_sitepackage_file
-    lmod_sitepackage_file=$(echo ${lmod_sitepackage_file} | sed "s@/${EESSI_ACCELERATOR_TARGET}@@")
-    echo "Path to SitePackage.lua changed to '${lmod_sitepackage_file}'"
-fi
-sitepackage_changed=$(cat ${pr_diff} | grep '^+++' | cut -f2 -d' ' | sed 's@^[a-z]/@@g' | grep '^create_lmodsitepackage.py$' > /dev/null; echo $?)
-if [ ! -f "$lmod_sitepackage_file" ] || [ "${sitepackage_changed}" == '0' ]; then
-    echo ">> Creating/updating Lmod SitePackage.lua (${lmod_sitepackage_file})..."
-    python3 $TOPDIR/create_lmodsitepackage.py ${EASYBUILD_INSTALLPATH}
-    check_exit_code $? "$lmod_sitepackage_file created" "Failed to create $lmod_sitepackage_file"
+# If this is a site install, don't install SitePackage.lua
+if [[ -z "${EESSI_SITE_INSTALL}" ]]; then
+    lmod_sitepackage_file="$LMOD_PACKAGE_PATH/SitePackage.lua"
+    if [[ ! -z ${EESSI_ACCELERATOR_TARGET} ]]; then
+        # EESSI_ACCELERATOR_TARGET is set, so let's remove the accelerator path from $lmod_sitepackage_file
+        lmod_sitepackage_file=$(echo ${lmod_sitepackage_file} | sed "s@/${EESSI_ACCELERATOR_TARGET}@@")
+        echo "Path to SitePackage.lua changed to '${lmod_sitepackage_file}'"
+    fi
+    sitepackage_changed=$(cat ${pr_diff} | grep '^+++' | cut -f2 -d' ' | sed 's@^[a-z]/@@g' | grep '^create_lmodsitepackage.py$' > /dev/null; echo $?)
+    if [ ! -f "$lmod_sitepackage_file" ] || [ "${sitepackage_changed}" == '0' ]; then
+        echo ">> Creating/updating Lmod SitePackage.lua (${lmod_sitepackage_file})..."
+        python3 $TOPDIR/create_lmodsitepackage.py ${EASYBUILD_INSTALLPATH}
+        check_exit_code $? "$lmod_sitepackage_file created" "Failed to create $lmod_sitepackage_file"
+    fi
 fi
 
 echo ">> Cleaning up ${TMPDIR}..."