Skip to content

Commit b9f7735

Browse files
committed
Try fix lai setting
1 parent ada149c commit b9f7735

File tree

2 files changed

+6
-3
lines changed

2 files changed

+6
-3
lines changed

.github/workflows/build_and_test.yml

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -144,16 +144,19 @@ jobs:
144144
# there's no conflict with the host-config files.
145145
146146
# Hypre
147+
ENABLE_HYPRE=${{ inputs.ENABLE_HYPRE }}
147148
if [ ! -z "${{ inputs.ENABLE_HYPRE }}" ]; then
148149
script_args+=(--enable-hypre "${{ inputs.ENABLE_HYPRE }}")
149150
fi
150151
151152
# Trilinos
153+
ENABLE_TRILINOS=${{ inputs.ENABLE_TRILINOS }}
152154
if [ ! -z "${{ inputs.ENABLE_TRILINOS }}" ]; then
153-
script_args+=(--enable-hypre "${{ inputs.ENABLE_TRILINOS }}")
155+
script_args+=(--enable-trilinos "${{ inputs.ENABLE_TRILINOS }}")
154156
fi
155157
156-
# TODO test ENABLE_HYPRE_DEVICE
158+
# ENABLE_HYPRE_DEVICE
159+
ENABLE_HYPRE_DEVICE=${{ inputs.ENABLE_HYPRE_DEVICE }}
157160
if [ ! -z "${{ inputs.ENABLE_HYPRE_DEVICE }}" ]; then
158161
script_args+=(--enable-hypre-device "${{ inputs.ENABLE_HYPRE_DEVICE }}")
159162
fi

scripts/ci_build_and_test_in_container.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ exit 1
7474
or_die cd $(dirname $0)/..
7575

7676
# Parsing using getopt
77-
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 -- "$@")
77+
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 -- "$@")
7878

7979
# Variables with default values
8080
BUILD_EXE_ONLY=false

0 commit comments

Comments
 (0)