From fa565779999c770b527f89a5df4b3d9959590867 Mon Sep 17 00:00:00 2001 From: Wei Huang Date: Fri, 26 Apr 2024 00:17:53 +0000 Subject: [PATCH 1/3] changes for AWS --- modulefiles/gsi_noaacloud.intel.lua | 26 ++++++++++++++++++++++++++ ush/module-setup.sh | 4 ++++ 2 files changed, 30 insertions(+) create mode 100644 modulefiles/gsi_noaacloud.intel.lua diff --git a/modulefiles/gsi_noaacloud.intel.lua b/modulefiles/gsi_noaacloud.intel.lua new file mode 100644 index 0000000000..c3e4dc87a0 --- /dev/null +++ b/modulefiles/gsi_noaacloud.intel.lua @@ -0,0 +1,26 @@ +help([[ +]]) + +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 stack_python_ver=os.getenv("stack_python_ver") or "3.11.6" +local cmake_ver=os.getenv("cmake_ver") or "3.23.1" +local prod_util_ver=os.getenv("prod_util_ver") or "2.1.1" + +load(pathJoin("stack-intel", stack_intel_ver)) +load(pathJoin("stack-intel-oneapi-mpi", stack_impi_ver)) +load(pathJoin("python", stack_python_ver)) +load(pathJoin("cmake", cmake_ver)) + +load("gsi_common") +load(pathJoin("prod_util", prod_util_ver)) + +pushenv("CFLAGS", "-xHOST") +pushenv("FFLAGS", "-xHOST") + +--pushenv("GSI_BINARY_SOURCE_DIR", "/scratch1/NCEPDEV/global/glopara/fix/gsi/20240208") +--pushenv("GSI_BINARY_SOURCE_DIR", "/work/noaa/global/glopara/fix/gsi/20240208") +pushenv("GSI_BINARY_SOURCE_DIR", "/contrib/Wei.Huang/data/hack-orion/fix/gsi/20240208") diff --git a/ush/module-setup.sh b/ush/module-setup.sh index c1893ab4ee..f587842f0f 100755 --- a/ush/module-setup.sh +++ b/ush/module-setup.sh @@ -75,6 +75,10 @@ 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 echo WARNING: UNKNOWN PLATFORM 1>&2 fi From 2316996f767d8b4588c6886b66af7d26cfb0c5da Mon Sep 17 00:00:00 2001 From: Wei Huang Date: Mon, 29 Apr 2024 15:48:48 +0000 Subject: [PATCH 2/3] compile on AWS --- modulefiles/gsi_noaacloud.intel.lua | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/modulefiles/gsi_noaacloud.intel.lua b/modulefiles/gsi_noaacloud.intel.lua index c3e4dc87a0..28e3ec7890 100644 --- a/modulefiles/gsi_noaacloud.intel.lua +++ b/modulefiles/gsi_noaacloud.intel.lua @@ -4,15 +4,15 @@ help([[ 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 python_ver=os.getenv("python_ver") or "3.10.13" 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 stack_python_ver=os.getenv("stack_python_ver") or "3.11.6" local cmake_ver=os.getenv("cmake_ver") or "3.23.1" local prod_util_ver=os.getenv("prod_util_ver") or "2.1.1" load(pathJoin("stack-intel", stack_intel_ver)) load(pathJoin("stack-intel-oneapi-mpi", stack_impi_ver)) -load(pathJoin("python", stack_python_ver)) +load(pathJoin("python", python_ver)) load(pathJoin("cmake", cmake_ver)) load("gsi_common") @@ -24,3 +24,5 @@ pushenv("FFLAGS", "-xHOST") --pushenv("GSI_BINARY_SOURCE_DIR", "/scratch1/NCEPDEV/global/glopara/fix/gsi/20240208") --pushenv("GSI_BINARY_SOURCE_DIR", "/work/noaa/global/glopara/fix/gsi/20240208") pushenv("GSI_BINARY_SOURCE_DIR", "/contrib/Wei.Huang/data/hack-orion/fix/gsi/20240208") + +whatis("Description: GSI environment on NOAA Cloud with Intel Compilers") From bd025dfd6cceaa29912818354673e4b9b8eff57b Mon Sep 17 00:00:00 2001 From: Wei Huang Date: Mon, 6 May 2024 20:06:17 +0000 Subject: [PATCH 3/3] remove comments and unified-env to be consistent with other platform --- modulefiles/gsi_noaacloud.intel.lua | 3 --- 1 file changed, 3 deletions(-) diff --git a/modulefiles/gsi_noaacloud.intel.lua b/modulefiles/gsi_noaacloud.intel.lua index 28e3ec7890..e2e019628e 100644 --- a/modulefiles/gsi_noaacloud.intel.lua +++ b/modulefiles/gsi_noaacloud.intel.lua @@ -1,7 +1,6 @@ help([[ ]]) -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 python_ver=os.getenv("python_ver") or "3.10.13" @@ -21,8 +20,6 @@ load(pathJoin("prod_util", prod_util_ver)) pushenv("CFLAGS", "-xHOST") pushenv("FFLAGS", "-xHOST") ---pushenv("GSI_BINARY_SOURCE_DIR", "/scratch1/NCEPDEV/global/glopara/fix/gsi/20240208") ---pushenv("GSI_BINARY_SOURCE_DIR", "/work/noaa/global/glopara/fix/gsi/20240208") pushenv("GSI_BINARY_SOURCE_DIR", "/contrib/Wei.Huang/data/hack-orion/fix/gsi/20240208") whatis("Description: GSI environment on NOAA Cloud with Intel Compilers")