pinokiod 5.1.32 → 5.1.34

package/kernel/bin/cuda.js

@@ -40,7 +40,24 @@ class Cuda {
       return
     }
     const lines = content.split(/\r?\n/)
-    const filtered = lines.filter((line) => !/set\s+\"?(TORCH_CUDA_ARCH_LIST|CUDAARCHS)=/i.test(line))
+    const filtered = []
+    let skipBlock = false
+    for (const line of lines) {
+      if (!skipBlock) {
+        if (/^\s*if\s+not\s+defined\s+(CUDAARCHS|TORCH_CUDA_ARCH_LIST)\s*\(\s*$/i.test(line)) {
+          skipBlock = true
+          continue
+        }
+        if (/set\s+\"?(TORCH_CUDA_ARCH_LIST|CUDAARCHS)=/i.test(line)) {
+          continue
+        }
+        filtered.push(line)
+      } else {
+        if (/^\s*\)\s*$/.test(line)) {
+          skipBlock = false
+        }
+      }
+    }
     if (filtered.length !== lines.length) {
       const eol = content.includes("\r\n") ? "\r\n" : "\n"
       await fs.promises.writeFile(script, filtered.join(eol))

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.32",
+  "version": "5.1.34",
   "description": "",
   "main": "index.js",
   "scripts": {