saymrwulf/onnxruntime
1
0
Fork 0
mirror of https://github.com/saymrwulf/onnxruntime.git synced 2026-05-14 20:48:00 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

[wasm] upgrade emsdk version to 2.0.23 (#7893)

Browse source 
* upgrade emsdk version to 2.0.23

* fix build

* override gmock build options
This commit is contained in:
Yulong Wang 2021-06-02 12:26:24 -07:00 committed by GitHub
parent 79a6727a02
commit faae347d9f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 10 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.gitmodules vendored
View file

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

2
cgmanifests/submodules/cgmanifest.json
View file

@ -182,7 +182,7 @@
"component": {
"type": "git",
"git": {
"commitHash": "8b32b7def837a15e766039501630549149d3db41",
"commitHash": "f44b84154703d29a946d51ddee08f4e5725a61db",
"repositoryUrl": "https://github.com/emscripten-core/emsdk.git"
},
"comments": "git submodule at cmake/external/emsdk"

2
cmake/CMakeLists.txt
View file

@ -629,6 +629,8 @@ if (onnxruntime_BUILD_UNIT_TESTS)
add_subdirectory(${PROJECT_SOURCE_DIR}/external/googletest EXCLUDE_FROM_ALL)
set_msvc_c_cpp_compiler_warning_level(3)
set_target_properties(gmock PROPERTIES FOLDER "External/GTest")
# disable treating all warnings as errors for gmock
target_compile_options(gmock PRIVATE "-w")
set_target_properties(gmock_main PROPERTIES FOLDER "External/GTest")
set_target_properties(gtest PROPERTIES FOLDER "External/GTest")
set_target_properties(gtest_main PROPERTIES FOLDER "External/GTest")

2
cmake/external/emsdk vendored

@ -1 +1 @@
Subproject commit 8b32b7def837a15e766039501630549149d3db41
Subproject commit f44b84154703d29a946d51ddee08f4e5725a61db

2
tools/ci_build/build.py
View file

@ -2003,7 +2003,7 @@ def main():
# since emscripten doesn't support file packaging required for unit tests,
# need to apply patch with the specific version of emscripten.
# once patch is committed to emsdk repository, this must be replaced with 'latest'.
emsdk_version = "2.0.13"
emsdk_version = "2.0.23"
emsdk_dir = os.path.join(source_dir, "cmake", "external", "emsdk")
emsdk_file = os.path.join(emsdk_dir, "emsdk.bat") if is_windows() else os.path.join(emsdk_dir, "emsdk")

12
tools/ci_build/wasm/file_packager.py.patch
View file

@ -64,10 +64,6 @@ import ctypes
sys.path.insert(1, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
from tools.toolchain_profiler import ToolchainProfiler
if __name__ == '__main__':
ToolchainProfiler.record_process_start()
import posixpath
from tools import shared
from subprocess import PIPE
@ -153,7 +149,7 @@ def add(mode, rootpathsrc, rootpathdst):
elif DEBUG:
print('Skipping file "%s" from inclusion in the emscripten '
'virtual file system.' % fullname, file=sys.stderr)
del dirnames[:]
dirnames.clear()
dirnames.extend(new_dirnames)
@ -515,10 +511,10 @@ def main():
use_data = '''
var compressedData = %s;
compressedData['data'] = byteArray;
assert(typeof Module.LZ4 === 'object', 'LZ4 not present - was your app build with -s LZ4=1 ?');
Module.LZ4.loadPackage({ 'metadata': metadata, 'compressedData': compressedData });
assert(typeof Module['LZ4'] === 'object', 'LZ4 not present - was your app build with -s LZ4=1 ?');
Module['LZ4'].loadPackage({ 'metadata': metadata, 'compressedData': compressedData }, %s);
Module['removeRunDependency']('datafile_%s');
''' % (meta, shared.JS.escape_for_js_string(data_target))
''' % (meta, "true" if use_preload_plugins else "false", shared.JS.escape_for_js_string(data_target))
package_uuid = uuid.uuid4()
package_name = data_target