Skip to content

Commit

Permalink
do not set TEST_MACCEL globally
Browse files Browse the repository at this point in the history
Signed-off-by: Tung D. Le <[email protected]>
  • Loading branch information
tungld committed Oct 25, 2024
1 parent bfb2ace commit 3895ca8
Showing 1 changed file with 4 additions and 8 deletions.
12 changes: 4 additions & 8 deletions docker/Dockerfile.onnx-mlir
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@ ARG NPROC=4
ARG ACCEL=NNPA
ARG TEST_NOFLOAT16
ARG TEST_MCPU
ARG TEST_MACCEL
ARG KEEPSRC

RUN LLVM_PROJECT_ROOT=${WORK_DIR}/llvm-project \
Expand Down Expand Up @@ -57,10 +56,7 @@ RUN LLVM_PROJECT_ROOT=${WORK_DIR}/llvm-project \
&& TEST_MCPU=${TEST_MCPU:-$([ "$(uname -m)" = "s390x" ] && echo z16 || \
([ "$(uname -m)" = "x86_64" ] && echo || \
([ "$(uname -m)" = "ppc64le" ] && echo || echo)))} \
&& TEST_MACCEL=${TEST_MACCEL:-$([ "$(uname -m)" = "s390x" ] && echo NNPA || \
([ "$(uname -m)" = "x86_64" ] && echo NONE|| \
([ "$(uname -m)" = "ppc64le" ] && echo NONE || echo NONE)))} \
&& TEST_ARGS="-mcpu=${TEST_MCPU} -maccel=${TEST_MACCEL}" \
&& TEST_ARGS="-mcpu=${TEST_MCPU}" \
&& make check-docs \
&& make check-unittest \
&& make check-multiple-models \
Expand All @@ -71,13 +67,13 @@ RUN LLVM_PROJECT_ROOT=${WORK_DIR}/llvm-project \
TEST_ARGS="${TEST_ARGS}" \
-j${NPROC} \
check-onnx-backend-numerical \
&& if [ "${TEST_MACCEL}" = "NNPA"]; then \
&& if [ "${TEST_MCPU}" = "z16" ]; then \
make NPROC=${NPROC} \
CTEST_PARALLEL_LEVEL=${NPROC} \
TEST_NOFLOAT16=${TEST_NOFLOAT16} \
TEST_MCPU=${TEST_MCPU} \
TEST_MACCEL=${TEST_MACCEL} \
TEST_ARGS="${TEST_ARGS}" \
TEST_MACCEL="NNPA" \
TEST_ARGS="${TEST_ARGS} -maccel=NNPA" \
-j${NPROC} \
check-onnx-backend-numerical-nnpa; \
fi \
Expand Down

0 comments on commit 3895ca8

Please sign in to comment.