Skip to content

fix: building in a webpack/cjs environment #363

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

Closed
wants to merge 8 commits into from
Closed

fix: building in a webpack/cjs environment #363

Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
fe60b62
fix: module loading in a commonjs environment
derek-wangpch Oct 12, 2024
7241cf0
Merge pull request #1 from derek-wangpch/dwang/cjs_import
derek-wangpch Oct 12, 2024
8f439d2
chore: revert package version
derek-wangpch Oct 13, 2024
41a9e5e
Merge pull request #2 from derek-wangpch/dwang/chore_revert_lib_version
derek-wangpch Oct 13, 2024
925bd6f
chore: revert type/node version
derek-wangpch Oct 13, 2024
e854569
Merge pull request #3 from derek-wangpch/dwang/chore_revert_type_node
derek-wangpch Oct 13, 2024
d49927c
chore: revert
derek-wangpch Oct 13, 2024
b72dad7
Merge pull request #4 from derek-wangpch/dwang/chore_revert
derek-wangpch Oct 13, 2024
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
32 changes: 21 additions & 11 deletions src/bindings/utils/compileLLamaCpp.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -382,44 +382,54 @@ function getPrebuiltBinariesPackageDirectoryForBuildOptions(buildOptions: BuildO
}
}

async function loadModule(modulePath: string) {
if (typeof require !== "undefined" && typeof module !== "undefined" && module.exports) {
// CommonJS
return require(modulePath);
} else {
// ESM
return import(modulePath);
}
}

if (buildOptions.platform === "mac") {
if (buildOptions.arch === "arm64" && buildOptions.gpu === "metal")
// @ts-ignore
return getBinariesPathFromModules(() => import("@node-llama-cpp/mac-arm64-metal"));
return getBinariesPathFromModules(() => loadModule("@node-llama-cpp/mac-arm64-metal"));
else if (buildOptions.arch === "x64" && buildOptions.gpu === false)
// @ts-ignore
return getBinariesPathFromModules(() => import("@node-llama-cpp/mac-x64"));
return getBinariesPathFromModules(() => loadModule("@node-llama-cpp/mac-x64"));
} else if (buildOptions.platform === "linux") {
if (buildOptions.arch === "x64") {
if (buildOptions.gpu === "cuda")
// @ts-ignore
return getBinariesPathFromModules(() => import("@node-llama-cpp/linux-x64-cuda"));
return getBinariesPathFromModules(() => loadModule("@node-llama-cpp/linux-x64-cuda"));
else if (buildOptions.gpu === "vulkan")
// @ts-ignore
return getBinariesPathFromModules(() => import("@node-llama-cpp/linux-x64-vulkan"));
return getBinariesPathFromModules(() => loadModule("@node-llama-cpp/linux-x64-vulkan"));
else if (buildOptions.gpu === false)
// @ts-ignore
return getBinariesPathFromModules(() => import("@node-llama-cpp/linux-x64"));
return getBinariesPathFromModules(() => loadModule("@node-llama-cpp/linux-x64"));
} else if (buildOptions.arch === "arm64")
// @ts-ignore
return getBinariesPathFromModules(() => import("@node-llama-cpp/linux-arm64"));
return getBinariesPathFromModules(() => loadModule("@node-llama-cpp/linux-arm64"));
else if (buildOptions.arch === "arm")
// @ts-ignore
return getBinariesPathFromModules(() => import("@node-llama-cpp/linux-armv7l"));
return getBinariesPathFromModules(() => loadModule("@node-llama-cpp/linux-armv7l"));
} else if (buildOptions.platform === "win") {
if (buildOptions.arch === "x64") {
if (buildOptions.gpu === "cuda")
// @ts-ignore
return getBinariesPathFromModules(() => import("@node-llama-cpp/win-x64-cuda"));
return getBinariesPathFromModules(() => loadModule("@node-llama-cpp/win-x64-cuda"));
else if (buildOptions.gpu === "vulkan")
// @ts-ignore
return getBinariesPathFromModules(() => import("@node-llama-cpp/win-x64-vulkan"));
return getBinariesPathFromModules(() => loadModule("@node-llama-cpp/win-x64-vulkan"));
else if (buildOptions.gpu === false)
// @ts-ignore
return getBinariesPathFromModules(() => import("@node-llama-cpp/win-x64"));
return getBinariesPathFromModules(() => loadModule("@node-llama-cpp/win-x64"));
} else if (buildOptions.arch === "arm64")
// @ts-ignore
return getBinariesPathFromModules(() => import("@node-llama-cpp/win-arm64"));
return getBinariesPathFromModules(() => loadModule("@node-llama-cpp/win-arm64"));
}

return null;
Expand Down