pinokiod 5.1.31 → 5.1.33

package/kernel/bin/cuda.js

@@ -1,7 +1,33 @@
 const semver = require('semver')
 const fs = require('fs')
 const path = require('path')
+const { glob } = require('glob')
 class Cuda {
+  async hasNvTargetHeader() {
+    const prefix = this.kernel.bin.path("miniconda")
+    const patterns = [
+      "Library/include/nv/target",
+      "include/nv/target",
+      "Library/targets/*/include/nv/target",
+      "targets/*/include/nv/target",
+    ]
+    for (const pattern of patterns) {
+      if (pattern.includes("*")) {
+        try {
+          const matches = await glob(pattern, { cwd: prefix, absolute: true, nodir: true })
+          if (matches && matches.length > 0) {
+            return true
+          }
+        } catch (e) {}
+      } else {
+        try {
+          await fs.promises.stat(path.resolve(prefix, pattern))
+          return true
+        } catch (e) {}
+      }
+    }
+    return false
+  }
   async patchCudaActivationScript() {
     if (this.kernel.platform !== "win32") {
       return
@@ -98,7 +124,7 @@ class Cuda {
             console.log("cuda version", coerced)
             if (semver.satisfies(coerced, ">=12.8.1")) {
               console.log("cuda satisfied")
-              if (!this.kernel.bin.installed.conda.has("cuda-cccl")) {
+              if (!(await this.hasNvTargetHeader())) {
                 return false
               }
               let deactivate_list = [

package/kernel/shell.js

@@ -973,6 +973,11 @@ class Shell {
           }
 
           const activate_root = this.kernel.bin.path("miniconda/etc/conda/activate.d")
+          const logDir = this.kernel.path("cache", "logs")
+          await fs.promises.mkdir(logDir, { recursive: true }).catch(() => {})
+          const logSuffix = this.id || Date.now()
+          const compiler_log = path.resolve(logDir, `vs-${logSuffix}.log`)
+          const cuda_log = path.resolve(logDir, `cuda-${logSuffix}.log`)
           const compiler_candidates = [
             path.resolve(activate_root, "pinokio", "vs2019_compiler_vars.bat"),
             path.resolve(activate_root, "pinokio", "vs2022_compiler_vars.bat"),
@@ -987,9 +992,9 @@ class Shell {
             }
           }
           if (compiler_script) {
-            conda_activation.push(`CALL "${compiler_script}" > nul 2>&1`)
+            conda_activation.push(`CALL "${compiler_script}" > "${compiler_log}" 2>&1`)
           } else if (vcvars_path && arg) {
-            conda_activation.push(`CALL "${vcvars_path}" ${arg} > nul 2>&1`)
+            conda_activation.push(`CALL "${vcvars_path}" ${arg} > "${compiler_log}" 2>&1`)
           }
           const cuda_candidates = [
             path.resolve(activate_root, "pinokio", "~cuda-nvcc_activate.bat"),
@@ -1003,7 +1008,7 @@ class Shell {
             }
           }
           if (cuda_script) {
-            conda_activation.push(`CALL "${cuda_script}" > nul 2>&1`)
+            conda_activation.push(`CALL "${cuda_script}" > "${cuda_log}" 2>&1`)
           }
         } catch (e) {
           console.log('vc vars setup', e)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pinokiod",
-  "version": "5.1.31",
+  "version": "5.1.33",
   "description": "",
   "main": "index.js",
   "scripts": {