fix: auto fix more CUDA compilation issues

Author: giladgd

docs/guide/CUDA.md

@@ -79,20 +79,23 @@ const cudaCmakeOptionsTable = data.cudaCmakeOptionsTable;
 To build `node-llama-cpp` with any of these options, set an environment variable of an option prefixed with `NODE_LLAMA_CPP_CMAKE_OPTION_`.
 
 ### Fix the `Failed to detect a default CUDA architecture` Build Error
-To fix this issue you have to set the `CUDACXX` environment variable to the path of the `nvcc` compiler.
+To fix this issue you have to set the `CUDACXX` environment variable to the path of the `nvcc` compiler,
+and the `CUDA_PATH` environment variable to the path of the CUDA home directory that contains the `nvcc` compiler.
 
 For example, if you have installed CUDA Toolkit 12.4, you have to run a command like this:
 ::: code-group
 ```shell [Linux]
 export CUDACXX=/usr/local/cuda-12.4/bin/nvcc
+export CUDA_PATH=/usr/local/cuda-12.4
 ```
 
 ```cmd [Windows]
 set CUDACXX=C:\Program Files\NVIDIA GPU Computing Toolkit\CUDA\v12.4\bin\nvcc.exe
+set CUDA_PATH=C:\Program Files\NVIDIA GPU Computing Toolkit\CUDA\v12.4
 ```
 :::
 
-Then run the build command again to check whether setting the `CUDACXX` environment variable fixed the issue.
+Then run the build command again to check whether setting the `CUDACXX` and `CUDA_PATH` environment variables fixed the issue.
 
 ### Fix the `The CUDA compiler identification is unknown` Build Error
 The solution to this error is the same as [the solution to the `Failed to detect a default CUDA architecture` error](#fix-the-failed-to-detect-a-default-cuda-architecture-build-error).

src/bindings/utils/compileLLamaCpp.ts

@@ -259,18 +259,20 @@ export async function compileLlamaCpp(buildOptions: BuildOptions, compileOptions
                     )
                 )
             )) {
-                for (const nvccPath of await getCudaNvccPaths()) {
+                for (const {nvccPath, cudaHomePath} of await getCudaNvccPaths()) {
                     if (buildOptions.progressLogs)
                         console.info(
-                            getConsoleLogPrefix(true) + `Trying to compile again with "CUDACXX=${nvccPath}" environment variable`
+                            getConsoleLogPrefix(true) +
+                            `Trying to compile again with "CUDACXX=${nvccPath}" and "CUDA_PATH=${cudaHomePath}" environment variables`
                         );
 
                     try {
                         return await compileLlamaCpp(buildOptions, {
                             ...compileOptions,
                             envVars: {
                                 ...envVars,
-                                CUDACXX: nvccPath
+                                CUDACXX: nvccPath,
+                                "CUDA_PATH": cudaHomePath
                             },
                             ignoreWorkarounds: [...ignoreWorkarounds, "cudaArchitecture"]
                         });

src/bindings/utils/detectAvailableComputeLayers.ts

@@ -348,22 +348,28 @@ export async function getCudaNvccPaths({
     const nvccPotentialPaths = cudaInstallationPaths
         .map((cudaInstallationPath) => {
             if (platform === "win")
-                return path.join(cudaInstallationPath, "bin", "nvcc.exe");
-
-            return path.join(cudaInstallationPath, "bin", "nvcc");
+                return {
+                    nvccPath: path.join(cudaInstallationPath, "bin", "nvcc.exe"),
+                    cudaHomePath: cudaInstallationPath
+                };
+
+            return {
+                nvccPath: path.join(cudaInstallationPath, "bin", "nvcc"),
+                cudaHomePath: cudaInstallationPath
+            };
         });
 
     try {
-        const resolvedNvccPaths = await Promise.all(
-            nvccPotentialPaths.map(async (nvccPotentialPath) => {
-                if (await fs.pathExists(nvccPotentialPath))
-                    return nvccPotentialPath;
+        const resolvedPaths = await Promise.all(
+            nvccPotentialPaths.map(async ({nvccPath, cudaHomePath}) => {
+                if (await fs.pathExists(nvccPath))
+                    return {nvccPath, cudaHomePath};
 
                 return null;
             })
         );
 
-        return resolvedNvccPaths.filter((nvccPath): nvccPath is string => nvccPath != null);
+        return resolvedPaths.filter((resolvedPath) => resolvedPath != null);
     } catch (err) {
         console.error(getConsoleLogPrefix() + `Failed to search for "nvcc${platform === "win" ? ".exe" : ""}" in CUDA installation paths`, err);
     }