Merge pull request #3030 from microsoft/v2.0

Merge v2.0 into master

src/nni_manager/package.json → ts/nni_manager/package.json

@@ -12,7 +12,6 @@
   "license": "MIT",
   "dependencies": {
     "azure-storage": "^2.10.2",
-    "chai-as-promised": "^7.1.1",
     "child-process-promise": "^2.2.1",
     "express": "^4.16.3",
     "express-joi-validator": "^2.0.0",
@@ -21,7 +20,7 @@
     "kubernetes-client": "^6.5.0",
     "python-shell": "^2.0.1",
     "rx": "^4.1.0",
-    "sqlite3": "^4.0.2",
+    "sqlite3": "^5.0.0",
     "ssh2": "^0.6.1",
     "stream-buffers": "^3.0.2",
     "tail-stream": "^0.3.4",
@@ -53,6 +52,7 @@
     "@typescript-eslint/eslint-plugin": "^2.10.0",
     "@typescript-eslint/parser": "^2.10.0",
     "chai": "^4.1.2",
+    "chai-as-promised": "^7.1.1",
     "eslint": "^6.7.2",
     "glob": "^7.1.3",
     "mocha": "^8.1.3",

src/nni_manager/training_service/common/gpuData.ts → ts/nni_manager/training_service/common/gpuData.ts

@@ -79,6 +79,6 @@ export function parseGpuIndices(gpuIndices?: string): Set<number> | undefined {
 export const GPU_INFO_COLLECTOR_FORMAT_WINDOWS: string =
     `
 $env:METRIC_OUTPUT_DIR="{0}"
-$app = Start-Process "python" -ArgumentList "-m nni_gpu_tool.gpu_metrics_collector" -passthru -NoNewWindow
+$app = Start-Process "python" -ArgumentList "-m nni.tools.gpu_tool.gpu_metrics_collector" -passthru -NoNewWindow
 Write $app.ID | Out-File {1} -NoNewline -encoding utf8
 `;