Fix pipeline (#3386)

nni/tools/nnictl/config_utils.py

@@ -71,8 +71,14 @@ def _inverse_cluster_metadata(platform: str, metadata_config: list) -> dict:
                 inverse_config['amlConfig'] = kv['value']
             elif kv['key'] == 'trial_config':
                 inverse_config['trial'] = kv['value']
+    elif platform == 'adl':
+        for kv in metadata_config:
+            if kv['key'] == 'adl_config':
+                inverse_config['adlConfig'] = kv['value']
+            elif kv['key'] == 'trial_config':
+                inverse_config['trial'] = kv['value']
     else:
-        raise RuntimeError('training service platform not found')
+        raise RuntimeError('training service platform {} not found'.format(platform))
     return inverse_config
 
 class Config:

nni/tools/nnictl/launcher.py

@@ -343,6 +343,8 @@ def set_experiment(experiment_config, mode, port, config_file_name):
         request_data['multiPhase'] = experiment_config.get('multiPhase')
     if experiment_config.get('multiThread'):
         request_data['multiThread'] = experiment_config.get('multiThread')
+    if experiment_config.get('nniManagerIp'):
+        request_data['nniManagerIp'] = experiment_config.get('nniManagerIp')
     if experiment_config.get('advisor'):
         request_data['advisor'] = experiment_config['advisor']
         if request_data['advisor'].get('gpuNum'):
@@ -419,6 +421,9 @@ def set_experiment(experiment_config, mode, port, config_file_name):
                 request_data['clusterMetaData'].append(request_dict[platform])
         request_data['clusterMetaData'].append(
             {'key': 'trial_config', 'value': experiment_config['trial']})
+    elif experiment_config['trainingServicePlatform'] == 'adl':
+        request_data['clusterMetaData'].append(
+            {'key': 'trial_config', 'value': experiment_config['trial']})
     response = rest_post(experiment_url(port), json.dumps(request_data), REST_TIME_OUT, show_error=True)
     if check_response(response):
         return response

pipelines/full-test-linux.yml

@@ -7,7 +7,7 @@ schedules:
 
 jobs:
 - job: linux
-  pool: NNI CI GPU3
+  pool: nni-ci-gpu-local
   timeoutInMinutes: 120
 
   steps:
@@ -15,7 +15,7 @@ jobs:
       echo "##vso[task.setvariable variable=PATH]${PATH}:${HOME}/.local/bin"
       echo "##vso[task.setvariable variable=NNI_RELEASE]999.$(date -u +%Y%m%d%H%M%S)"
 
-      python3 -m pip install --upgrade pip setuptools
+      python3 -m pip install --upgrade pip setuptools wheel
       python3 -m pip install pytest
     displayName: Prepare
 
@@ -29,8 +29,9 @@ jobs:
   - script: |
       set -e
       python3 -m pip install scikit-learn==0.23.2
-      python3 -m pip install torchvision==0.6.1
-      python3 -m pip install torch==1.5.1
+      python3 -m pip install torchvision==0.7.0
+      python3 -m pip install torch==1.6.0
+      python3 -m pip install 'pytorch-lightning>=1.1.1,<1.2'
       python3 -m pip install keras==2.1.6
       python3 -m pip install tensorflow==2.3.1 tensorflow-estimator==2.3.0
       python3 -m pip install thop

pipelines/full-test-windows.yml

@@ -12,7 +12,7 @@ jobs:
 
   steps:
   - script: |
-      python -m pip install --upgrade pip setuptools
+      python -m pip install --upgrade pip setuptools wheel
       python -m pip install pytest
     displayName: Install Python tools
 
@@ -27,7 +27,8 @@ jobs:
   - script: |
       python -m pip install scikit-learn==0.23.2
       python -m pip install keras==2.1.6
-      python -m pip install torchvision===0.6.1 torch===1.5.1 -f https://download.pytorch.org/whl/torch_stable.html
+      python -m pip install torch==1.6.0 torchvision==0.7.0 -f https://download.pytorch.org/whl/torch_stable.html
+      python -m pip install 'pytorch-lightning>=1.1.1,<1.2'
       python -m pip install tensorflow==2.3.1 tensorflow-estimator==2.3.0
     displayName: Install extra dependencies
 

ts/nni_manager/rest_server/restValidationSchemas.ts

@@ -218,6 +218,7 @@ export namespace ValidationSchemas {
             maxExecDuration: joi.number().min(0).required(),
             multiPhase: joi.boolean(),
             multiThread: joi.boolean(),
+            nniManagerIp: joi.string(),
             versionCheck: joi.boolean(),
             logCollection: joi.string(),
             advisor: joi.object({