From 4c4e0b1ea2ccb00c6e83c84a730beb7a8ae968b8 Mon Sep 17 00:00:00 2001 From: zhangyuge Date: Fri, 11 Oct 2019 17:42:05 +0800 Subject: [PATCH] cmd -> cmd.exe --- src/nni_manager/common/utils.ts | 10 +++++----- src/nni_manager/training_service/common/util.ts | 2 +- .../training_service/local/localTrainingService.ts | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/nni_manager/common/utils.ts b/src/nni_manager/common/utils.ts index 5ae7fc80cb..ca12dc65a9 100644 --- a/src/nni_manager/common/utils.ts +++ b/src/nni_manager/common/utils.ts @@ -456,10 +456,10 @@ function getTunerProc(command: string, stdio: StdioOptions, newCwd: string, newE /** * judge whether the process is alive */ -async function isAlive(pid:any): Promise { +async function isAlive(pid: any): Promise { let deferred : Deferred = new Deferred(); let alive: boolean = false; - if(process.platform ==='win32'){ + if (process.platform === 'win32') { try { const str = cp.execSync(`powershell.exe Get-Process -Id ${pid} -ErrorAction SilentlyContinue`).toString(); if (str) { @@ -469,7 +469,7 @@ async function isAlive(pid:any): Promise { catch (error) { } } - else{ + else { try { await cpp.exec(`kill -0 ${pid}`); alive = true; @@ -484,11 +484,11 @@ async function isAlive(pid:any): Promise { /** * kill process */ -async function killPid(pid:any): Promise { +async function killPid(pid: any): Promise { let deferred : Deferred = new Deferred(); try { if (process.platform === "win32") { - await cpp.exec(`cmd /c taskkill /PID ${pid} /F`); + await cpp.exec(`cmd.exe /c taskkill /PID ${pid} /F`); } else{ await cpp.exec(`kill -9 ${pid}`); diff --git a/src/nni_manager/training_service/common/util.ts b/src/nni_manager/training_service/common/util.ts index cfc6f9b26b..ef05ac57b3 100644 --- a/src/nni_manager/training_service/common/util.ts +++ b/src/nni_manager/training_service/common/util.ts @@ -156,7 +156,7 @@ export async function execRemove(directory: string): Promise { */ export async function execKill(pid: string): Promise { if (process.platform === 'win32') { - await cpp.exec(`cmd /c taskkill /PID ${pid} /T /F`); + await cpp.exec(`cmd.exe /c taskkill /PID ${pid} /T /F`); } else { await cpp.exec(`pkill -P ${pid}`); } diff --git a/src/nni_manager/training_service/local/localTrainingService.ts b/src/nni_manager/training_service/local/localTrainingService.ts index 1a7c70d3a1..2d4d1a1745 100644 --- a/src/nni_manager/training_service/local/localTrainingService.ts +++ b/src/nni_manager/training_service/local/localTrainingService.ts @@ -490,7 +490,7 @@ class LocalTrainingService implements TrainingService { const script: string[] = []; if (process.platform === 'win32') { script.push( - `cmd /c ${localTrialConfig.command} 2>${path.join(workingDirectory, 'stderr')}`, + `cmd.exe /c ${localTrialConfig.command} 2>${path.join(workingDirectory, 'stderr')}`, `$NOW_DATE = [int64](([datetime]::UtcNow)-(get-date "1/1/1970")).TotalSeconds`, `$NOW_DATE = "$NOW_DATE" + (Get-Date -Format fff).ToString()`, `Write $LASTEXITCODE " " $NOW_DATE | Out-File ${path.join(workingDirectory, '.nni', 'state')} -NoNewline -encoding utf8`);