From 5463313b38cf4cce5e37f71ee151f2c7ceb307fe Mon Sep 17 00:00:00 2001 From: Wei Huang Date: Fri, 30 Aug 2024 21:12:07 +0000 Subject: [PATCH 1/7] Make gfs-util compile on CSPs with Rocky 8 --- modulefiles/gfsutils_noaacloud.intel.lua | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/modulefiles/gfsutils_noaacloud.intel.lua b/modulefiles/gfsutils_noaacloud.intel.lua index d10ab98f..9d020c4c 100644 --- a/modulefiles/gfsutils_noaacloud.intel.lua +++ b/modulefiles/gfsutils_noaacloud.intel.lua @@ -2,15 +2,22 @@ help([[ Build environment for GFS utilities on NOAA Cloud ]]) -prepend_path("MODULEPATH", "/contrib/spack-stack/spack-stack-1.6.0/envs/unified-env/install/modulefiles/Core") -prepend_path("MODULEPATH", "/contrib/spack-stack/spack-stack-1.6.0/envs/gsi-addon-env/install/modulefiles/Core") - -local stack_intel_ver=os.getenv("stack_intel_ver") or "2021.3.0" -local stack_impi_ver=os.getenv("stack_impi_ver") or "2021.3.0" -local cmake_ver=os.getenv("cmake_ver") or "3.20.1" +prepend_path("MODULEPATH", "/contrib/spack-stack-rocky8/spack-stack-1.6.0/envs/gsi-addon-env/install/modulefiles/Core") +prepend_path("MODULEPATH", "/apps/modules/modulefiles") +prepend_path("PATH", "/contrib/EPIC/bin") +load("gnu") +load("stack-intel") +load("stack-intel-oneapi-mpi") +stack_intel_ver=os.getenv("stack_intel_ver") or "2021.10.0" load(pathJoin("stack-intel", stack_intel_ver)) + +stack_impi_ver=os.getenv("stack_impi_ver") or "2021.10.0" load(pathJoin("stack-intel-oneapi-mpi", stack_impi_ver)) +unload("gnu") + +local cmake_ver=os.getenv("cmake_ver") or "3.23.1" + load(pathJoin("cmake", cmake_ver)) load("gfsutils_common") From 008794daaeae19a4963c5257f1c4950b18026a08 Mon Sep 17 00:00:00 2001 From: Wei Huang Date: Tue, 1 Oct 2024 17:06:06 +0000 Subject: [PATCH 2/7] Remove unneeded path --- modulefiles/gfsutils_noaacloud.intel.lua | 1 - 1 file changed, 1 deletion(-) diff --git a/modulefiles/gfsutils_noaacloud.intel.lua b/modulefiles/gfsutils_noaacloud.intel.lua index 9d020c4c..84ca4849 100644 --- a/modulefiles/gfsutils_noaacloud.intel.lua +++ b/modulefiles/gfsutils_noaacloud.intel.lua @@ -4,7 +4,6 @@ Build environment for GFS utilities on NOAA Cloud prepend_path("MODULEPATH", "/contrib/spack-stack-rocky8/spack-stack-1.6.0/envs/gsi-addon-env/install/modulefiles/Core") prepend_path("MODULEPATH", "/apps/modules/modulefiles") -prepend_path("PATH", "/contrib/EPIC/bin") load("gnu") load("stack-intel") load("stack-intel-oneapi-mpi") From e5501feffc4ed8c6a2ea573857654a138dd2d490 Mon Sep 17 00:00:00 2001 From: Wei Huang Date: Tue, 1 Oct 2024 21:23:08 +0000 Subject: [PATCH 3/7] simplify modulefile --- modulefiles/gfsutils_noaacloud.intel.lua | 6 ------ 1 file changed, 6 deletions(-) diff --git a/modulefiles/gfsutils_noaacloud.intel.lua b/modulefiles/gfsutils_noaacloud.intel.lua index 84ca4849..8a584ea0 100644 --- a/modulefiles/gfsutils_noaacloud.intel.lua +++ b/modulefiles/gfsutils_noaacloud.intel.lua @@ -7,12 +7,6 @@ prepend_path("MODULEPATH", "/apps/modules/modulefiles") load("gnu") load("stack-intel") load("stack-intel-oneapi-mpi") - -stack_intel_ver=os.getenv("stack_intel_ver") or "2021.10.0" -load(pathJoin("stack-intel", stack_intel_ver)) - -stack_impi_ver=os.getenv("stack_impi_ver") or "2021.10.0" -load(pathJoin("stack-intel-oneapi-mpi", stack_impi_ver)) unload("gnu") local cmake_ver=os.getenv("cmake_ver") or "3.23.1" From 7c911e85b1633ca7bbd9d2f126061e5b35ce3373 Mon Sep 17 00:00:00 2001 From: Wei Huang Date: Thu, 17 Oct 2024 16:11:07 +0000 Subject: [PATCH 4/7] version added --- modulefiles/gfsutils_noaacloud.intel.lua | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/modulefiles/gfsutils_noaacloud.intel.lua b/modulefiles/gfsutils_noaacloud.intel.lua index 8a584ea0..028ca7b8 100644 --- a/modulefiles/gfsutils_noaacloud.intel.lua +++ b/modulefiles/gfsutils_noaacloud.intel.lua @@ -4,9 +4,12 @@ Build environment for GFS utilities on NOAA Cloud prepend_path("MODULEPATH", "/contrib/spack-stack-rocky8/spack-stack-1.6.0/envs/gsi-addon-env/install/modulefiles/Core") prepend_path("MODULEPATH", "/apps/modules/modulefiles") + load("gnu") -load("stack-intel") -load("stack-intel-oneapi-mpi") +stack_intel_ver=os.getenv("stack_intel_ver") or "2021.10.0" +load(pathJoin("stack-intel", stack_intel_ver)) +stack_impi_ver=os.getenv("stack_impi_ver") or "2021.10.0" +load(pathJoin("stack-intel-oneapi-mpi", stack_impi_ver)) unload("gnu") local cmake_ver=os.getenv("cmake_ver") or "3.23.1" From 2584c5f32128ab7572f7c9c419b403428dfcf668 Mon Sep 17 00:00:00 2001 From: Wei Huang Date: Thu, 17 Oct 2024 19:30:47 +0000 Subject: [PATCH 5/7] get rid of WARNING: UNKNOWN PLATFORM on CSPs --- ush/module-setup.sh | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/ush/module-setup.sh b/ush/module-setup.sh index 6fd6ee7d..479a3434 100755 --- a/ush/module-setup.sh +++ b/ush/module-setup.sh @@ -86,5 +86,16 @@ elif [[ $MACHINE_ID = discover* ]]; then . $SPACK_ROOT/share/spack/setup-env.sh else - echo WARNING: UNKNOWN PLATFORM 1>&2 + if [[ ! -v PW_CSP ]]; then + echo WARNING: UNKNOWN PLATFORM 1>&2 + elif [[ -z "${PW_CSP}" ]]; then + echo WARNING: UNKNOWN PLATFORM 1>&2 + else + if [[ "${PW_CSP}" == "aws" || "${PW_CSP}" == "azure" || "${PW_CSP}" == "google" ]]; then + module purge + else + echo WARNING: UNKNOWN PLATFORM 1>&2 + fi + fi + fi From 8f65f5c6027cc8cf7c7ed5f67faf95a9cb2861c1 Mon Sep 17 00:00:00 2001 From: Wei Huang Date: Fri, 18 Oct 2024 15:26:41 +0000 Subject: [PATCH 6/7] just check MACHINE_ID is noaacloud or not shuold be enough on CSPs --- ush/module-setup.sh | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/ush/module-setup.sh b/ush/module-setup.sh index 479a3434..a4635808 100755 --- a/ush/module-setup.sh +++ b/ush/module-setup.sh @@ -85,17 +85,11 @@ elif [[ $MACHINE_ID = discover* ]]; then export PATH=$PATH:$SPACK_ROOT/bin . $SPACK_ROOT/share/spack/setup-env.sh +elif [[ ${MACHINE_ID} = noaacloud ]] ; then + # We are on NOAA Cloud + module purge + else - if [[ ! -v PW_CSP ]]; then - echo WARNING: UNKNOWN PLATFORM 1>&2 - elif [[ -z "${PW_CSP}" ]]; then - echo WARNING: UNKNOWN PLATFORM 1>&2 - else - if [[ "${PW_CSP}" == "aws" || "${PW_CSP}" == "azure" || "${PW_CSP}" == "google" ]]; then - module purge - else - echo WARNING: UNKNOWN PLATFORM 1>&2 - fi - fi + echo WARNING: UNKNOWN PLATFORM 1>&2 fi From da0cc143f57a962a7a2141976037c34615c3f91a Mon Sep 17 00:00:00 2001 From: Wei Huang Date: Fri, 18 Oct 2024 15:44:46 +0000 Subject: [PATCH 7/7] move local defines together, and keep load together to improve readibility --- modulefiles/gfsutils_noaacloud.intel.lua | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/modulefiles/gfsutils_noaacloud.intel.lua b/modulefiles/gfsutils_noaacloud.intel.lua index 028ca7b8..e44d792b 100644 --- a/modulefiles/gfsutils_noaacloud.intel.lua +++ b/modulefiles/gfsutils_noaacloud.intel.lua @@ -5,15 +5,15 @@ Build environment for GFS utilities on NOAA Cloud prepend_path("MODULEPATH", "/contrib/spack-stack-rocky8/spack-stack-1.6.0/envs/gsi-addon-env/install/modulefiles/Core") prepend_path("MODULEPATH", "/apps/modules/modulefiles") +local stack_intel_ver=os.getenv("stack_intel_ver") or "2021.10.0" +local stack_impi_ver=os.getenv("stack_impi_ver") or "2021.10.0" +local cmake_ver=os.getenv("cmake_ver") or "3.23.1" + load("gnu") -stack_intel_ver=os.getenv("stack_intel_ver") or "2021.10.0" load(pathJoin("stack-intel", stack_intel_ver)) -stack_impi_ver=os.getenv("stack_impi_ver") or "2021.10.0" load(pathJoin("stack-intel-oneapi-mpi", stack_impi_ver)) unload("gnu") -local cmake_ver=os.getenv("cmake_ver") or "3.23.1" - load(pathJoin("cmake", cmake_ver)) load("gfsutils_common")