From 823ee3ed277de8a79ed5f5a42182cf73a4a69f28 Mon Sep 17 00:00:00 2001 From: Biju Date: Fri, 30 Aug 2024 14:17:25 +0000 Subject: [PATCH 1/3] Changes related to /lfs5 migration on Jet --- modulefiles/gsi_jet.intel.lua | 4 ++-- regression/regression_var.sh | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/modulefiles/gsi_jet.intel.lua b/modulefiles/gsi_jet.intel.lua index ba6a38f65..044a5946b 100644 --- a/modulefiles/gsi_jet.intel.lua +++ b/modulefiles/gsi_jet.intel.lua @@ -1,7 +1,7 @@ help([[ ]]) -prepend_path("MODULEPATH", "/mnt/lfs4/HFIP/hfv3gfs/role.epic/spack-stack/spack-stack-1.6.0/envs/unified-env-rocky8/install/modulefiles/Core") +prepend_path("MODULEPATH", "/contrib/spack-stack/spack-stack-1.6.0/envs/unified-env-rocky8/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.5.0" @@ -20,6 +20,6 @@ load(pathJoin("prod_util", prod_util_ver)) pushenv("CFLAGS", "-axSSE4.2,AVX,CORE-AVX2") pushenv("FFLAGS", "-axSSE4.2,AVX,CORE-AVX2") -pushenv("GSI_BINARY_SOURCE_DIR", "/mnt/lfs4/HFIP/hfv3gfs/glopara/git/fv3gfs/fix/gsi/20240208") +pushenv("GSI_BINARY_SOURCE_DIR", "/lfs5/HFIP/hfv3gfs/glopara/FIX/fix/gsi/20240208") whatis("Description: GSI environment on Jet with Intel Compilers") diff --git a/regression/regression_var.sh b/regression/regression_var.sh index 4a2bc8587..249c27d1d 100755 --- a/regression/regression_var.sh +++ b/regression/regression_var.sh @@ -32,7 +32,7 @@ fi # Determine the machine if [[ -d /scratch1 ]]; then # Hera export machine="Hera" -elif [[ -d /mnt/lfs4 || -d /jetmon || -d /mnt/lfs5 ]]; then # Jet +elif [[ -d /mnt/lfs5 || -d /jetmon || -d /mnt/lfs5 ]]; then # Jet export machine="Jet" elif [[ -d /discover ]]; then # NCCS Discover export machine="Discover" From 7cbe413c08b65988c61841a9b7f4d8139e4bf81b Mon Sep 17 00:00:00 2001 From: Biju Date: Mon, 9 Sep 2024 18:25:23 +0000 Subject: [PATCH 2/3] Updating new impi version, impi/2024.2.1 on Jet --- modulefiles/gsi_jet.intel.lua | 2 ++ 1 file changed, 2 insertions(+) diff --git a/modulefiles/gsi_jet.intel.lua b/modulefiles/gsi_jet.intel.lua index 044a5946b..b817cf45e 100644 --- a/modulefiles/gsi_jet.intel.lua +++ b/modulefiles/gsi_jet.intel.lua @@ -6,11 +6,13 @@ prepend_path("MODULEPATH", "/contrib/spack-stack/spack-stack-1.6.0/envs/unified- local python_ver=os.getenv("python_ver") or "3.11.6" local stack_intel_ver=os.getenv("stack_intel_ver") or "2021.5.0" local stack_impi_ver=os.getenv("stack_impi_ver") or "2021.5.1" +local impi_ver=os.getenv("impi_ver") or "2024.2.1" 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("impi", impi_ver)) load(pathJoin("python", python_ver)) load(pathJoin("cmake", cmake_ver)) From e2601cbda4a51b3b71afab3bcc56e8987398d0b9 Mon Sep 17 00:00:00 2001 From: Biju Date: Tue, 10 Sep 2024 12:59:46 +0000 Subject: [PATCH 3/3] Updating new impi version, impi/2024.2.1 on Jet --- modulefiles/gsi_jet.intel.lua | 3 +++ 1 file changed, 3 insertions(+) diff --git a/modulefiles/gsi_jet.intel.lua b/modulefiles/gsi_jet.intel.lua index b817cf45e..5bfe7c295 100644 --- a/modulefiles/gsi_jet.intel.lua +++ b/modulefiles/gsi_jet.intel.lua @@ -24,4 +24,7 @@ pushenv("FFLAGS", "-axSSE4.2,AVX,CORE-AVX2") pushenv("GSI_BINARY_SOURCE_DIR", "/lfs5/HFIP/hfv3gfs/glopara/FIX/fix/gsi/20240208") +setenv("CC", "mpiicc") +setenv("CXX", "mpiicpc") +setenv("FC", "mpiifort") whatis("Description: GSI environment on Jet with Intel Compilers")