Merge pull request #3030 from microsoft/v2.0

Merge v2.0 into master

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

@@ -236,7 +236,7 @@ export function getScriptName(fileNamePrefix: string): string {
 }
 
 export function getGpuMetricsCollectorBashScriptContent(scriptFolder: string): string {
-    return `echo $$ > ${scriptFolder}/pid ; METRIC_OUTPUT_DIR=${scriptFolder} python3 -m nni_gpu_tool.gpu_metrics_collector`;
+    return `echo $$ > ${scriptFolder}/pid ; METRIC_OUTPUT_DIR=${scriptFolder} python3 -m nni.tools.gpu_tool.gpu_metrics_collector`;
 }
 
 export function runGpuMetricsCollector(scriptFolder: string): void {

src/nni_manager/training_service/dlts/dltsData.ts → ts/nni_manager/training_service/dlts/dltsData.ts

@@ -4,5 +4,5 @@
 export const DLTS_TRIAL_COMMAND_FORMAT: string =
 `export NNI_PLATFORM=dlts NNI_SYS_DIR={0} NNI_OUTPUT_DIR={1} NNI_TRIAL_JOB_ID={2} NNI_EXP_ID={3} NNI_TRIAL_SEQ_ID={4} MULTI_PHASE={5} \
 && cd $NNI_SYS_DIR && sh install_nni.sh \
-&& cd '{6}' && python3 -m nni_trial_tool.trial_keeper --trial_command '{7}' \
+&& cd '{6}' && python3 -m nni.tools.trial_tool.trial_keeper --trial_command '{7}' \
 --nnimanager_ip '{8}' --nnimanager_port '{9}' --nni_manager_version '{10}' --log_collection '{11}'`;