Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 5 additions & 8 deletions modulefiles/gsiutils_container.intel.lua
Original file line number Diff line number Diff line change
@@ -1,20 +1,17 @@
help([[
]])

prepend_path("MODULEPATH", "/opt/spack-stack/spack-stack-1.8.0/envs/unified-env/install/modulefiles/Core")
prepend_path("MODULEPATH", "/opt/spack-stack/spack-stack-1.9.2/envs/unified-env/install/modulefiles/Core")

--local python_ver=os.getenv("python_ver") or "3.11.6"
local stack_intel_ver=os.getenv("stack_intel_ver") or "2021.10.0"
local stack_impi_ver=os.getenv("stack_impi_ver") or "2021.12.2"
local cmake_ver=os.getenv("cmake_ver") or "3.27.9"
local prod_util_ver=os.getenv("prod_util_ver") or "2.1.1"
stack_oneapi_ver=os.getenv("stack_oneapi_ver") or "2024.2.0"
stack_impi_ver=os.getenv("stack_impi_ver") or "2021.13"

load(pathJoin("stack-intel", stack_intel_ver))
load(pathJoin("stack-oneapi", stack_oneapi_ver))
load(pathJoin("stack-intel-oneapi-mpi", stack_impi_ver))
load(pathJoin("cmake", cmake_ver))

load("gsiutils_common")

local prod_util_ver=os.getenv("prod_util_ver") or "2.1.1"
load(pathJoin("prod_util", prod_util_ver))

pushenv("CFLAGS", "-march=ivybridge")
Expand Down
9 changes: 6 additions & 3 deletions ush/detect_machine.sh
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,11 @@
#
# Thank you for your contribution

# Overwrite auto-detect in in container
if [[ -v SINGULARITY_CONTAINER ]]; then
MACHINE_ID=container
fi

# If the MACHINE_ID variable is set, skip this script.
[[ -n ${MACHINE_ID:-} ]] && return

Expand Down Expand Up @@ -68,9 +73,7 @@ if [[ "${MACHINE_ID}" != "UNKNOWN" ]]; then
fi

# Try searching based on paths since hostname may not match on compute nodes
if [[ -d /opt/spack-stack ]]; then
MACHINE_ID=container
elif [[ -d /lfs/h3 ]]; then
if [[ -d /lfs/h3 ]]; then
# We are on NOAA Cactus or Dogwood
MACHINE_ID=wcoss2
elif [[ -d /lfs/h1 && ! -d /lfs/h3 ]]; then
Expand Down
4 changes: 1 addition & 3 deletions ush/module-setup.sh
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,7 @@ if [[ $MACHINE_ID = jet* ]] ; then
fi
module purge
elif [[ $MACHINE_ID = container* ]] ; then
if ( ! eval module help > /dev/null 2>&1 ) ; then
source /usr/lmod/lmod/init/bash
fi
source /usr/lmod/lmod/init/bash
module purge

elif [[ $MACHINE_ID = hera* || $MACHINE_ID = ursa* ]] ; then
Expand Down
Loading