From d9c0064ca7080df138d0c2b22386594a68968554 Mon Sep 17 00:00:00 2001 From: "Christina.Holt" Date: Fri, 13 May 2022 22:11:47 +0000 Subject: [PATCH 1/3] Pin down hera miniconda3 module file version. --- modulefiles/tasks/hera/get_obs.local | 4 ++-- modulefiles/tasks/hera/miniconda_regional_workflow | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/modulefiles/tasks/hera/get_obs.local b/modulefiles/tasks/hera/get_obs.local index c41c17de8..d30a2a918 100644 --- a/modulefiles/tasks/hera/get_obs.local +++ b/modulefiles/tasks/hera/get_obs.local @@ -7,7 +7,7 @@ module purge module load hpss -module use -a /contrib/miniconda3/modulefiles -module load miniconda3 +module use /contrib/miniconda3/modulefiles +module load miniconda3/4.5.12 setenv SRW_ENV pygraf diff --git a/modulefiles/tasks/hera/miniconda_regional_workflow b/modulefiles/tasks/hera/miniconda_regional_workflow index 011a832c9..48de7a99b 100644 --- a/modulefiles/tasks/hera/miniconda_regional_workflow +++ b/modulefiles/tasks/hera/miniconda_regional_workflow @@ -1,5 +1,5 @@ #%Module -module use -a /contrib/miniconda3/modulefiles -module load miniconda3 +module use /contrib/miniconda3/modulefiles +module load miniconda3/4.5.12 setenv SRW_ENV regional_workflow From 6891417a697e4c72afeb0da057041cd6d9734ce0 Mon Sep 17 00:00:00 2001 From: "Christina.Holt" Date: Wed, 18 May 2022 20:54:50 +0000 Subject: [PATCH 2/3] Update the auto test script for new modules. --- tests/WE2E/setup_WE2E_tests.sh | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/tests/WE2E/setup_WE2E_tests.sh b/tests/WE2E/setup_WE2E_tests.sh index 1aad10054..fce34be8e 100755 --- a/tests/WE2E/setup_WE2E_tests.sh +++ b/tests/WE2E/setup_WE2E_tests.sh @@ -76,9 +76,11 @@ exec_subdir='bin_intel/bin' #----------------------------------------------------------------------- # Load Python Modules -env_file="${SRW_APP_DIR}/env/wflow_${machine}.env" -source ${env_file} +env_file="${SRW_APP_DIR}/env/wflow_${machine}" echo "-- Load environment =>" $env_file +module use $( dirname ${env_file} ) +module load ${env_file} +conda activate regional_workflow module list From 7ae72e023ce311d2cd7380681da283576ec2cf4d Mon Sep 17 00:00:00 2001 From: "Christina.Holt" Date: Thu, 19 May 2022 17:11:29 +0000 Subject: [PATCH 3/3] Don't butcher the module load. --- tests/WE2E/setup_WE2E_tests.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/tests/WE2E/setup_WE2E_tests.sh b/tests/WE2E/setup_WE2E_tests.sh index fce34be8e..de6cdf0c2 100755 --- a/tests/WE2E/setup_WE2E_tests.sh +++ b/tests/WE2E/setup_WE2E_tests.sh @@ -76,9 +76,10 @@ exec_subdir='bin_intel/bin' #----------------------------------------------------------------------- # Load Python Modules -env_file="${SRW_APP_DIR}/env/wflow_${machine}" +env_path="${SRW_APP_DIR}/modulefiles" +env_file="wflow_${machine}" echo "-- Load environment =>" $env_file -module use $( dirname ${env_file} ) +module use ${env_path} module load ${env_file} conda activate regional_workflow