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

update emsdk to 3.1.47 [don't merge - perf regression] #17916

Closed
wants to merge 5 commits into from
Closed

update emsdk to 3.1.47 [don't merge - perf regression] #17916

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
5a4db6a
update emsdk to 3.1.47
guschmue Oct 12, 2023
d95ec7d
Merge branch 'main' into gs/emsdk-3.1.47
guschmue Oct 18, 2023
16dc516
Merge branch 'main' into gs/emsdk-3.1.47
guschmue Nov 9, 2023
2fcb5a8
merge main; add more methods to INCOMING_MODULE_JS_API
guschmue Nov 22, 2023
c333944
keep INCOMING_MODULE_JS_API the same between test and release
guschmue Nov 22, 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
2 changes: 1 addition & 1 deletion .gitmodules
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,4 @@
[submodule "cmake/external/emsdk"]
path = cmake/external/emsdk
url = https://github.com/emscripten-core/emsdk.git
branch = 3.1.44
branch = 3.1.47
2 changes: 1 addition & 1 deletion cmake/external/emsdk
Open in desktop
Submodule emsdk updated 18 files
+3 −3 .circleci/config.yml
+16 −15 .flake8
+8 −0 bazel/BUILD
+2 −2 bazel/README.md
+9 −9 bazel/emscripten_deps.bzl
+10 −1 bazel/emscripten_toolchain/BUILD.bazel
+2 −2 bazel/emscripten_toolchain/toolchain.bzl
+3 −1 bazel/emscripten_toolchain/wasm_cc_binary.bzl
+22 −1 bazel/revisions.bzl
+8 −2 emscripten-releases-tags.json
+45 −13 emsdk.py
+4 −4 emsdk_manifest.json
+3 −1 scripts/create_release.py
+69 −0 scripts/update_bazel_workspace.py
+0 −73 scripts/update_bazel_workspace.sh
+25 −0 scripts/update_linux_arm64.sh
+1 −1 test/test_bazel.sh
+1 −1 test/test_bazel_mac.sh
2 changes: 1 addition & 1 deletion cmake/onnxruntime_unittests.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -906,7 +906,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 ALLOW_MEMORY_GROWTH=1 -s MAXIMUM_MEMORY=4294967296 --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 ALLOW_MEMORY_GROWTH=1 -s MAXIMUM_MEMORY=4294967296 --pre-js \"${TEST_SRC_DIR}/wasm/onnxruntime_test_all_adapter.js\" -s \"EXPORTED_RUNTIME_METHODS=['FS']\" -s INCOMING_MODULE_JS_API=[preRun,locateFile,arguments,onExit,wasmMemory,buffer,instantiateWasm,mainScriptUrlOrBlob] --preload-file ${CMAKE_CURRENT_BINARY_DIR}/testdata@/testdata -s EXIT_RUNTIME=1 -s DEMANGLE_SUPPORT=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()
Expand Down
1 change: 1 addition & 0 deletions cmake/onnxruntime_webassembly.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -225,6 +225,7 @@ else()
"SHELL:-s EXPORT_ALL=0"
"SHELL:-s VERBOSE=0"
"SHELL:-s FILESYSTEM=0"
"SHELL:-s INCOMING_MODULE_JS_API=[preRun,locateFile,arguments,onExit,wasmMemory,buffer,instantiateWasm,mainScriptUrlOrBlob]"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

do we need to use the same list for ort-web to onnxruntime_test_all ?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

"mainScriptUrlOrBlob", for example, is not used by onnxruntime_test_all but it is required by ort-wasm. So perhaps need to figure out the full list of INCOMING_MODULE_JS_API per target.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I can trim things down once ci is happy.

${WASM_API_EXCEPTION_CATCHING}
--no-entry
)
Expand Down
2 changes: 1 addition & 1 deletion tools/ci_build/build.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -419,7 +419,7 @@ def convert_arg_line_to_args(self, arg_line):
# 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.44", help="Specify version of emsdk")
parser.add_argument("--emsdk_version", default="3.1.47", 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")
Expand Down
8 changes: 4 additions & 4 deletions tools/ci_build/github/azure-pipelines/templates/linux-wasm-ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,15 +94,15 @@ jobs:
- script: |
set -ex
cd '$(Build.SourcesDirectory)/cmake/external/emsdk'
./emsdk install 3.1.44 ccache-git-emscripten-64bit
./emsdk activate 3.1.44 ccache-git-emscripten-64bit
./emsdk install 3.1.47 ccache-git-emscripten-64bit
./emsdk activate 3.1.47 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.44
./emsdk activate 3.1.44
./emsdk install 3.1.47
./emsdk activate 3.1.47
displayName: 'emsdk install and activate ccache for emscripten'

- template: build-linux-wasm-step.yml
Expand Down
Loading