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.

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

Enable check-onnx-backend-numerical-nnpa on Jenkins s390x #2985

Merged
merged 7 commits into from
Oct 26, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 7 additions & 1 deletion docker/Dockerfile.onnx-mlir
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ RUN LLVM_PROJECT_ROOT=${WORK_DIR}/llvm-project \
([ "$(uname -m)" = "x86_64" ] && echo true || \
([ "$(uname -m)" = "ppc64le" ] && echo || echo)))} \
# User image is built with SIMD (currently on s390x only)
&& TEST_MCPU=${TEST_MCPU:-$([ "$(uname -m)" = "s390x" ] && echo z14 || \
&& TEST_MCPU=${TEST_MCPU:-$([ "$(uname -m)" = "s390x" ] && echo z16 || \
([ "$(uname -m)" = "x86_64" ] && echo || \
([ "$(uname -m)" = "ppc64le" ] && echo || echo)))} \
&& TEST_ARGS="-mcpu=${TEST_MCPU}" \
Expand All @@ -67,6 +67,12 @@ RUN LLVM_PROJECT_ROOT=${WORK_DIR}/llvm-project \
TEST_ARGS="${TEST_ARGS}" \
-j${NPROC} \
check-onnx-backend-numerical \
&& if [ "${TEST_MCPU}" = "z16" ]; then \
make NPROC=${NPROC} \
CTEST_PARALLEL_LEVEL=${NPROC} \
-j${NPROC} \
check-onnx-backend-numerical-nnpa; \
fi \
&& make -j${NPROC} install && ldconfig \
# Clean up
&& cd ${WORK_DIR} \
Expand Down
7 changes: 4 additions & 3 deletions test/accelerators/NNPA/backend/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -511,9 +511,10 @@ if (ONNX_MLIR_ENABLE_JNI)
add_dependencies(check-onnx-backend-constant-jni-nnpa javaruntime)
add_dependencies(check-onnx-backend-constant-jni-nnpa jniruntime)

add_dependencies(check-onnx-backend-numerical-nnpa check-onnx-backend-jni-nnpa)
add_dependencies(check-onnx-backend-numerical-nnpa check-onnx-backend-dynamic-jni-nnpa)
add_dependencies(check-onnx-backend-numerical-nnpa check-onnx-backend-constant-jni-nnpa)
# ONNX models failed with NaN results, so temporarily disable these.
#add_dependencies(check-onnx-backend-numerical-nnpa check-onnx-backend-jni-nnpa)
#add_dependencies(check-onnx-backend-numerical-nnpa check-onnx-backend-dynamic-jni-nnpa)
#add_dependencies(check-onnx-backend-numerical-nnpa check-onnx-backend-constant-jni-nnpa)

else()
message(STATUS " JNI backend-nnpa tests : OFF")
Expand Down
Loading