From c1c56bb72b02d4db4ae36fe297e85ad016ce9c3c Mon Sep 17 00:00:00 2001 From: "Justin M. LaPre" Date: Wed, 13 Nov 2024 11:27:35 -0700 Subject: [PATCH] Add support for using env variable EXTRA_CONFIGURE_ARGS can now be used to pass extra flags to our build scripts. Also had to remove FORCE from Trilinos_ENABLE_TESTS flag so that we are able to override it. --- packages/framework/ini-files/config-specs.ini | 2 +- packages/framework/pr_tools/LaunchDriver.py | 2 ++ .../pr_tools/trilinosprhelpers/TrilinosPRConfigurationBase.py | 3 ++- .../trilinosprhelpers/TrilinosPRConfigurationStandard.py | 3 +++ 4 files changed, 8 insertions(+), 2 deletions(-) diff --git a/packages/framework/ini-files/config-specs.ini b/packages/framework/ini-files/config-specs.ini index de052bca3530..984232a11289 100644 --- a/packages/framework/ini-files/config-specs.ini +++ b/packages/framework/ini-files/config-specs.ini @@ -1557,7 +1557,7 @@ use SEMS_COMMON_CUDA_11 use CUDA11-RUN-SERIAL-TESTS -opt-set-cmake-var Trilinos_ENABLE_TESTS BOOL FORCE : OFF +opt-set-cmake-var Trilinos_ENABLE_TESTS BOOL : OFF [rhel8_sems-cuda-11.4.2-gnu-10.1.0-openmpi-4.1.6_release_static_Volta70_no-asan_complex_no-fpic_mpi_pt_no-rdc_uvm_deprecated-on_all] use rhel8_sems-cuda-11.4.2-gnu-10.1.0-openmpi-4.1.6_release_static_Volta70_no-asan_complex_no-fpic_mpi_pt_no-rdc_uvm_deprecated-on_no-package-enables diff --git a/packages/framework/pr_tools/LaunchDriver.py b/packages/framework/pr_tools/LaunchDriver.py index fe4f20f40372..66994741099f 100755 --- a/packages/framework/pr_tools/LaunchDriver.py +++ b/packages/framework/pr_tools/LaunchDriver.py @@ -118,6 +118,8 @@ def main(argv): if args.extra_configure_args: cmd += f" --extra-configure-args=\"{args.extra_configure_args}\"" + elif os.getenv("EXTRA_CONFIGURE_ARGS"): + cmd += f" --extra-configure-args=\"{os.getenv('EXTRA_CONFIGURE_ARGS')}\"" print("LaunchDriver> EXEC: " + cmd, flush=True) diff --git a/packages/framework/pr_tools/trilinosprhelpers/TrilinosPRConfigurationBase.py b/packages/framework/pr_tools/trilinosprhelpers/TrilinosPRConfigurationBase.py index 5ca1499c2dfa..f62bda5229a4 100644 --- a/packages/framework/pr_tools/trilinosprhelpers/TrilinosPRConfigurationBase.py +++ b/packages/framework/pr_tools/trilinosprhelpers/TrilinosPRConfigurationBase.py @@ -790,7 +790,8 @@ def prepare_test(self): "F77", "F90", "FC", - "MODULESHOME" + "MODULESHOME", + "EXTRA_CONFIGURE_ARGS" ] self.message("") tr_env.set_environment.pretty_print_envvars(envvar_filter=envvars_to_print) diff --git a/packages/framework/pr_tools/trilinosprhelpers/TrilinosPRConfigurationStandard.py b/packages/framework/pr_tools/trilinosprhelpers/TrilinosPRConfigurationStandard.py index 401824ea8b6d..9c7413f512df 100644 --- a/packages/framework/pr_tools/trilinosprhelpers/TrilinosPRConfigurationStandard.py +++ b/packages/framework/pr_tools/trilinosprhelpers/TrilinosPRConfigurationStandard.py @@ -18,6 +18,9 @@ class TrilinosPRConfigurationStandard(TrilinosPRConfigurationBase): """ def __init__(self, args): super(TrilinosPRConfigurationStandard, self).__init__(args) + if "extra_configure_args" in args: + d = vars(args) + self._arg_extra_configure_args = d["extra_configure_args"] def execute_test(self):