Merge pull request #262 from microsoft/master

merge master

.github/workflows/main.yml

@@ -11,7 +11,6 @@ on:
       - '**.md'
       - '**.rst'
       - '/docs/en_US/**'
-      - '.github/worklflows/**'
       - '/crowdin.yml'
   schedule:
     - cron:  '*/30 * * * *'
@@ -29,6 +28,12 @@ jobs:
     # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
     - uses: actions/checkout@v2
 
+    # get branch name
+    - name: Get the current branch name
+      shell: bash
+      run: echo "::set-output name=branch::${GITHUB_REF#refs/heads/}"
+      id: branchname
+
     # crowin-translation
     - name: crowdin-action
       uses: crowdin/github-action@1.0.8
@@ -54,11 +59,11 @@ jobs:
         # Download translations with pushing to branch
         push_translations: true # optional, default is true
         # To download translations to the specified version branch
-        localization_branch_name: l10n_${{ github.base_ref }} # optional, default is l10n_crowdin_action
+        localization_branch_name: l10n_${{ steps.branchname.outputs.branch }} # optional, default is l10n_crowdin_action
         # Create pull request after pushing to branch
         create_pull_request: false # optional, default is true
         # Option to upload or download files to the specified version branch in your Crowdin project
-        crowdin_branch_name: ${{ github.base_ref }} # optional
+        crowdin_branch_name: ${{ steps.branchname.outputs.branch }} # optional
         # Option to specify a path to user-specific credentials
         # identity: # optional
         # Option to specify a path to the configuration file

docs/en_US/TrainingService/PaiMode.md

@@ -74,8 +74,8 @@ trial:
   memoryMB: 8196
   image: msranni/nni:latest
   virtualCluster: default
-  nniManagerNFSMountPath: /home/user/mnt
-  containerNFSMountPath: /mnt/data/user
+  nniManagerNFSMountPath: /local/mnt
+  containerNFSMountPath: /mnt/confignfs-data
   paiStorageConfigName: confignfs-data
 # Configuration to access OpenPAI Cluster
 paiConfig:

examples/trials/auto-gbdt/config_pai.yml

@@ -23,9 +23,9 @@ trial:
   memoryMB: 8196
   #The docker image to run nni job on pai
   image: msranni/nni:latest
-  nniManagerNFSMountPath: /home/user/mnt
-  containerNFSMountPath: /mnt/data/user
-  paiStorageConfigName: confignfs-data
+  nniManagerNFSMountPath: {replace_to_your_nfs_mount_path}
+  containerNFSMountPath: {replace_to_your_container_mount_path}
+  paiStorageConfigName: {replace_to_your_storage_config_name}
 paiConfig:
   #The username to login pai
   userName: username

examples/trials/cifar10_pytorch/config_pai.yml

@@ -23,9 +23,9 @@ trial:
   memoryMB: 8196
   #The docker image to run nni job on pai
   image: msranni/nni:latest
-  nniManagerNFSMountPath: /home/user/mnt
-  containerNFSMountPath: /mnt/data/user
-  paiStorageConfigName: confignfs-data
+  nniManagerNFSMountPath: {replace_to_your_nfs_mount_path}
+  containerNFSMountPath: {replace_to_your_container_mount_path}
+  paiStorageConfigName: {replace_to_your_storage_config_name}
 paiConfig:
   #The username to login pai
   userName: username

examples/trials/efficientnet/config_pai.yml

@@ -21,9 +21,9 @@ trial:
   gpuNum: 1
   virtualCluster: nni
   image: msranni/nni:latest
-  nniManagerNFSMountPath: /home/user/mnt
-  containerNFSMountPath: /mnt/data/user
-  paiStorageConfigName: confignfs-data
+  nniManagerNFSMountPath: {replace_to_your_nfs_mount_path}
+  containerNFSMountPath: {replace_to_your_container_mount_path}
+  paiStorageConfigName: {replace_to_your_storage_config_name}
 nniManagerIp: <nni_manager_ip>
 paiConfig:
   userName: <username>

examples/trials/mnist-batch-tune-keras/config_pai.yml

@@ -20,9 +20,9 @@ trial:
   memoryMB: 8196
   #The docker image to run nni job on pai
   image: msranni/nni:latest
-  nniManagerNFSMountPath: /home/user/mnt
-  containerNFSMountPath: /mnt/data/user
-  paiStorageConfigName: confignfs-data
+  nniManagerNFSMountPath: {replace_to_your_nfs_mount_path}
+  containerNFSMountPath: {replace_to_your_container_mount_path}
+  paiStorageConfigName: {replace_to_your_storage_config_name}
 paiConfig:
   #The username to login pai
   userName: username

examples/trials/mnist-keras/config_pai.yml

@@ -23,9 +23,9 @@ trial:
   memoryMB: 8196
   #The docker image to run nni job on pai
   image: msranni/nni:latest
-  nniManagerNFSMountPath: /home/user/mnt
-  containerNFSMountPath: /mnt/data/user
-  paiStorageConfigName: confignfs-data
+  nniManagerNFSMountPath: {replace_to_your_nfs_mount_path}
+  containerNFSMountPath: {replace_to_your_container_mount_path}
+  paiStorageConfigName: {replace_to_your_storage_config_name}
 paiConfig:
   #The username to login pai
   userName: username

examples/trials/mnist-pytorch/config_pai.yml

@@ -23,9 +23,9 @@ trial:
   memoryMB: 8196
   #The docker image to run nni job on pai
   image: msranni/nni:latest
-  nniManagerNFSMountPath: /home/user/mnt
-  containerNFSMountPath: /mnt/data/user
-  paiStorageConfigName: confignfs-data
+  nniManagerNFSMountPath: {replace_to_your_nfs_mount_path}
+  containerNFSMountPath: {replace_to_your_container_mount_path}
+  paiStorageConfigName: {replace_to_your_storage_config_name}
 paiConfig:
   #The username to login pai
   userName: username

examples/trials/mnist-tfv1/config_pai.yml

@@ -23,9 +23,9 @@ trial:
   memoryMB: 8196
   #The docker image to run nni job on pai
   image: msranni/nni:latest
-  nniManagerNFSMountPath: /home/user/mnt
-  containerNFSMountPath: /mnt/data/user
-  paiStorageConfigName: confignfs-data
+  nniManagerNFSMountPath: {replace_to_your_nfs_mount_path}
+  containerNFSMountPath: {replace_to_your_container_mount_path}
+  paiStorageConfigName: {replace_to_your_storage_config_name}
 paiConfig:
   #The username to login pai
   userName: username

examples/trials/network_morphism/FashionMNIST/config_pai.yml

@@ -30,9 +30,9 @@ trial:
   memoryMB: 8196
   #The docker image to run nni job on pai
   image: msranni/nni:latest
-  nniManagerNFSMountPath: /home/user/mnt
-  containerNFSMountPath: /mnt/data/user
-  paiStorageConfigName: confignfs-data
+  nniManagerNFSMountPath: {replace_to_your_nfs_mount_path}
+  containerNFSMountPath: {replace_to_your_container_mount_path}
+  paiStorageConfigName: {replace_to_your_storage_config_name}
 paiConfig:
   #The username to login pai
   userName: username

examples/trials/network_morphism/cifar10/config_pai.yml

@@ -30,9 +30,9 @@ trial:
   memoryMB: 8196
   #The docker image to run nni job on pai
   image: msranni/nni:latest
-  nniManagerNFSMountPath: /home/user/mnt
-  containerNFSMountPath: /mnt/data/user
-  paiStorageConfigName: confignfs-data
+  nniManagerNFSMountPath: {replace_to_your_nfs_mount_path}
+  containerNFSMountPath: {replace_to_your_container_mount_path}
+  paiStorageConfigName: {replace_to_your_storage_config_name}
 paiConfig:
   #The username to login pai
   userName: username

examples/trials/sklearn/classification/config_pai.yml

@@ -23,9 +23,9 @@ trial:
   memoryMB: 8196
   #The docker image to run nni job on pai
   image: msranni/nni:latest
-  nniManagerNFSMountPath: /home/user/mnt
-  containerNFSMountPath: /mnt/data/user
-  paiStorageConfigName: confignfs-data
+  nniManagerNFSMountPath: {replace_to_your_nfs_mount_path}
+  containerNFSMountPath: {replace_to_your_container_mount_path}
+  paiStorageConfigName: {replace_to_your_storage_config_name}
 paiConfig:
   #The username to login pai
   userName: username

examples/trials/sklearn/regression/config_pai.yml

@@ -23,9 +23,9 @@ trial:
   memoryMB: 8196
   #The docker image to run nni job on pai
   image: msranni/nni:latest
-  nniManagerNFSMountPath: /home/user/mnt
-  containerNFSMountPath: /mnt/data/user
-  paiStorageConfigName: confignfs-data
+  nniManagerNFSMountPath: {replace_to_your_nfs_mount_path}
+  containerNFSMountPath: {replace_to_your_container_mount_path}
+  paiStorageConfigName: {replace_to_your_storage_config_name}
 paiConfig:
   #The username to login pai
   userName: username

src/nni_manager/training_service/common/util.ts

@@ -106,7 +106,9 @@ export async function execCopydir(source: string, destination: string): Promise<
         const sourcePath = path.join(source, relPath);
         const destPath = path.join(destination, relPath);
         if (fs.statSync(sourcePath).isDirectory()) {
-            await fs.promises.mkdir(destPath);
+            if (!fs.existsSync(destPath)) {
+                await fs.promises.mkdir(destPath);
+            }
         } else {
             await fs.promises.copyFile(sourcePath, destPath);
         }