pinokiod 5.1.23 → 5.1.25

package/kernel/bin/cuda.js

@@ -2,19 +2,7 @@ const semver = require('semver')
 const fs = require('fs')
 const path = require('path')
 class Cuda {
-  async restoreCudaActivationScript() {
-    if (this.kernel.platform !== "win32") {
-      return
-    }
-    const folder = this.kernel.bin.path("miniconda/etc/conda/activate.d")
-    try {
-      await fs.promises.rename(
-        path.resolve(folder, "~cuda-nvcc_activate.bat.disabled"),
-        path.resolve(folder, "~cuda-nvcc_activate.bat")
-      )
-    } catch (e) {}
-  }
-  async stashCompilerVarsScripts() {
+  async stashActivationScripts() {
     if (this.kernel.platform !== "win32") {
       return
     }
@@ -22,6 +10,7 @@ class Cuda {
     const stash = path.resolve(folder, "pinokio")
     await fs.promises.mkdir(stash, { recursive: true }).catch(() => {})
     const scripts = [
+      "~cuda-nvcc_activate.bat",
       "vs2019_compiler_vars.bat",
       "vs2022_compiler_vars.bat",
     ]
@@ -55,8 +44,7 @@ class Cuda {
             "conda install -y nvidia/label/cuda-12.8.1::cuda"
           ]
         }, ondata)
-        await this.restoreCudaActivationScript()
-        await this.stashCompilerVarsScripts()
+        await this.stashActivationScripts()
       } else {
         await this.kernel.bin.exec({
           message: [
@@ -83,8 +71,7 @@ class Cuda {
   async installed() {
     if (this.kernel.gpu === "nvidia") {
       if (this.kernel.platform === 'win32') {
-        await this.restoreCudaActivationScript()
-        await this.stashCompilerVarsScripts()
+        await this.stashActivationScripts()
         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

@@ -973,16 +973,39 @@ class Shell {
           }
 
           const compiler_log = '"%TEMP%\\pinokio-vs.log"'
-          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" > ${compiler_log} 2>&1)`,
-            `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" > ${compiler_log} 2>&1)`,
-            `else if exist "%CONDA_PREFIX%\\etc\\conda\\activate.d\\vs2019_compiler_vars.bat" (call "%CONDA_PREFIX%\\etc\\conda\\activate.d\\vs2019_compiler_vars.bat" > ${compiler_log} 2>&1)`,
-            `else if exist "%CONDA_PREFIX%\\etc\\conda\\activate.d\\vs2022_compiler_vars.bat" (call "%CONDA_PREFIX%\\etc\\conda\\activate.d\\vs2022_compiler_vars.bat" > ${compiler_log} 2>&1)`,
+          const activate_root = this.kernel.bin.path("miniconda/etc/conda/activate.d")
+          const compiler_candidates = [
+            path.resolve(activate_root, "pinokio", "vs2019_compiler_vars.bat"),
+            path.resolve(activate_root, "pinokio", "vs2022_compiler_vars.bat"),
+            path.resolve(activate_root, "vs2019_compiler_vars.bat"),
+            path.resolve(activate_root, "vs2022_compiler_vars.bat"),
           ]
-          if (vcvars_path && arg) {
-            compiler_cmd.push(`else if exist "${vcvars_path}" (CALL "${vcvars_path}" ${arg} > ${compiler_log} 2>&1)`)
+          let compiler_script = null
+          for (const candidate of compiler_candidates) {
+            if (await this.exists(candidate)) {
+              compiler_script = candidate
+              break
+            }
+          }
+          if (compiler_script) {
+            conda_activation.push(`CALL "${compiler_script}" > ${compiler_log} 2>&1`)
+          } else if (vcvars_path && arg) {
+            conda_activation.push(`CALL "${vcvars_path}" ${arg} > ${compiler_log} 2>&1`)
+          }
+          const cuda_candidates = [
+            path.resolve(activate_root, "pinokio", "~cuda-nvcc_activate.bat"),
+            path.resolve(activate_root, "~cuda-nvcc_activate.bat"),
+          ]
+          let cuda_script = null
+          for (const candidate of cuda_candidates) {
+            if (await this.exists(candidate)) {
+              cuda_script = candidate
+              break
+            }
+          }
+          if (cuda_script) {
+            conda_activation.push(`CALL "${cuda_script}" > ${compiler_log} 2>&1`)
           }
-          conda_activation.push(compiler_cmd.join(" "))
           conda_activation.push("@echo off")
           conda_activation.push("set TORCH_CUDA_ARCH_LIST=")
           conda_activation.push("set CUDAARCHS=")

package/package.json

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