From b9f773553d44d168264caeeae4b2f15289e55e9b Mon Sep 17 00:00:00 2001 From: Brian Han Date: Thu, 18 Apr 2024 14:17:41 -0700 Subject: [PATCH] Try fix lai setting --- .github/workflows/build_and_test.yml | 7 +++++-- scripts/ci_build_and_test_in_container.sh | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml index a0494b7b913..ccfa17ea009 100644 --- a/.github/workflows/build_and_test.yml +++ b/.github/workflows/build_and_test.yml @@ -144,16 +144,19 @@ jobs: # there's no conflict with the host-config files. # Hypre + ENABLE_HYPRE=${{ inputs.ENABLE_HYPRE }} if [ ! -z "${{ inputs.ENABLE_HYPRE }}" ]; then script_args+=(--enable-hypre "${{ inputs.ENABLE_HYPRE }}") fi # Trilinos + ENABLE_TRILINOS=${{ inputs.ENABLE_TRILINOS }} if [ ! -z "${{ inputs.ENABLE_TRILINOS }}" ]; then - script_args+=(--enable-hypre "${{ inputs.ENABLE_TRILINOS }}") + script_args+=(--enable-trilinos "${{ inputs.ENABLE_TRILINOS }}") fi - # TODO test ENABLE_HYPRE_DEVICE + # ENABLE_HYPRE_DEVICE + ENABLE_HYPRE_DEVICE=${{ inputs.ENABLE_HYPRE_DEVICE }} if [ ! -z "${{ inputs.ENABLE_HYPRE_DEVICE }}" ]; then script_args+=(--enable-hypre-device "${{ inputs.ENABLE_HYPRE_DEVICE }}") fi diff --git a/scripts/ci_build_and_test_in_container.sh b/scripts/ci_build_and_test_in_container.sh index 9b9b8b71e6b..a6e868b8901 100755 --- a/scripts/ci_build_and_test_in_container.sh +++ b/scripts/ci_build_and_test_in_container.sh @@ -74,7 +74,7 @@ exit 1 or_die cd $(dirname $0)/.. # Parsing using getopt -args=$(or_die getopt -a -o h --long build-exe-only,cmake-build-type:,code-coverage,data-basename:,exchange-dir:,host-config:,install-dir-basename:,no-install-schema,no-run-unit-tests,repository:,run-integrated-tests,sccache-credentials:,test-code-style,test-documentation,help -- "$@") +args=$(or_die getopt -a -o h --long build-exe-only,cmake-build-type:,code-coverage,data-basename:,enable-hypre:,enable-hypre-device:,enable-trilinos:,exchange-dir:,host-config:,install-dir-basename:,no-install-schema,no-run-unit-tests,repository:,run-integrated-tests,sccache-credentials:,test-code-style,test-documentation,help -- "$@") # Variables with default values BUILD_EXE_ONLY=false