pthreads: fixed memory 4GB

tangledgroup · Feb 12, 2024 · c609188 · c609188
1 parent f17cd9d
commit c609188
Show file tree

Hide file tree

Showing 9 changed files with 8 additions and 10 deletions.
diff --git a/build-pthread.sh b/build-pthread.sh
@@ -25,7 +25,8 @@ cd ../..
 mkdir -p $LLAMA_CPP_BUILD_DIR
 cd $LLAMA_CPP_BUILD_DIR
 emcmake cmake ../../$LLAMA_CPP_SOURCE_DIR
-export EMCC_CFLAGS="-O3 -msimd128 -pthread -DNDEBUG -s FORCE_FILESYSTEM=1 -s EXPORT_ES6=1 -s MODULARIZE=1 -s INITIAL_MEMORY=1GB -s MAXIMUM_MEMORY=4GB -s ALLOW_MEMORY_GROWTH -s EXPORTED_FUNCTIONS=_main -s EXPORTED_RUNTIME_METHODS=callMain -s NO_EXIT_RUNTIME=1"
+# export EMCC_CFLAGS="-O3 -msimd128 -pthread -DNDEBUG -s FORCE_FILESYSTEM=1 -s EXPORT_ES6=1 -s MODULARIZE=1 -s INITIAL_MEMORY=1GB -s MAXIMUM_MEMORY=4GB -s ALLOW_MEMORY_GROWTH -s EXPORTED_FUNCTIONS=_main -s EXPORTED_RUNTIME_METHODS=callMain -s NO_EXIT_RUNTIME=1"
+export EMCC_CFLAGS="-O3 -msimd128 -pthread -DNDEBUG -s FORCE_FILESYSTEM=1 -s EXPORT_ES6=1 -s MODULARIZE=1 -s INITIAL_MEMORY=4GB -s EXPORTED_FUNCTIONS=_main -s EXPORTED_RUNTIME_METHODS=callMain -s NO_EXIT_RUNTIME=1"
 emmake make main
 cd ../..
 

diff --git a/dist/llama/main-worker.js b/dist/llama/main-worker.js
@@ -1,7 +1,6 @@
 import { action } from "./actions.js";
 import { loadBinaryResource } from "./utility.js";
-// import Module from "./main.js";
-import Module from "./main.worker.mjs";
+import Module from "./main.js";
 
 // WASM Module
 let module;

diff --git a/dist/llama/main.js b/dist/llama/main.js
diff --git a/dist/llama/main.wasm b/dist/llama/main.wasm
diff --git a/docs/index.html b/docs/index.html
@@ -106,6 +106,6 @@ <h2> Demo </h2>
     </main>
 
     <!-- example -->
-    <script type="module" src="example.js?v=240212-4"></script>
+    <script type="module" src="example.js?v=240212-6"></script>
   </body>
 </html>
diff --git a/docs/llama/main-worker.js b/docs/llama/main-worker.js
@@ -1,7 +1,6 @@
 import { action } from "./actions.js";
 import { loadBinaryResource } from "./utility.js";
-// import Module from "./main.js";
-import Module from "./main.worker.mjs";
+import Module from "./main.js";
 
 // WASM Module
 let module;

diff --git a/docs/llama/main.js b/docs/llama/main.js
diff --git a/docs/llama/main.wasm b/docs/llama/main.wasm
diff --git a/src/llama/main-worker.js b/src/llama/main-worker.js
@@ -1,7 +1,6 @@
 import { action } from "./actions.js";
 import { loadBinaryResource } from "./utility.js";
-// import Module from "./main.js";
-import Module from "./main.worker.mjs";
+import Module from "./main.js";
 
 // WASM Module
 let module;