pinokiod 5.1.22 → 5.1.23
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/kernel/shell.js +7 -5
- package/package.json +1 -1
package/kernel/shell.js
CHANGED
|
@@ -972,16 +972,18 @@ class Shell {
|
|
|
972
972
|
console.log(`Unsupported arch: os.arch()=${architecture}, process.arch=${armArchitecture}`)
|
|
973
973
|
}
|
|
974
974
|
|
|
975
|
+
const compiler_log = '"%TEMP%\\pinokio-vs.log"'
|
|
975
976
|
const compiler_cmd = [
|
|
976
|
-
`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")`,
|
|
977
|
-
`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")`,
|
|
978
|
-
`else if exist "%CONDA_PREFIX%\\etc\\conda\\activate.d\\vs2019_compiler_vars.bat" (call "%CONDA_PREFIX%\\etc\\conda\\activate.d\\vs2019_compiler_vars.bat")`,
|
|
979
|
-
`else if exist "%CONDA_PREFIX%\\etc\\conda\\activate.d\\vs2022_compiler_vars.bat" (call "%CONDA_PREFIX%\\etc\\conda\\activate.d\\vs2022_compiler_vars.bat")`,
|
|
977
|
+
`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)`,
|
|
978
|
+
`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)`,
|
|
979
|
+
`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)`,
|
|
980
|
+
`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)`,
|
|
980
981
|
]
|
|
981
982
|
if (vcvars_path && arg) {
|
|
982
|
-
compiler_cmd.push(`else if exist "${vcvars_path}" (CALL "${vcvars_path}" ${arg})`)
|
|
983
|
+
compiler_cmd.push(`else if exist "${vcvars_path}" (CALL "${vcvars_path}" ${arg} > ${compiler_log} 2>&1)`)
|
|
983
984
|
}
|
|
984
985
|
conda_activation.push(compiler_cmd.join(" "))
|
|
986
|
+
conda_activation.push("@echo off")
|
|
985
987
|
conda_activation.push("set TORCH_CUDA_ARCH_LIST=")
|
|
986
988
|
conda_activation.push("set CUDAARCHS=")
|
|
987
989
|
} catch (e) {
|