pinokiod 3.0.24 → 3.0.25
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 +2 -16
- package/package.json +1 -1
package/kernel/shell.js
CHANGED
|
@@ -110,8 +110,6 @@ class Shell {
|
|
|
110
110
|
delete this.env.CUDA_PATH
|
|
111
111
|
}
|
|
112
112
|
|
|
113
|
-
this.env.PINOKIO_SHELL_START = Date.now()
|
|
114
|
-
|
|
115
113
|
this.env.CMAKE_OBJECT_PATH_MAX = 1024
|
|
116
114
|
this.env.PYTORCH_ENABLE_MPS_FALLBACK = 1
|
|
117
115
|
// this.env.NPM_CONFIG_USERCONFIG = this.kernel.path("user_npmrc")
|
|
@@ -452,17 +450,9 @@ class Shell {
|
|
|
452
450
|
// params.message.push(`echo "SHELL FINISHED RUNNING"\r\n`)
|
|
453
451
|
// if params.message is empty, filter out
|
|
454
452
|
//let delimiter = " && "
|
|
455
|
-
|
|
456
|
-
if (this.platform === "win32") {
|
|
457
|
-
params.message.push(`echo "--- pinokio shell.run finished: %PINOKIO_SHELL_START% ---"`)
|
|
458
|
-
} else {
|
|
459
|
-
params.message.push('echo "--- pinokio shell.run finished $PINOKIO_SHELL_START ---"')
|
|
460
|
-
}
|
|
461
|
-
|
|
462
453
|
let delimiter
|
|
463
454
|
if (this.platform === "win32") {
|
|
464
|
-
|
|
465
|
-
delimiter = " & "; // must use &&. & doesn't necessariliy wait until the curruent command finishes
|
|
455
|
+
delimiter = " && "; // must use &&. & doesn't necessariliy wait until the curruent command finishes
|
|
466
456
|
} else {
|
|
467
457
|
delimiter = " ; ";
|
|
468
458
|
}
|
|
@@ -827,13 +817,9 @@ ${cleaned}
|
|
|
827
817
|
// Decide whether to kill or continue
|
|
828
818
|
if (this.ready) {
|
|
829
819
|
// when ready, watch out for the prompt pattern that terminates with [\r\n ]
|
|
830
|
-
|
|
831
|
-
let termination_prompt_re = new RegExp(".*--- pinokio shell.run finished: [0-9]+ ---.*", "g")
|
|
832
|
-
|
|
833
|
-
//let termination_prompt_re = new RegExp(this.prompt_pattern + "[ \r\n]*$", "g")
|
|
820
|
+
let termination_prompt_re = new RegExp(this.prompt_pattern + "[ \r\n]*$", "g")
|
|
834
821
|
let line = cleaned.replaceAll(/[\r\n]/g, "")
|
|
835
822
|
let test = line.match(termination_prompt_re)
|
|
836
|
-
console.log({ line, test, termination_prompt_re })
|
|
837
823
|
if (test) {
|
|
838
824
|
let cache = cleaned
|
|
839
825
|
let cached_msg = msg
|