diff --git a/testingScripts/derecho_configuration_check.py b/testingScripts/derecho_configuration_check.py index e5311375..c0fc98da 100644 --- a/testingScripts/derecho_configuration_check.py +++ b/testingScripts/derecho_configuration_check.py @@ -40,10 +40,10 @@ DEFAULT_MODULE_SET_FILE = os.path.join( ) # Root of directory tree for this set of tests. -MAGE_TEST_SET_ROOT = os.environ["MAGE_TEST_SET_ROOT"] +KAIJU_TEST_SET_ROOT = os.environ["KAIJU_TEST_SET_ROOT"] # Directory for derecho configuration check results -DERECHO_CONFIGURATION_CHECK = os.path.join(MAGE_TEST_SET_ROOT, +DERECHO_CONFIGURATION_CHECK = os.path.join(KAIJU_TEST_SET_ROOT, "derecho_configuration_check") # Path to directory containing the test scripts @@ -182,10 +182,9 @@ def derecho_configuration_check(args: dict): # pbs_options["condarc"] = os.environ["CONDARC"] # pbs_options["conda_envs_path"] = os.environ["CONDA_ENVS_PATH"] pbs_options["conda_environment"] = os.environ["CONDA_ENVIRONMENT"] - pbs_options["mage_test_root"] = os.environ["MAGE_TEST_ROOT"] - pbs_options["mage_test_set_root"] = os.environ["MAGE_TEST_SET_ROOT"] + pbs_options["kaiju_test_root"] = os.environ["KAIJU_TEST_ROOT"] + pbs_options["kaiju_test_set_root"] = os.environ["KAIJU_TEST_SET_ROOT"] pbs_options["kaijuhome"] = KAIJUHOME - pbs_options["kaipy_private_root"] = os.environ["KAIPY_PRIVATE_ROOT"] pbs_options["tmpdir"] = os.environ["TMPDIR"] pbs_options["slack_bot_token"] = os.environ["SLACK_BOT_TOKEN"] pbs_options["branch_or_commit"] = os.environ["BRANCH_OR_COMMIT"] diff --git a/testingScripts/mage_reproducibility_check.py b/testingScripts/mage_reproducibility_check.py index b5d6f0dd..6fe8fafb 100644 --- a/testingScripts/mage_reproducibility_check.py +++ b/testingScripts/mage_reproducibility_check.py @@ -41,10 +41,10 @@ DEFAULT_MODULE_SET_FILE = os.path.join( ) # Root of directory tree for this set of tests. -MAGE_TEST_SET_ROOT = os.environ["MAGE_TEST_SET_ROOT"] +KAIJU_TEST_SET_ROOT = os.environ["KAIJU_TEST_SET_ROOT"] # Directory for reproducibility check results -REPRODUCIBILITY_CHECK_DIRECTORY = os.path.join(MAGE_TEST_SET_ROOT, +REPRODUCIBILITY_CHECK_DIRECTORY = os.path.join(KAIJU_TEST_SET_ROOT, "reproducibility_check") # Prefix for reproducibility check directory name @@ -240,13 +240,10 @@ def mage_reproducibility_check(args: dict): pbs_options["job_priority"] = os.environ["DERECHO_TESTING_PRIORITY"] pbs_options["walltime"] = "08:00:00" pbs_options["modules"] = module_names - pbs_options["condarc"] = os.environ["CONDARC"] - pbs_options["conda_envs_path"] = os.environ["CONDA_ENVS_PATH"] pbs_options["conda_environment"] = os.environ["CONDA_ENVIRONMENT"] - pbs_options["mage_test_root"] = os.environ["MAGE_TEST_ROOT"] - pbs_options["mage_test_set_root"] = os.environ["MAGE_TEST_SET_ROOT"] + pbs_options["kaiju_test_root"] = os.environ["KAIJU_TEST_ROOT"] + pbs_options["kaiju_test_set_root"] = os.environ["KAIJU_TEST_SET_ROOT"] pbs_options["kaijuhome"] = KAIJUHOME - pbs_options["kaipy_private_root"] = os.environ["KAIPY_PRIVATE_ROOT"] pbs_options["tmpdir"] = os.environ["TMPDIR"] pbs_options["slack_bot_token"] = os.environ["SLACK_BOT_TOKEN"] pbs_options["branch_or_commit"] = os.environ["BRANCH_OR_COMMIT"] @@ -324,13 +321,10 @@ def mage_reproducibility_check(args: dict): pbs_options["job_priority"] = os.environ["DERECHO_TESTING_PRIORITY"] pbs_options["walltime"] = "02:00:00" pbs_options["modules"] = module_names - pbs_options["condarc"] = os.environ["CONDARC"] - pbs_options["conda_envs_path"] = os.environ["CONDA_ENVS_PATH"] pbs_options["conda_environment"] = os.environ["CONDA_ENVIRONMENT"] - pbs_options["mage_test_root"] = os.environ["MAGE_TEST_ROOT"] - pbs_options["mage_test_set_root"] = os.environ["MAGE_TEST_SET_ROOT"] + pbs_options["kaiju_test_root"] = os.environ["KAIJU_TEST_ROOT"] + pbs_options["kaiju_test_set_root"] = os.environ["KAIJU_TEST_SET_ROOT"] pbs_options["kaijuhome"] = KAIJUHOME - pbs_options["kaipy_private_root"] = os.environ["KAIPY_PRIVATE_ROOT"] pbs_options["tmpdir"] = os.environ["TMPDIR"] pbs_options["slack_bot_token"] = os.environ["SLACK_BOT_TOKEN"] pbs_options["branch_or_commit"] = os.environ["BRANCH_OR_COMMIT"] diff --git a/testingScripts/relCasePost-template.pbs b/testingScripts/relCasePost-template.pbs index 31deeb57..18383967 100644 --- a/testingScripts/relCasePost-template.pbs +++ b/testingScripts/relCasePost-template.pbs @@ -12,9 +12,9 @@ echo "Job $PBS_JOBID started at `date` on `hostname` in directory `pwd`." echo 'Loading python environment.' +mage_test_root=$HOME if [ -d "${mage_test_root}/miniconda3" ]; then echo 'Loading local miniconda3' - mage_test_root='{{ mage_test_root }}' export CONDARC="${mage_test_root}/.condarc" export CONDA_ENVS_PATH="${mage_test_root}/.conda" mage_miniconda3="${mage_test_root}/miniconda3" diff --git a/testingScripts/relCaseReport-template.pbs b/testingScripts/relCaseReport-template.pbs index 0c817377..ce9dad09 100644 --- a/testingScripts/relCaseReport-template.pbs +++ b/testingScripts/relCaseReport-template.pbs @@ -12,6 +12,7 @@ echo "Job $PBS_JOBID started at `date` on `hostname` in directory `pwd`." echo 'Loading python environment.' +mage_test_root=$HOME if [ -d "${mage_test_root}/miniconda3" ]; then echo 'Loading local miniconda3' mage_test_root='{{ mage_test_root }}' diff --git a/testingScripts/relativeCase-template.pbs b/testingScripts/relativeCase-template.pbs index 24401e13..8c5e902c 100644 --- a/testingScripts/relativeCase-template.pbs +++ b/testingScripts/relativeCase-template.pbs @@ -23,6 +23,7 @@ module load {{ module }} module list echo 'Loading python environment.' +mage_test_root=$HOME if [ -d "${mage_test_root}/miniconda3" ]; then echo 'Loading local miniconda3' mage_test_root='{{ mage_test_root }}' diff --git a/testingScripts/relativeTests.py b/testingScripts/relativeTests.py index 5cdd5f7c..5448a693 100755 --- a/testingScripts/relativeTests.py +++ b/testingScripts/relativeTests.py @@ -31,17 +31,14 @@ import common DESCRIPTION = 'Run the MAGE comparative test cases.' # Root of directory tree for this set of tests. -MAGE_TEST_SET_ROOT = os.environ['MAGE_TEST_SET_ROOT'] +KAIJU_TEST_SET_ROOT = os.environ['KAIJU_TEST_SET_ROOT'] # Directory for results -TEST_DIRECTORY = os.path.join(MAGE_TEST_SET_ROOT, 'compTest') +TEST_DIRECTORY = os.path.join(KAIJU_TEST_SET_ROOT, 'compTest') # Home directory of kaiju installation KAIJUHOME = os.environ['KAIJUHOME'] -# Home directory of kaipy installation -KAIPYHOME = os.environ['KAIPYHOME'] - # Path to directory containing the test scripts TEST_SCRIPTS_DIRECTORY = os.path.join(KAIJUHOME, 'testingScripts') @@ -610,7 +607,7 @@ def main(): # Generate the LFM grid file. if verbose: print('Creating LFM grid file.') - cmd = 'genLFM.py -gid D' + cmd = 'genLFM -gid D' if debug: print(f"cmd = {cmd}") try: @@ -620,7 +617,7 @@ def main(): f"{module_set_name}.\n" f"e.cmd = {e.cmd}\n" f"e.returncode = {e.returncode}\n" - 'See testing log for output from genLFM.py.\n' + 'See testing log for output from genLFM.\n' 'Skipping remaining steps for module set' f"{module_set_name}\n") continue @@ -628,7 +625,7 @@ def main(): # Generate the solar wind boundary condition file. if verbose: print('Creating solar wind initial conditions file.') - cmd = 'cda2wind.py -t0 2016-08-09T02:00:00 -t1 2016-08-09T12:00:00' + cmd = 'cda2wind -t0 2016-08-09T02:00:00 -t1 2016-08-09T12:00:00' if debug: print(f"cmd = {cmd}") try: @@ -638,7 +635,7 @@ def main(): f" for module set {module_set_name}.\n" f"e.cmd = {e.cmd}\n" f"e.returncode = {e.returncode}\n" - 'See testing log for output from cda2wind.py.\n' + 'See testing log for output from cda2wind.\n' 'Skipping remaining steps for module set' f"{module_set_name}\n") continue @@ -646,7 +643,7 @@ def main(): # Generate the Raiju configuration file. if verbose: print('Creating Raiju configuration file.') - cmd = 'genRAIJU.py' + cmd = 'genRAIJU' if debug: print(f"cmd = {cmd}") try: @@ -656,7 +653,7 @@ def main(): f" for module set {module_set_name}.\n" f"e.cmd = {e.cmd}\n" f"e.returncode = {e.returncode}\n" - 'See testing log for output from genRCM.py.\n' + 'See testing log for output from genRCM.\n' 'Skipping remaining steps for module set ' f"{module_set_name}\n") continue @@ -668,11 +665,10 @@ def main(): base_pbs_options['job_priority'] = os.environ['DERECHO_TESTING_PRIORITY'] base_pbs_options['modules'] = module_names base_pbs_options['kaijuhome'] = KAIJUHOME - base_pbs_options['kaipyhome'] = KAIPYHOME base_pbs_options['tmpdir'] = os.environ['TMPDIR'] base_pbs_options['slack_bot_token'] = os.environ['SLACK_BOT_TOKEN'] - base_pbs_options['mage_test_root'] = os.environ['MAGE_TEST_ROOT'] - base_pbs_options['mage_test_set_root'] = os.environ['MAGE_TEST_SET_ROOT'] + base_pbs_options['kaiju_test_root'] = os.environ['KAIJU_TEST_ROOT'] + base_pbs_options['kaiju_test_set_root'] = os.environ['KAIJU_TEST_SET_ROOT'] base_pbs_options['branch_or_commit'] = os.environ['BRANCH_OR_COMMIT'] base_pbs_options["conda_environment"] = os.environ["CONDA_ENVIRONMENT"] base_pbs_options['report_options'] = '' diff --git a/testingScripts/weeklyDash-template.pbs b/testingScripts/weeklyDash-template.pbs index 8e2739de..c02c16ca 100644 --- a/testingScripts/weeklyDash-template.pbs +++ b/testingScripts/weeklyDash-template.pbs @@ -20,19 +20,28 @@ echo 'The currently loaded modules are:' module list echo 'Loading python environment.' -# mage_miniconda3="${HOME}/miniconda3" -# mage_conda="${mage_miniconda3}/bin/conda" -# __conda_setup="$($mage_conda 'shell.bash' 'hook' 2> /dev/null)" -# if [ $? -eq 0 ]; then -# eval "$__conda_setup" -# else -# if [ -f "$mage_miniconda3/etc/profile.d/conda.sh" ]; then -# . "$mage_miniconda3/etc/profile.d/conda.sh" -# else -# export PATH="$mage_miniconda3/bin:$PATH" -# fi -# fi -# unset __conda_setup +mage_test_root=$HOME +if [ -d "${mage_test_root}/miniconda3" ]; then + echo 'Loading local miniconda3' + export CONDARC="${mage_test_root}/.condarc" + export CONDA_ENVS_PATH="${mage_test_root}/.conda" + mage_miniconda3="${mage_test_root}/miniconda3" + mage_conda="${mage_miniconda3}/bin/conda" + __conda_setup="$($mage_conda 'shell.bash' 'hook' 2> /dev/null)" + if [ $? -eq 0 ]; then + eval "$__conda_setup" + else + if [ -f "$mage_miniconda3/etc/profile.d/conda.sh" ]; then + . "$mage_miniconda3/etc/profile.d/conda.sh" + else + export PATH="$mage_miniconda3/bin:$PATH" + fi + fi + unset __conda_setup +else + echo 'Loading conda module' + module load conda +fi conda activate {{ conda_environment }} echo "The current conda environment is ${CONDA_PREFIX}." @@ -40,18 +49,14 @@ echo 'Setting up MAGE environment.' source {{ kaijuhome }}/scripts/setupEnvironment.sh echo "The kaiju software is located at ${KAIJUHOME}." -echo 'Setting up kaipy environment.' -source {{ kaipy_private_root }}/kaipy/scripts/setupEnvironment.sh -echo "The kaipy software is located at ${KAIPYHOME}." - echo 'Setting environment variables.' export TMPDIR={{ tmpdir }} export SLACK_BOT_TOKEN={{ slack_bot_token }} export OMP_NUM_THREADS=128 export MPI_TYPE_DEPTH=32 export KMP_STACKSIZE=128M -export MAGE_TEST_ROOT="{{ mage_test_root }}" -export MAGE_TEST_SET_ROOT={{ mage_test_set_root }} +export KAIJU_TEST_ROOT={{ kaiju_test_root }} +export KAIJU_TEST_SET_ROOT={{ kaiju_test_set_root }} export BRANCH_OR_COMMIT={{ branch_or_commit }} echo 'The active environment variables are:' @@ -81,10 +86,10 @@ echo 'Generating the solar wind boundary condition file.' {{ cda2wind_cmd }} echo "The solar wind boundary condition file is `ls bcwind.h5`." -# Generate the RCM configuration file. -echo 'Generating the RCM configuration file.' -{{ genRCM_cmd }} -echo "The RCM configuration file is `ls rcmconfig.h5`." +# Generate tjhe raiju configuration file. +echo 'Generating the RAIJU configuration file.' +genRAIJU +echo "The RAIJU configuration file is `ls raijuconfig.h5`." # Run the model. MPICOMMAND="{{ mpiexec_cmd }}" diff --git a/testingScripts/weeklyDash.py b/testingScripts/weeklyDash.py index 50bd5183..6fec3f44 100644 --- a/testingScripts/weeklyDash.py +++ b/testingScripts/weeklyDash.py @@ -40,10 +40,10 @@ DEFAULT_MODULE_SET_FILE = os.path.join( ) # Root of directory tree for this set of tests. -MAGE_TEST_SET_ROOT = os.environ["MAGE_TEST_SET_ROOT"] +KAIJU_TEST_SET_ROOT = os.environ["KAIJU_TEST_SET_ROOT"] # Directory for weekly dash results -WEEKLY_DASH_DIRECTORY = os.path.join(MAGE_TEST_SET_ROOT, "weeklyDash") +WEEKLY_DASH_DIRECTORY = os.path.join(KAIJU_TEST_SET_ROOT, "weeklyDash") # Path to directory containing the test scripts TEST_SCRIPTS_DIRECTORY = os.path.join(KAIJUHOME, "testingScripts") @@ -142,16 +142,13 @@ def weekly_dash(args: dict): make_cmd = "make voltron_mpi.x" # Create the command to generate the LFM grid. - genLFM_cmd = "genLFM.py -gid Q" + genLFM_cmd = "genLFM -gid Q" # Create the command to generate the solar wind boundary condition file. cda2wind_cmd = ( - "cda2wind.py -t0 2016-08-09T02:00:00 -t1 2016-08-09T12:00:00" + "cda2wind -t0 2016-08-09T02:00:00 -t1 2016-08-09T12:00:00" ) - # Create the command to generate the RCM configuration. - genRCM_cmd = "genRCM.py" - # Create the command for launching an MPI program. mpiexec_cmd = f"mpiexec {KAIJUHOME}/scripts/preproc/pinCpuCores.sh" @@ -179,10 +176,9 @@ def weekly_dash(args: dict): pbs_options["walltime"] = "08:00:00" pbs_options["modules"] = module_names pbs_options["conda_environment"] = os.environ["CONDA_ENVIRONMENT"] - pbs_options["mage_test_root"] = os.environ["MAGE_TEST_ROOT"] - pbs_options["mage_test_set_root"] = os.environ["MAGE_TEST_SET_ROOT"] + pbs_options["kaiju_test_root"] = os.environ["KAIJU_TEST_ROOT"] + pbs_options["kaiju_test_set_root"] = os.environ["KAIJU_TEST_SET_ROOT"] pbs_options["kaijuhome"] = KAIJUHOME - pbs_options["kaipy_private_root"] = os.environ["KAIPY_PRIVATE_ROOT"] pbs_options["tmpdir"] = os.environ["TMPDIR"] pbs_options["slack_bot_token"] = os.environ["SLACK_BOT_TOKEN"] pbs_options["branch_or_commit"] = os.environ["BRANCH_OR_COMMIT"] @@ -190,7 +186,6 @@ def weekly_dash(args: dict): pbs_options["make_cmd"] = make_cmd pbs_options["genLFM_cmd"] = genLFM_cmd pbs_options["cda2wind_cmd"] = cda2wind_cmd - pbs_options["genRCM_cmd"] = genRCM_cmd pbs_options["mpiexec_cmd"] = mpiexec_cmd pbs_options["voltron_cmd"] = voltron_cmd