Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Framework: Add support for using EXTRA_CONFIGURE_ARGS env variable #13622

Merged
merged 3 commits into from
Dec 5, 2024
Merged

Framework: Add support for using EXTRA_CONFIGURE_ARGS env variable #13622

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2921025
Add support for using env variable
jmlapre Nov 13, 2024
a9ab78b
add FORCE back to Trilinos_ENABLE_TESTS
jmlapre Nov 25, 2024
fccec09
add rhel8_sems...all-no-epetra
jmlapre Dec 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions packages/framework/ini-files/config-specs.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1563,6 +1563,12 @@ opt-set-cmake-var Trilinos_ENABLE_TESTS BOOL FORCE : OFF
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
use PACKAGE-ENABLES|ALL-NO-EPETRA

[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-no-epetra]
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_all

use CUDA11-RUN-SERIAL-TESTS
opt-set-cmake-var Trilinos_ENABLE_TESTS BOOL FORCE : ON

[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_no-uvm_deprecated-on_no-package-enables]
# uses sems-v2 modules
use RHEL8
Expand Down
3 changes: 3 additions & 0 deletions packages/framework/pr_tools/LaunchDriver.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,8 +116,11 @@ def main(argv):
if args.kokkos_develop:
cmd += " --kokkos-develop"

# extra-configure-args flag currently takes precedence over the env. var.
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)

Expand Down
3 changes: 2 additions & 1 deletion packages/framework/pr_tools/trilinosprhelpers/TrilinosPRConfigurationBase.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion packages/framework/pr_tools/trilinosprhelpers/TrilinosPRConfigurationStandard.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ class TrilinosPRConfigurationStandard(TrilinosPRConfigurationBase):
Implements Standard mode Trilinos Pull Request Driver
"""
def __init__(self, args):
super(TrilinosPRConfigurationStandard, self).__init__(args)
super().__init__(args)


def execute_test(self):
Expand Down
Loading