4x

Author: DerThorsten

CMakeLists.txt

@@ -115,14 +115,16 @@ target_link_libraries(pyjs PRIVATE ${PYTHON_UTIL_LIBS} pybind11::embed)
 
 target_compile_options(pyjs
     PUBLIC --std=c++17
+    PUBLIC -msimd128
     PUBLIC -Wno-deprecated
-    PUBLIC "SHELL: -fexceptions"
+    PUBLIC "SHELL: -fwasm-exceptions"
 )
 
 target_link_options(pyjs
-    PRIVATE -lembind
     PUBLIC -Wno-unused-command-line-argument
-    PUBLIC "SHELL: -fexceptions"
+    PUBLIC "SHELL: -fwasm-exceptions"
+    PUBLIC "SHELL: -lembind"
+    # PUBLIC "SHELL: -fsanitize=address"
     #PUBLIC "SHELL:-s EXPORT_EXCEPTION_HANDLING_HELPERS"
     #PUBLIC "SHELL:-s EXCEPTION_CATCHING_ALLOWED=['we only want to allow exception handling in side modules']"
 )
@@ -198,44 +200,54 @@ target_link_libraries(pyjs_runtime_browser PRIVATE pyjs  pybind11::embed ${PYTHO
 target_compile_options(pyjs_runtime_browser
     PUBLIC --std=c++17
     PUBLIC -Wno-deprecated
+    PUBLIC -msimd128
     PUBLIC "SHELL: -s ENVIRONMENT=${ENVIRONMENT}"
-    PUBLIC "SHELL: -fexceptions"
-    #PUBLIC "SHELL:-s EXPORT_EXCEPTION_HANDLING_HELPERS"
+    PUBLIC "SHELL: -fwasm-exceptions"
+    PUBLIC "SHELL: -sSUPPORT_LONGJMP"
+    PUBLIC "SHELL: -s EXPORT_EXCEPTION_HANDLING_HELPERS"
     PUBLIC "SHELL: -s FORCE_FILESYSTEM"
-    PUBLIC "SHELL: -s LZ4=1"
-    PUBLIC "SHELL: -flto"
-    # PUBLIC "SHELL: -s WASM_BIGINT"
+    PUBLIC "SHELL: -s EXPORT_ALL=1"
+    # PUBLIC "SHELL: -flto"
+    # PUBLIC "SHELL: -s MAXIMUM_MEMORY=2GB"
+    # PUBLIC "SHELL: -fsanitize=address"
 )
 
 target_link_options(pyjs_runtime_browser
-    PRIVATE -lembind
     PUBLIC -Wno-unused-command-line-argument
     PUBLIC "SHELL: -s MODULARIZE=1"
     PUBLIC "SHELL: -s EXPORT_NAME=\"createModule\""
-    PUBLIC "SHELL: -s EXPORT_ES6=0"
-    PUBLIC "SHELL: -s USE_ES6_IMPORT_META=0"
-    PUBLIC "SHELL: -s DEMANGLE_SUPPORT=0"
-    PUBLIC "SHELL: -s ASSERTIONS=0"
+    PUBLIC "SHELL: -s EXPORT_ALL=1"
+    PUBLIC "SHELL: -s EXPORT_EXCEPTION_HANDLING_HELPERS"
+    # PUBLIC "SHELL: -s EXPORT_ES6=0"
+    # PUBLIC "SHELL: -s DEMANGLE_SUPPORT=0"
+    # PUBLIC "SHELL: -s ASSERTIONS=0"
     PUBLIC "SHELL: -s ALLOW_MEMORY_GROWTH=1"
-    PUBLIC "SHELL: -s EXIT_RUNTIME=1"
-    PUBLIC "SHELL: -s WASM=1"
+    # PUBLIC "SHELL: -s EXIT_RUNTIME=1"
+    PUBLIC "SHELL: -s INITIAL_MEMORY=20971520"
+    PUBLIC "SHELL: -s MAXIMUM_MEMORY=4GB"
+    # PUBLIC "SHELL: -s WASM=1"
     PUBLIC "SHELL: -s USE_PTHREADS=0"
     PUBLIC "SHELL: -s ENVIRONMENT=${ENVIRONMENT}"
-    PUBLIC "SHELL: -fexceptions"
+    PUBLIC "SHELL: -fwasm-exceptions"
+    PUBLIC "SHELL: -sSUPPORT_LONGJMP"
     PUBLIC "SHELL: -s MAIN_MODULE=1"
-    PUBLIC "SHELL: -s ENVIRONMENT=${ENVIRONMENT}"
-    PUBLIC "SHELL: -s TOTAL_STACK=16mb"
-    PUBLIC "SHELL: -s INITIAL_MEMORY=64mb"
+    # PUBLIC "SHELL: -s MAXIMUM_MEMORY=2GB"
     PUBLIC "SHELL: -s FORCE_FILESYSTEM"
-    PUBLIC "SHELL: -s LZ4=1"
     PUBLIC "SHELL: --post-js pyjs_post.js"
     PUBLIC "SHELL: --pre-js pyjs_pre.js"
-    PUBLIC "SHELL: -flto"
-    PUBLIC "SHELL: -lidbfs.js"
-    PUBLIC "SHELL: -s WASM_BIGINT"
+    # PUBLIC "SHELL: -flto"
+    # PUBLIC "SHELL: -lidbfs.js"
+    PUBLIC "SHELL: -lembind"
+    # PUBLIC "SHELL: -fsanitize=address"
 )
 
 
+# target_link_options(pyjs_runtime_browser PRIVATE
+#   "-sEXPORTED_FUNCTIONS=['_emscripten_dlopen_promise','_dlerror','FS']"
+# )
+
+
+
 install(TARGETS pyjs_runtime_browser
         DESTINATION ${CMAKE_INSTALL_PREFIX}/lib_js/pyjs)
 install(FILES

environment-dev.yml

@@ -1,7 +1,9 @@
 name: pyjs-wasm
 channels:
   - conda-forge
+  - /Users/thorstenbeier/src/recipes/output
   - https://repo.prefix.dev/emscripten-forge-dev
+
 dependencies:
   - cmake
   - pip
@@ -27,7 +29,7 @@ dependencies:
   - notebook >=7,<8  # to include the extension to switch between JupyterLab and Notebook
   # pyjs_code_runner dev deps
   - hatchling
-  - emscripten_emscripten-wasm32
+  - emscripten_emscripten-wasm32 == 4.0.9
   - pip:
     - JLDracula
     - pyjs_code_runner >= 3.0

include/pyjs/post_js/fixes.js

@@ -7,3 +7,11 @@ Module['PATH'] = PATH
 Module['LDSO'] = LDSO
 Module['getDylinkMetadata'] = getDylinkMetadata
 Module['loadDynamicLibrary'] = loadDynamicLibrary
+Module['getPromise'] = getPromise
+Module['promiseMap'] = promiseMap
+
+Module['stackSave'] = stackSave
+Module['stackRestore'] = stackRestore
+Module['runtimeKeepalivePush'] = runtimeKeepalivePush
+Module['UTF8ToString'] = UTF8ToString
+Module['stringToUTF8OnStack'] = stringToUTF8OnStack