pinokiod 5.1.21 → 5.1.22

package/kernel/bin/cuda.js

@@ -14,22 +14,30 @@ class Cuda {
       )
     } catch (e) {}
   }
-  async patchCudaActivationScript() {
+  async stashCompilerVarsScripts() {
     if (this.kernel.platform !== "win32") {
       return
     }
-    const script = this.kernel.bin.path("miniconda/etc/conda/activate.d/~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) => !/(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))
+    const folder = this.kernel.bin.path("miniconda/etc/conda/activate.d")
+    const stash = path.resolve(folder, "pinokio")
+    await fs.promises.mkdir(stash, { recursive: true }).catch(() => {})
+    const scripts = [
+      "vs2019_compiler_vars.bat",
+      "vs2022_compiler_vars.bat",
+    ]
+    for (const script of scripts) {
+      const dest = path.resolve(stash, script)
+      for (const src of [path.resolve(folder, script), path.resolve(folder, `${script}.disabled`)]) {
+        try {
+          await fs.promises.rename(src, dest)
+          break
+        } catch (e) {
+          if (e && e.code === "EEXIST") {
+            await fs.promises.rm(src).catch(() => {})
+            break
+          }
+        }
+      }
     }
   }
   async install(req, ondata) {
@@ -48,18 +56,7 @@ class Cuda {
           ]
         }, ondata)
         await this.restoreCudaActivationScript()
-        await this.patchCudaActivationScript()
-        const folder = this.kernel.bin.path("miniconda/etc/conda/activate.d")
-        let deactivate_list = [
-          "vs2019_compiler_vars.bat",
-          "vs2022_compiler_vars.bat",
-        ]
-        for(let item of deactivate_list) {
-          const old_name = path.resolve(folder, item)
-          const new_name = path.resolve(folder, item + ".disabled")
-          console.log("rename", { old_name, new_name })
-          await fs.promises.rename(old_name, new_name)
-        }
+        await this.stashCompilerVarsScripts()
       } else {
         await this.kernel.bin.exec({
           message: [
@@ -87,7 +84,7 @@ class Cuda {
     if (this.kernel.gpu === "nvidia") {
       if (this.kernel.platform === 'win32') {
         await this.restoreCudaActivationScript()
-        await this.patchCudaActivationScript()
+        await this.stashCompilerVarsScripts()
         if (this.kernel.bin.installed.conda.has("cudnn") && this.kernel.bin.installed.conda.has("cuda") && this.kernel.bin.installed.conda.has("libzlib-wapi")) {
           let version = this.kernel.bin.installed.conda_versions.cuda
           if (version) {

package/kernel/shell.js

@@ -949,37 +949,41 @@ class Shell {
     if (params.build) {
       if (this.platform === "win32") {
         try {
-          let vcvars_path = this.kernel.bin.vs_path_env.VCVARSALL_PATH
-          if (vcvars_path) {
-            const architecture = os.arch().toLowerCase();  // 'x64', 'ia32' (32-bit), etc.
-            const armArchitecture = process.arch.toLowerCase(); // For ARM-based architectures (on Windows), process.arch might be 'arm64', 'arm', etc.
-
-            // Map architectures to vcvarsall.bat argument
-            let arg
-            if (architecture === 'x64' || armArchitecture === 'arm64') {
-              //arg = 'amd64';  // Native 64-bit architecture
-              arg = 'x64';
-            } else if (architecture === 'ia32' || armArchitecture === 'arm') {
-              arg = 'x86';    // Native 32-bit architecture
-            } else if (armArchitecture === 'x86_arm64') {
-              arg = 'x86_arm64';  // ARM64 on x86
-            } else if (armArchitecture === 'x86_arm') {
-              arg = 'x86_arm';    // ARM on x86
-            } else if (armArchitecture === 'amd64_arm64') {
-              arg = 'amd64_arm64'; // ARM64 on x64
-            } else if (armArchitecture === 'amd64_arm') {
-              arg = 'amd64_arm';   // ARM on x64
-            } else {
-              console.log(`Unsupported arch: os.arch()=${architecture}, process.arch=${armArchitecture}`)
-            }
-
-            if (arg) {
-              //conda_activation.push(`CALL "${vcvars_path}" ${arg} > nul 2>&1`)
-              conda_activation.push(`CALL "${vcvars_path}" ${arg}`)
-            }
+          const vcvars_path = this.kernel.bin.vs_path_env && this.kernel.bin.vs_path_env.VCVARSALL_PATH
+          const architecture = os.arch().toLowerCase();  // 'x64', 'ia32' (32-bit), etc.
+          const armArchitecture = process.arch.toLowerCase(); // For ARM-based architectures (on Windows), process.arch might be 'arm64', 'arm', etc.
+
+          // Map architectures to vcvarsall.bat argument
+          let arg
+          if (architecture === 'x64' || armArchitecture === 'arm64') {
+            //arg = 'amd64';  // Native 64-bit architecture
+            arg = 'x64';
+          } else if (architecture === 'ia32' || armArchitecture === 'arm') {
+            arg = 'x86';    // Native 32-bit architecture
+          } else if (armArchitecture === 'x86_arm64') {
+            arg = 'x86_arm64';  // ARM64 on x86
+          } else if (armArchitecture === 'x86_arm') {
+            arg = 'x86_arm';    // ARM on x86
+          } else if (armArchitecture === 'amd64_arm64') {
+            arg = 'amd64_arm64'; // ARM64 on x64
+          } else if (armArchitecture === 'amd64_arm') {
+            arg = 'amd64_arm';   // ARM on x64
           } else {
-  //          console.log('vc vars env doesnt exist')
+            console.log(`Unsupported arch: os.arch()=${architecture}, process.arch=${armArchitecture}`)
+          }
+
+          const compiler_cmd = [
+            `if exist "%CONDA_PREFIX%\\etc\\conda\\activate.d\\pinokio\\vs2019_compiler_vars.bat" (call "%CONDA_PREFIX%\\etc\\conda\\activate.d\\pinokio\\vs2019_compiler_vars.bat")`,
+            `else if exist "%CONDA_PREFIX%\\etc\\conda\\activate.d\\pinokio\\vs2022_compiler_vars.bat" (call "%CONDA_PREFIX%\\etc\\conda\\activate.d\\pinokio\\vs2022_compiler_vars.bat")`,
+            `else if exist "%CONDA_PREFIX%\\etc\\conda\\activate.d\\vs2019_compiler_vars.bat" (call "%CONDA_PREFIX%\\etc\\conda\\activate.d\\vs2019_compiler_vars.bat")`,
+            `else if exist "%CONDA_PREFIX%\\etc\\conda\\activate.d\\vs2022_compiler_vars.bat" (call "%CONDA_PREFIX%\\etc\\conda\\activate.d\\vs2022_compiler_vars.bat")`,
+          ]
+          if (vcvars_path && arg) {
+            compiler_cmd.push(`else if exist "${vcvars_path}" (CALL "${vcvars_path}" ${arg})`)
           }
+          conda_activation.push(compiler_cmd.join(" "))
+          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.21",
+  "version": "5.1.22",
   "description": "",
   "main": "index.js",
   "scripts": {