From 159f9b34e14d5d0a56296051c9eeec009681507e Mon Sep 17 00:00:00 2001
From: J-shang <33053116+J-shang@users.noreply.github.com>
Date: Wed, 9 Jun 2021 10:33:01 +0800
Subject: [PATCH] update sharedstorage config to v2 (#3733)

---
 .../mnist-sharedstorage/config_azureblob.yml  | 41 +++++++++----------
 .../trials/mnist-sharedstorage/config_nfs.yml | 41 +++++++++----------
 2 files changed, 40 insertions(+), 42 deletions(-)

diff --git a/examples/trials/mnist-sharedstorage/config_azureblob.yml b/examples/trials/mnist-sharedstorage/config_azureblob.yml
index 16994b3a0a..b070732fdf 100644
--- a/examples/trials/mnist-sharedstorage/config_azureblob.yml
+++ b/examples/trials/mnist-sharedstorage/config_azureblob.yml
@@ -1,28 +1,27 @@
-authorName: default
-experimentName: example_mnist
+searchSpaceFile: search_space.json
+trialCommand: python3 mnist.py
+trialGpuNumber: 0
 trialConcurrency: 1
-maxExecDuration: 1h
-maxTrialNum: 10
-trainingServicePlatform: aml
-searchSpacePath: search_space.json
-#choice: true, false
-useAnnotation: false
+maxTrialNumber: 10
 tuner:
-  #choice: TPE, Random, Anneal, Evolution, BatchTuner, MetisTuner, GPTuner
-  #SMAC (SMAC should be installed through nnictl)
-  builtinTunerName: TPE
+  name: TPE
   classArgs:
-    #choice: maximize, minimize
     optimize_mode: maximize
-trial:
-  command: python3 mnist.py
-  codeDir: .
-  image: msranni/nni
-amlConfig:
-  subscriptionId: ${replace_to_your_subscriptionId}
-  resourceGroup: ${replace_to_your_resourceGroup}
-  workspaceName: ${replace_to_your_workspaceName}
-  computeTarget: ${replace_to_your_computeTarget}
+trainingService:
+  platform: remote
+  machineList:
+    - host: ${your server's IP or domain name}
+      user: ${your user name}
+      ssh_key_file: ~/.ssh/id_rsa  # We recommend public key over password, it's more secure and convenient.
+    # You can specify more than one SSH servers:
+    - host: 123.123.123.123
+      port: 10022
+      user: nniuser
+      password: 12345
+      pythonPath: /usr/bin  # Other examples:
+                            #   /opt/python3.9/bin
+                            #   C:/Python39
+                            #   C:/Users/USERNAME/.conda/envs/ENVNAME;C:/Users/USERNAME/.conda/envs/ENVNAME/Scripts;C:/Users/USERNAME/.conda/envs/ENVNAME/Library/bin
 sharedStorage:
   storageType: AzureBlob
   localMountPoint: ${your/local/mount/point}
diff --git a/examples/trials/mnist-sharedstorage/config_nfs.yml b/examples/trials/mnist-sharedstorage/config_nfs.yml
index 2b85f10224..1713982983 100644
--- a/examples/trials/mnist-sharedstorage/config_nfs.yml
+++ b/examples/trials/mnist-sharedstorage/config_nfs.yml
@@ -1,28 +1,27 @@
-authorName: default
-experimentName: example_mnist
+searchSpaceFile: search_space.json
+trialCommand: python3 mnist.py
+trialGpuNumber: 0
 trialConcurrency: 1
-maxExecDuration: 1h
-maxTrialNum: 10
-trainingServicePlatform: aml
-searchSpacePath: search_space.json
-#choice: true, false
-useAnnotation: false
+maxTrialNumber: 10
 tuner:
-  #choice: TPE, Random, Anneal, Evolution, BatchTuner, MetisTuner, GPTuner
-  #SMAC (SMAC should be installed through nnictl)
-  builtinTunerName: TPE
+  name: TPE
   classArgs:
-    #choice: maximize, minimize
     optimize_mode: maximize
-trial:
-  command: python3 mnist.py
-  codeDir: .
-  image: msranni/nni
-amlConfig:
-  subscriptionId: ${replace_to_your_subscriptionId}
-  resourceGroup: ${replace_to_your_resourceGroup}
-  workspaceName: ${replace_to_your_workspaceName}
-  computeTarget: ${replace_to_your_computeTarget}
+trainingService:
+  platform: remote
+  machineList:
+    - host: ${your server's IP or domain name}
+      user: ${your user name}
+      ssh_key_file: ~/.ssh/id_rsa  # We recommend public key over password, it's more secure and convenient.
+    # You can specify more than one SSH servers:
+    - host: 123.123.123.123
+      port: 10022
+      user: nniuser
+      password: 12345
+      pythonPath: /usr/bin  # Other examples:
+                            #   /opt/python3.9/bin
+                            #   C:/Python39
+                            #   C:/Users/USERNAME/.conda/envs/ENVNAME;C:/Users/USERNAME/.conda/envs/ENVNAME/Scripts;C:/Users/USERNAME/.conda/envs/ENVNAME/Library/bin
 sharedStorage:
   storageType: NFS
   localMountPoint: ${your/local/mount/point}