Manually cherry-pick bug fix PRs (#4532)

microsoft · Feb 18, 2022 · 4e33e43 · 4e33e43
1 parent 0d3802a
commit 4e33e43
Show file tree

Hide file tree

Showing 12 changed files with 13 additions and 21 deletions.
diff --git a/dependencies/required.txt b/dependencies/required.txt
@@ -4,7 +4,8 @@ json_tricks >= 3.15.5
 psutil
 pyyaml >= 5.4
 requests
-responses
+responses ; python_version >= "3.7"
+responses < 0.18 ; python_version < "3.7"
 schema
 typeguard
 PythonWebHDFS

diff --git a/dependencies/required_extra.txt b/dependencies/required_extra.txt
@@ -6,8 +6,8 @@ ConfigSpaceNNI
 smac4nni
 
 # BOHB
-ConfigSpace==0.4.11
-statsmodels==0.12.0
+ConfigSpace>=0.4.11
+statsmodels>=0.12.0
 
 # PPOTuner
 gym

diff --git a/nni/algorithms/hpo/tpe_tuner.py b/nni/algorithms/hpo/tpe_tuner.py
@@ -22,6 +22,7 @@
 
 from nni.tuner import Tuner
 from nni.common.hpo_utils import OptimizeMode, format_search_space, deformat_parameters, format_parameters
+from nni.utils import extract_scalar_reward
 from . import random_tuner
 
 _logger = logging.getLogger('nni.tuner.tpe')
@@ -126,9 +127,11 @@ def generate_parameters(self, parameter_id, **kwargs):
         self._running_params[parameter_id] = params
         return deformat_parameters(params, self.space)
 
-    def receive_trial_result(self, parameter_id, _parameters, loss, **kwargs):
-        if self.optimize_mode is OptimizeMode.Maximize:
-            loss = -loss
+    def receive_trial_result(self, parameter_id, _parameters, value, **kwargs):
+        if self.optimize_mode is OptimizeMode.Minimize:
+            loss = extract_scalar_reward(value)
+        else:
+            loss = -extract_scalar_reward(value)
         if self.liar:
             self.liar.update(loss)
         params = self._running_params.pop(parameter_id)

diff --git a/nni/tools/nnictl/ts_management.py b/nni/tools/nnictl/ts_management.py
@@ -9,7 +9,7 @@
     'remote',
     'openpai', 'pai',
     'aml',
-    'dlc'
+    'dlc',
     'kubeflow',
     'frameworkcontroller',
     'adl',

diff --git a/pipelines/integration-test-aml.yml b/pipelines/integration-test-aml.yml
@@ -19,8 +19,6 @@ jobs:
       echo "Working directory: ${PWD}"
       echo "NNI version: ${NNI_RELEASE}"
       echo "Build docker image: $(build_docker_image)"
-
-      python3 -m pip install --upgrade pip setuptools
     displayName: Prepare
 
   - script: |

diff --git a/pipelines/integration-test-hybrid.yml b/pipelines/integration-test-hybrid.yml
@@ -18,8 +18,6 @@ jobs:
 
       echo "Working directory: ${PWD}"
       echo "NNI version: ${NNI_RELEASE}"
-
-      python3 -m pip install --upgrade pip setuptools
     displayName: Prepare
 
   - script: |

diff --git a/pipelines/integration-test-kubeflow.yml b/pipelines/integration-test-kubeflow.yml
@@ -22,8 +22,6 @@ jobs:
 
       echo "Working directory: ${PWD}"
       echo "NNI version: ${NNI_RELEASE}"
-
-      python3 -m pip install --upgrade pip setuptools
     displayName: Prepare
 
   - script: |

diff --git a/pipelines/integration-test-openpai-linux.yml b/pipelines/integration-test-openpai-linux.yml
@@ -25,8 +25,6 @@ jobs:
       echo "Working directory: ${PWD}"
       echo "NNI version: ${NNI_RELEASE}"
       echo "Build docker image: $(build_docker_image)"
-
-      python3 -m pip install --upgrade pip setuptools
     displayName: Prepare
 
   - script: |

diff --git a/pipelines/integration-test-remote-l2l.yml b/pipelines/integration-test-remote-l2l.yml
@@ -23,8 +23,6 @@ jobs:
 
       echo "Working directory: ${PWD}"
       echo "NNI version: ${NNI_RELEASE}"
-
-      python3 -m pip install --upgrade pip setuptools
     displayName: Prepare
 
   - script: |

diff --git a/pipelines/integration-test-remote-l2w.yml b/pipelines/integration-test-remote-l2w.yml
@@ -27,7 +27,6 @@ jobs:
       echo "Working directory: ${PWD}"
       echo "NNI version: ${NNI_RELEASE}"
       echo "Build ID: $(Build.BuildId)"
-      python3 -m pip install --upgrade pip setuptools
       python3 setup.py clean --all
     displayName: Prepare on Linux manager
 
@@ -44,7 +43,6 @@ jobs:
       sshEndpoint: $(worker)
       runOptions: commands
       commands: |
-        conda activate l2w & python -m pip install --upgrade pip setuptools
         conda activate l2w & python /tmp/nnitest/$(Build.BuildId)/test/vso_tools/install_nni.py $(NNI_RELEASE)
       failOnStdErr: false
     displayName: Install NNI on Windows worker

diff --git a/pipelines/integration-test-trt.yml b/pipelines/integration-test-trt.yml
@@ -18,8 +18,6 @@ jobs:
 
       echo "Working directory: ${PWD}"
       echo "NNI version: ${NNI_RELEASE}"
-
-      python3 -m pip install --upgrade pip setuptools
     displayName: Prepare
 
   - script: |

diff --git a/test/ut/sdk/test_builtin_tuners.py b/test/ut/sdk/test_builtin_tuners.py
@@ -58,6 +58,8 @@ def receive(*args):
         return receive
 
     def send_trial_result(self, tuner, parameter_id, parameters, metrics):
+        if parameter_id % 2 == 1:
+            metrics = {'default': metrics, 'extra': 'hello'}
         tuner.receive_trial_result(parameter_id, parameters, metrics)
         tuner.trial_end(parameter_id, True)