saymrwulf/onnxruntime
1
0
Fork 0
mirror of https://github.com/saymrwulf/onnxruntime.git synced 2026-06-09 00:30:53 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

upgrade emsdk to 3.1.57 (#20295)

Browse source 
### Description
upgrade emsdk to 3.1.57
This commit is contained in:
Yulong Wang 2024-04-19 23:05:18 -07:00 committed by GitHub
parent 77b7619a3d
commit a457c1df80
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
7 changed files with 9 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.gitmodules vendored
View file

@ -7,4 +7,4 @@
[submodule "cmake/external/emsdk"]
path = cmake/external/emsdk
url = https://github.com/emscripten-core/emsdk.git
branch = 3.1.51
branch = 3.1.57

2
cgmanifests/generated/cgmanifest.json
View file

@ -6,7 +6,7 @@
"component": {
"type": "git",
"git": {
"commitHash": "4e2496141eda15040c44e9bbf237a1326368e34c",
"commitHash": "229d83fc706e10a39d4948a804cbbf17225cdda0",
"repositoryUrl": "https://github.com/emscripten-core/emsdk.git"
},
"comments": "git submodule at cmake/external/emsdk"

2
cmake/external/emsdk vendored

@ -1 +1 @@
Subproject commit 4e2496141eda15040c44e9bbf237a1326368e34c
Subproject commit 229d83fc706e10a39d4948a804cbbf17225cdda0

2
cmake/onnxruntime_unittests.cmake
View file

@ -919,7 +919,7 @@ if (onnxruntime_ENABLE_TRAINING_TORCH_INTEROP)
endif()
if (CMAKE_SYSTEM_NAME STREQUAL "Emscripten")
set_target_properties(onnxruntime_test_all PROPERTIES LINK_DEPENDS ${TEST_SRC_DIR}/wasm/onnxruntime_test_all_adapter.js)
set_target_properties(onnxruntime_test_all PROPERTIES LINK_FLAGS "-s STACK_SIZE=5242880 -s INITIAL_MEMORY=536870912 -s ALLOW_MEMORY_GROWTH=1 -s MAXIMUM_MEMORY=4294967296 -s INCOMING_MODULE_JS_API=[preRun,locateFile,arguments,onExit,wasmMemory,buffer,instantiateWasm] --pre-js \"${TEST_SRC_DIR}/wasm/onnxruntime_test_all_adapter.js\" -s \"EXPORTED_RUNTIME_METHODS=['FS']\" --preload-file ${CMAKE_CURRENT_BINARY_DIR}/testdata@/testdata -s EXIT_RUNTIME=1 -s DEMANGLE_SUPPORT=1")
set_target_properties(onnxruntime_test_all PROPERTIES LINK_FLAGS "-s STACK_SIZE=5242880 -s INITIAL_MEMORY=536870912 -s ALLOW_MEMORY_GROWTH=1 -s MAXIMUM_MEMORY=4294967296 -s INCOMING_MODULE_JS_API=[preRun,locateFile,arguments,onExit,wasmMemory,buffer,instantiateWasm] --pre-js \"${TEST_SRC_DIR}/wasm/onnxruntime_test_all_adapter.js\" -s \"EXPORTED_RUNTIME_METHODS=['FS']\" --preload-file ${CMAKE_CURRENT_BINARY_DIR}/testdata@/testdata -s EXIT_RUNTIME=1")
if (onnxruntime_ENABLE_WEBASSEMBLY_THREADS)
set_property(TARGET onnxruntime_test_all APPEND_STRING PROPERTY LINK_FLAGS " -s DEFAULT_PTHREAD_STACK_SIZE=131072 -s PROXY_TO_PTHREAD=1")
endif()

2
cmake/onnxruntime_webassembly.cmake
View file

@ -255,14 +255,12 @@ else()
"SHELL:-s ASSERTIONS=2"
"SHELL:-s SAFE_HEAP=1"
"SHELL:-s STACK_OVERFLOW_CHECK=2"
"SHELL:-s DEMANGLE_SUPPORT=1"
)
else()
target_link_options(onnxruntime_webassembly PRIVATE
"SHELL:-s ASSERTIONS=0"
"SHELL:-s SAFE_HEAP=0"
"SHELL:-s STACK_OVERFLOW_CHECK=0"
"SHELL:-s DEMANGLE_SUPPORT=0"
--closure 1
)
endif()

2
tools/ci_build/build.py
View file

@ -456,7 +456,7 @@ def parse_arguments():
# WebAssembly build
parser.add_argument("--build_wasm", action="store_true", help="Build for WebAssembly")
parser.add_argument("--build_wasm_static_lib", action="store_true", help="Build for WebAssembly static library")
parser.add_argument("--emsdk_version", default="3.1.51", help="Specify version of emsdk")
parser.add_argument("--emsdk_version", default="3.1.57", help="Specify version of emsdk")
parser.add_argument("--enable_wasm_simd", action="store_true", help="Enable WebAssembly SIMD")
parser.add_argument("--enable_wasm_threads", action="store_true", help="Enable WebAssembly multi-threads support")

8
tools/ci_build/github/azure-pipelines/templates/linux-wasm-ci.yml
View file

@ -93,15 +93,15 @@ jobs:
- script: |
set -ex
cd '$(Build.SourcesDirectory)/cmake/external/emsdk'
./emsdk install 3.1.51 ccache-git-emscripten-64bit
./emsdk activate 3.1.51 ccache-git-emscripten-64bit
./emsdk install 3.1.57 ccache-git-emscripten-64bit
./emsdk activate 3.1.57 ccache-git-emscripten-64bit
displayName: 'emsdk install and activate ccache for emscripten'
- ${{if eq(parameters.WithCache, false)}}:
- script: |
set -ex
cd '$(Build.SourcesDirectory)/cmake/external/emsdk'
./emsdk install 3.1.51
./emsdk activate 3.1.51
./emsdk install 3.1.57
./emsdk activate 3.1.57
displayName: 'emsdk install and activate ccache for emscripten'
- template: build-linux-wasm-step.yml