feat: make vcpkg a submodule

Signed-off-by: Gordon Smith <GordonJSmith@gmail.com>

Author: GordonSmith

.gitignore

@@ -30,7 +30,7 @@ node_modules/
 types/
 /wasi-sdk*
 /wit-bindgen
-/vcpkg
+
 __screenshots__/
 .coveralls.yml
 *.tsbuildinfo

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "vcpkg"]
+	path = vcpkg
+	url = https://github.com/microsoft/vcpkg.git

README.md

@@ -7,9 +7,9 @@
 This repository contains a collection of useful c++ libraries compiled to WASM for (re)use in Node JS, Web Browsers and JavaScript Libraries:
 - [base91](https://base91.sourceforge.net/) - v0.6.0
 - [duckdb](https://github.com/duckdb/duckdb) - v1.4.3
-- [expat](https://libexpat.github.io/) - v2.7.1
+- [expat](https://libexpat.github.io/) - v2.7.3
 - [graphviz](https://www.graphviz.org/) - 14.1.0
-- [llama.cpp](https://github.com/ggerganov/llama.cpp) - b3718
+- [llama.cpp](https://github.com/ggml-org/llama.cpp) - 7146
 - [zstd](https://github.com/facebook/zstd) - v1.5.7
 - ...more to follow...
 

package-lock.json

@@ -36,10 +36,11 @@
     "uninstall-build-deps": "rimraf ./emsdk ./vcpkg ./src-expat ./src-vcpkg ./wasi-sdk ./wit-bindgen",
     "uninstall": "rimraf --glob ./node_modules ./packages/**/node_modules ./package-lock.json",
     "clean-build": "rimraf --glob .nyc_output bin build coverage output-* tmp vcpkg/vcpkg .nx",
+    "clean-vcpkg": "rimraf --glob vcpkg/buildtrees vcpkg/packages vcpkg/installed vcpkg/downloads",
     "clean-docs": "rimraf .vitepress/dist .vitepress/cache docs/base91 docs/duckdb docs/expat docs/graphviz docs/llama docs/zstd",
     "clean-root": "run-p clean-build clean-docs",
     "clean": "lerna run clean",
-    "clean-all": "run-p clean clean-root",
+    "clean-all": "run-p clean clean-root clean-vcpkg",
     "copy-res": "cp ./docs/*.png ./.vitepress/dist",
     "build-asm": "asc ./src-asm/index.ts --target release",
     "gen-docs": "typedoc",

package.json

@@ -36,7 +36,7 @@ describe("expat", function () {
         let expat = await Expat.load();
         let v = await expat.version();
         expect(v).to.be.a.string;
-        expect(v).to.equal("expat_2.7.1");
+        expect(v).to.equal("expat_2.7.3");  //  Update README if this changes
         console.log("expat version: " + v);
         Expat.unload();
 

packages/expat/tests/expat.spec.ts

@@ -29,16 +29,21 @@ string(REPLACE ";" " " LINK_FLAGS "${EM_LINK_FLAGS}")
 include_directories(
     ${VCPKG_INCLUDE_DIR}
     ${CMAKE_CURRENT_BINARY_DIR}
-    ${Llama_DIR}/common
+    ${VCPKG_INCLUDE_DIR}/llama-cpp/common
+)
+
+# Find the llama-common library (renamed to avoid conflict with graphviz libcommon)
+find_library(LLAMA_COMMON_LIBRARY llama-common
+    REQUIRED
+    HINTS ${VCPKG_INCLUDE_DIR}/../lib
+    NO_CMAKE_FIND_ROOT_PATH
 )
 
 add_executable(llamalib
     src-cpp/embedding.cpp
     src-cpp/log_wasm.cpp
     src-cpp/util.cpp
     src-cpp/stubs.c
-    ${Llama_DIR}/common/common.cpp
-    ${Llama_DIR}/common/sampling.cpp
 )
 
 set_target_properties(llamalib PROPERTIES COMPILE_FLAGS "${CPP_FLAGS}")
@@ -47,4 +52,5 @@ set_target_properties(llamalib PROPERTIES LINK_FLAGS "${LINK_FLAGS}")
 target_link_libraries(llamalib
     PRIVATE llama
     PRIVATE ggml::ggml-cpu
+    PRIVATE ${LLAMA_COMMON_LIBRARY}
 )

packages/llama/CMakeLists.txt

@@ -243,8 +243,8 @@ namespace embedding
         // load the model
         auto init = common_init_from_params(params);
 
-        llama_model *model = init ? init->model() : nullptr;
-        llama_context *ctx = init ? init->context() : nullptr;
+        llama_model *model = init.model.get();
+        llama_context *ctx = init.context.get();
         if (model == NULL)
         {
             fprintf(stderr, "%s: error: unable to load model\n", __func__);
@@ -501,8 +501,7 @@ namespace embedding
         // clean up
         llama_batch_free(batch);
 
-        // common_init_result handles model/context lifetime
-        init.reset();
+        // common_init_result's unique_ptrs handle cleanup automatically
         llama_backend_free();
 
         return 0;

packages/llama/src-cpp/embedding.cpp

@@ -2,7 +2,7 @@
 import load, { reset } from "../../../build/packages/llama/llamalib.wasm";
 import type { MainModule } from "../../../build/packages/llama/llamalib.js";
 import { MainModuleEx } from "@hpcc-js/wasm-util";
-import llamaMeta from "../../../vcpkg-overlays/llama/vcpkg.json" with { type: "json" };
+import llamaMeta from "../../../vcpkg-overlays/llama-cpp/vcpkg.json" with { type: "json" };
 
 //  Ref:  https://github.com/ggerganov/llama.cpp
 //  Ref:  http://facebook.github.io/llama/llama_manual.html
@@ -69,7 +69,7 @@ export class Llama extends MainModuleEx<MainModule> {
      * @returns The Llama c++ version
      */
     version(): string {
-        return llamaMeta["version-string"];
+        return llamaMeta.version;
     }
 
     /**

packages/llama/src/llama.ts

@@ -8,7 +8,7 @@ describe("llama", () => {
         const v1 = v;
         expect(v).to.be.a.string;
         expect(v).to.be.not.empty;
-        expect(v).to.equal("b7445");    //  Update README.md with the new version!!!
+        expect(v).to.equal("7146");    //  Update README.md with the new version!!!
 
         llama = await Llama.load();
         v = llama.version();