From ea2f6c21fbffe1cfcadcdd2b57ab95eb00ce5613 Mon Sep 17 00:00:00 2001 From: Natalie Perlin Date: Fri, 13 Oct 2023 00:03:27 -0400 Subject: [PATCH] spack-stack 1.4.1 integration for gaea-c5 platform --- modulefiles/build_gaea-c5_intel.lua | 14 ++++++------- modulefiles/tasks/gaea-c5/python_srw.lua | 2 ++ modulefiles/tasks/gaea-c5/run_vx.local.lua | 23 ++++++++++++++++++++-- modulefiles/wflow_gaea-c5.lua | 2 -- 4 files changed, 29 insertions(+), 12 deletions(-) diff --git a/modulefiles/build_gaea-c5_intel.lua b/modulefiles/build_gaea-c5_intel.lua index 84d05290d7..566855bbb2 100644 --- a/modulefiles/build_gaea-c5_intel.lua +++ b/modulefiles/build_gaea-c5_intel.lua @@ -5,18 +5,17 @@ the NOAA RDHPC machine Gaea C5 using Intel-2023.1.0 whatis([===[Loads libraries needed for building the UFS SRW App on Gaea C5 ]===]) -load(pathJoin("cmake", os.getenv("cmake_ver") or "3.23.1")) +prepend_path("MODULEPATH", "/lustre/f2/dev/wpo/role.epic/contrib/spack-stack/c5/spack-stack-1.4.1/envs/unified-env-intel-2023.1.0/install/modulefiles/Core") -prepend_path("MODULEPATH","/lustre/f2/dev/role.epic/contrib/C5/hpc-stack/intel-classic-2023.1.0/modulefiles/stack") -load(pathJoin("hpc", os.getenv("hpc_ver") or "1.2.0")) -load(pathJoin("intel-classic", os.getenv("intel_classic_ver") or "2023.1.0")) -load(pathJoin("cray-mpich", os.getenv("cray_mpich_ver") or "8.1.25")) -load(pathJoin("hpc-intel-classic", os.getenv("hpc_intel_classic_ver") or "2023.1.0")) -load(pathJoin("hpc-cray-mpich", os.getenv("hpc_cray_mpich_ver") or "8.1.25")) +load("PrgEnv-intel/8.3.3") +load("stack-intel/2023.1.0") +load("stack-cray-mpich/8.1.25") +load("cmake/3.23.1") load("srw_common") unload("darshan-runtime/3.4.0") +unload("cray-pmi/6.1.10") setenv("CFLAGS","-diag-disable=10441") setenv("FFLAGS","-diag-disable=10441") @@ -27,4 +26,3 @@ setenv("CMAKE_C_COMPILER","cc") setenv("CMAKE_Fortran_COMPILER","ftn") setenv("CMAKE_CXX_COMPILER","CC") setenv("CMAKE_Platform","gaea-c5.intel") - diff --git a/modulefiles/tasks/gaea-c5/python_srw.lua b/modulefiles/tasks/gaea-c5/python_srw.lua index 673aa800b8..5170fa4134 100644 --- a/modulefiles/tasks/gaea-c5/python_srw.lua +++ b/modulefiles/tasks/gaea-c5/python_srw.lua @@ -3,3 +3,5 @@ prepend_path("MODULEPATH","/lustre/f2/dev/role.epic/contrib/C5/miniconda3/module load(pathJoin("miniconda3", os.getenv("miniconda3_ver") or "4.12.0")) setenv("SRW_ENV", "workflow_tools") + +load("darshan-runtime/3.4.0") diff --git a/modulefiles/tasks/gaea-c5/run_vx.local.lua b/modulefiles/tasks/gaea-c5/run_vx.local.lua index 5979a8db96..8dccf5e63c 100644 --- a/modulefiles/tasks/gaea-c5/run_vx.local.lua +++ b/modulefiles/tasks/gaea-c5/run_vx.local.lua @@ -1,6 +1,25 @@ --[[ Compiler-specific modules are used for met and metplus libraries --]] -load(pathJoin("met", os.getenv("met_ver") or "10.1.2")) -load(pathJoin("metplus", os.getenv("metplus_ver") or "4.1.3")) +local met_ver = (os.getenv("met_ver") or "10.1.1") +local metplus_ver = (os.getenv("metplus_ver") or "4.1.1") +if (mode() == "load") then + load(pathJoin("met", met_ver)) + load(pathJoin("metplus",metplus_ver)) +end +local base_met = os.getenv("met_ROOT") or os.getenv("MET_ROOT") +local base_metplus = os.getenv("metplus_ROOT") or os.getenv("METPLUS_ROOT") + +setenv("MET_INSTALL_DIR", base_met) +setenv("MET_BIN_EXEC", pathJoin(base_met,"bin")) +setenv("MET_BASE", pathJoin(base_met,"share/met")) +setenv("MET_VERSION", met_ver) +setenv("METPLUS_VERSION", metplus_ver) +setenv("METPLUS_ROOT", base_metplus) +setenv("METPLUS_PATH", base_metplus) + +if (mode() == "unload") then + unload(pathJoin("met", met_ver)) + unload(pathJoin("metplus",metplus_ver)) +end load("python_srw") diff --git a/modulefiles/wflow_gaea-c5.lua b/modulefiles/wflow_gaea-c5.lua index 12467dfd74..6990a98798 100644 --- a/modulefiles/wflow_gaea-c5.lua +++ b/modulefiles/wflow_gaea-c5.lua @@ -12,8 +12,6 @@ load(pathJoin("miniconda3", os.getenv("miniconda3_ver") or "4.12.0")) prepend_path("MODULEPATH","/lustre/f2/dev/role.epic/contrib/C5/rocoto/modulefiles") load("rocoto") -pushenv("MKLROOT", "/opt/intel/oneapi/mkl/2023.1.0/") - if mode() == "load" then LmodMsgRaw([===[Please do the following to activate conda: > conda activate workflow_tools