From f47d707e6af132e6f013e5fbd5f5eb41d4631ca5 Mon Sep 17 00:00:00 2001 From: EdwardSnyder-NOAA Date: Tue, 10 Dec 2024 21:10:12 +0000 Subject: [PATCH] add logic to handle missing intel variable on PW Azure --- modulefiles/tasks/noaacloud/python_srw.lua | 5 +++++ modulefiles/tasks/noaacloud/run_vx.local.lua | 5 +++++ ush/wrappers/run_fcst.sh | 4 ++++ ush/wrappers/run_make_ics.sh | 4 ++++ ush/wrappers/run_make_lbcs.sh | 5 +++++ ush/wrappers/run_make_sfc_climo.sh | 5 +++++ ush/wrappers/run_post.sh | 4 ++++ 7 files changed, 32 insertions(+) diff --git a/modulefiles/tasks/noaacloud/python_srw.lua b/modulefiles/tasks/noaacloud/python_srw.lua index a2dd45084c..a89a13ec9d 100644 --- a/modulefiles/tasks/noaacloud/python_srw.lua +++ b/modulefiles/tasks/noaacloud/python_srw.lua @@ -1,2 +1,7 @@ load("conda") setenv("SRW_ENV", "srw_app") + +-- Declare Intel library variable for Azure +if os.getenv("PW_CSP") == "azure" then + setenv("FI_PROVIDER","tcp") +end diff --git a/modulefiles/tasks/noaacloud/run_vx.local.lua b/modulefiles/tasks/noaacloud/run_vx.local.lua index 737fc4f7cc..2f4cbfa2ed 100644 --- a/modulefiles/tasks/noaacloud/run_vx.local.lua +++ b/modulefiles/tasks/noaacloud/run_vx.local.lua @@ -25,3 +25,8 @@ end load("ufs-pyenv") load("conda") setenv("SRW_ENV", "srw_app") + +-- Declare Intel library variable for Azure +if os.getenv("PW_CSP") == "azure" then + setenv("FI_PROVIDER","tcp") +end diff --git a/ush/wrappers/run_fcst.sh b/ush/wrappers/run_fcst.sh index c875cb16c0..e4c21461c1 100755 --- a/ush/wrappers/run_fcst.sh +++ b/ush/wrappers/run_fcst.sh @@ -11,6 +11,10 @@ export cyc=${DATE_FIRST_CYCL:8:2} export PDY=${DATE_FIRST_CYCL:0:8} export SLASH_ENSMEM_SUBDIR="" export ENSMEM_INDX="" +# Declare Intel library variable for Azure +if [ ${PW_CSP} == "azure" ]; then + export FI_PROVIDER=tcp +fi ${JOBSdir}/JREGIONAL_RUN_FCST diff --git a/ush/wrappers/run_make_ics.sh b/ush/wrappers/run_make_ics.sh index adcdc16180..2fff071254 100755 --- a/ush/wrappers/run_make_ics.sh +++ b/ush/wrappers/run_make_ics.sh @@ -11,6 +11,10 @@ export cyc=${DATE_FIRST_CYCL:8:2} export PDY=${DATE_FIRST_CYCL:0:8} export SLASH_ENSMEM_SUBDIR="" export NWGES_DIR=${NWGES_BASEDIR}/${DATE_FIRST_CYCL:0:8} +# Declare Intel library variable for Azure +if [ ${PW_CSP} == "azure" ]; then + export FI_PROVIDER=tcp +fi ${JOBSdir}/JREGIONAL_MAKE_ICS diff --git a/ush/wrappers/run_make_lbcs.sh b/ush/wrappers/run_make_lbcs.sh index f9fe35d9da..6f4fe55376 100755 --- a/ush/wrappers/run_make_lbcs.sh +++ b/ush/wrappers/run_make_lbcs.sh @@ -13,5 +13,10 @@ export SLASH_ENSMEM_SUBDIR="" export NWGES_DIR=${NWGES_BASEDIR}/${DATE_FIRST_CYCL:0:8} export bcgrp="00" export bcgrpnum="1" +# Declare Intel library variable for Azure +if [ ${PW_CSP} == "azure" ]; then + export FI_PROVIDER=tcp +fi + ${JOBSdir}/JREGIONAL_MAKE_LBCS diff --git a/ush/wrappers/run_make_sfc_climo.sh b/ush/wrappers/run_make_sfc_climo.sh index 8024f529fc..2670c80504 100755 --- a/ush/wrappers/run_make_sfc_climo.sh +++ b/ush/wrappers/run_make_sfc_climo.sh @@ -8,4 +8,9 @@ set -xa export CDATE=${DATE_FIRST_CYCL} export CYCLE_DIR=${EXPTDIR}/${CDATE} +# Declare Intel library variable for Azure +if [ ${PW_CSP} == "azure" ]; then + export FI_PROVIDER=tcp +fi + ${JOBSdir}/JREGIONAL_MAKE_SFC_CLIMO diff --git a/ush/wrappers/run_post.sh b/ush/wrappers/run_post.sh index ca060acb1f..bf04ca5ba9 100755 --- a/ush/wrappers/run_post.sh +++ b/ush/wrappers/run_post.sh @@ -11,6 +11,10 @@ export cyc=${DATE_FIRST_CYCL:8:2} export PDY=${DATE_FIRST_CYCL:0:8} export SLASH_ENSMEM_SUBDIR="" export ENSMEM_INDX="" +# Declare Intel library variable for Azure +if [ ${PW_CSP} == "azure" ]; then + export FI_PROVIDER=tcp +fi num_fcst_hrs=${FCST_LEN_HRS} for (( i=0; i<=$((num_fcst_hrs)); i++ )); do