pinokiod 5.1.27 → 5.1.29

package/kernel/bin/cuda.js

@@ -2,6 +2,24 @@ const semver = require('semver')
 const fs = require('fs')
 const path = require('path')
 class Cuda {
+  async patchCudaActivationScript() {
+    if (this.kernel.platform !== "win32") {
+      return
+    }
+    const script = this.kernel.bin.path("miniconda/etc/conda/activate.d/pinokio/~cuda-nvcc_activate.bat")
+    let content
+    try {
+      content = await fs.promises.readFile(script, "utf8")
+    } catch (e) {
+      return
+    }
+    const lines = content.split(/\r?\n/)
+    const filtered = lines.filter((line) => !/set\s+\"?(TORCH_CUDA_ARCH_LIST|CUDAARCHS)=/i.test(line))
+    if (filtered.length !== lines.length) {
+      const eol = content.includes("\r\n") ? "\r\n" : "\n"
+      await fs.promises.writeFile(script, filtered.join(eol))
+    }
+  }
   async stashActivationScripts() {
     if (this.kernel.platform !== "win32") {
       return
@@ -28,6 +46,7 @@ class Cuda {
         }
       }
     }
+    await this.patchCudaActivationScript()
   }
   async install(req, ondata) {
     if (this.kernel.gpu === "nvidia") {

package/kernel/shell.js

@@ -1005,9 +1005,6 @@ class Shell {
           if (cuda_script) {
             conda_activation.push(`CALL "${cuda_script}" > nul 2>&1`)
           }
-          conda_activation.push("@echo off")
-          conda_activation.push("set TORCH_CUDA_ARCH_LIST=")
-          conda_activation.push("set CUDAARCHS=")
         } catch (e) {
           console.log('vc vars setup', e)
         }

package/package.json

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