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

Enabling additional WASM test on PostMerge CI #17817

Closed
wants to merge 14 commits into from
Closed

Enabling additional WASM test on PostMerge CI #17817

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
81fbc65
Trying out c++20 on linux
jchen351 Oct 6, 2023
c72c40e
Enabling "set_property(TARGET onnxruntime_test_all APPEND_STRING PROP…
jchen351 Oct 6, 2023
e27236b
Revert "Enabling "set_property(TARGET onnxruntime_test_all APPEND_STR…
jchen351 Oct 6, 2023
5576a37
Remove accidentally added c++20 changes
jchen351 Oct 6, 2023
ec15ebc
Adding cmake and yml files
jchen351 Oct 6, 2023
66a9cc8
Adding cmake and yml files
jchen351 Oct 6, 2023
9c052fb
Reformat code
jchen351 Oct 6, 2023
b412809
Reformat code
jchen351 Oct 6, 2023
2fc45ec
Adding onnxruntime_ENABLE_WEBASSEMBLY_THREADS options to top level
jchen351 Oct 6, 2023
f4a0d08
Update format
jchen351 Oct 6, 2023
d6e37ce
Update onnxruntime_POST_MERGE_WASM_TESTING=ON
jchen351 Oct 10, 2023
1a480d2
Adding --cmake_extra_defines
jchen351 Oct 13, 2023
b8ac337
Merge branch 'main' into Cjian/post_merge_wasm_testing
jchen351 Oct 20, 2023
7367589
Merge branch 'main' into Cjian/post_merge_wasm_testing
jchen351 Oct 21, 2023
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
1 change: 1 addition & 0 deletions cmake/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,7 @@ option(onnxruntime_BUILD_OBJC "Build Objective-C library" OFF)
option(onnxruntime_USE_PREINSTALLED_EIGEN "Use pre-installed EIGEN. Need to provide eigen_SOURCE_PATH if turn this on." OFF)
option(onnxruntime_BUILD_BENCHMARKS "Build ONNXRuntime micro-benchmarks" OFF)
option(onnxruntime_USE_LLVM "Build TVM with LLVM" OFF)
option(onnxruntime_POST_MERGE_WASM_TESTING "Enabling Additional Post Merge testing for WASM" OFF)

cmake_dependent_option(onnxruntime_USE_FLASH_ATTENTION "Build flash attention kernel for scaled dot product attention" ON "NOT WIN32; onnxruntime_USE_CUDA" OFF)
option(onnxruntime_USE_MEMORY_EFFICIENT_ATTENTION "Build memory efficient attention kernel for scaled dot product attention" ON)
Expand Down
10 changes: 4 additions & 6 deletions cmake/onnxruntime_unittests.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -903,13 +903,11 @@ if (CMAKE_SYSTEM_NAME STREQUAL "Emscripten")
if (onnxruntime_USE_JSEP)
set_property(TARGET onnxruntime_test_all APPEND_STRING PROPERTY LINK_FLAGS " --pre-js \"${ONNXRUNTIME_ROOT}/wasm/js_internal_api.js\"")
endif()

###
### if you want to investigate or debug a test failure in onnxruntime_test_all, replace the following line.
### those flags slow down the CI test significantly, so we don't use them by default.
###
# set_property(TARGET onnxruntime_test_all APPEND_STRING PROPERTY LINK_FLAGS " -s ASSERTIONS=2 -s SAFE_HEAP=1 -s STACK_OVERFLOW_CHECK=2")
if (onnxruntime_POST_MERGE_WASM_TESTING)
jchen351 marked this conversation as resolved.
Show resolved Hide resolved
set_property(TARGET onnxruntime_test_all APPEND_STRING PROPERTY LINK_FLAGS " -s ASSERTIONS=2 -s SAFE_HEAP=1 -s STACK_OVERFLOW_CHECK=2")
else ()
set_property(TARGET onnxruntime_test_all APPEND_STRING PROPERTY LINK_FLAGS " -s ASSERTIONS=0 -s SAFE_HEAP=0 -s STACK_OVERFLOW_CHECK=1")
endif ()
endif()

if (onnxruntime_ENABLE_ATEN)
Expand Down
2 changes: 1 addition & 1 deletion tools/ci_build/github/azure-pipelines/post-merge-jobs.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ stages:
IsReleasePipeline: true
PoolName: 'aiinfra-Win-CPU-2022-web-beta'
BuildStaticLib: true
ExtraBuildArgs: ''
ExtraBuildArgs: '--cmake_extra_defines onnxruntime_POST_MERGE_WASM_TESTING=ON'

# This stage is to test if the combined build works on
# o Windows ARM64
Expand Down
Loading