update loguniform for smac (#430)

* modify loguniform and lognormal

* fix bug

* fix bug

* update doc

* update doc

* fix

* update tpe for loguniform

* update tpe for loguniform

* update for loguniform

* update for loguniform

* update loguniform and qloguniform

* update doc

* update

* revert

* revert

* revert

* revert

* update loguniform for smac

* update loguniform for smac

* update loguniform for smac

* update loguniform for smac

src/sdk/pynni/nni/smac_tuner/convert_ss_to_scenario.py

@@ -20,6 +20,7 @@
 
 import os
 import json
+import numpy as np
 
 def get_json_content(file_path):
     '''Load json file content'''
@@ -63,7 +64,9 @@ def generate_pcs(nni_search_space_content):
                                 json.dumps(search_space[key]['_value']),
                                 json.dumps(search_space[key]['_value'][0])))
                         elif search_space[key]['_type'] == 'loguniform':
-                            pcs_fd.write('%s real %s [%s] log\n' % (
+                            # use np.round here to ensure that the rounded defaut value is in the range, which will be rounded in configure_space package
+                            search_space[key]['_value'] = list(np.round(np.log(search_space[key]['_value']), 10))
+                            pcs_fd.write('%s real %s [%s]\n' % (
                                 key, 
                                 json.dumps(search_space[key]['_value']),
                                 json.dumps(search_space[key]['_value'][0])))

src/sdk/pynni/nni/smac_tuner/smac_tuner.py

@@ -57,6 +57,7 @@ class SMACTuner(Tuner):
         self.smbo_solver = None
         self.first_one = True
         self.update_ss_done = False
+        self.loguniform_key = set()
 
     def _main_cli(self):
         '''
@@ -130,6 +131,7 @@ class SMACTuner(Tuner):
             generate_scenario(search_space)
             self.optimizer = self._main_cli()
             self.smbo_solver = self.optimizer.solver
+            self.loguniform_key = {key for key in search_space.keys() if search_space[key]['_type'] == 'loguniform'}
             self.update_ss_done = True
         else:
             self.logger.warning('update search space is not supported.')
@@ -150,6 +152,15 @@ class SMACTuner(Tuner):
         else:
             self.smbo_solver.nni_smac_receive_runs(self.total_data[parameter_id], reward)
 
+    def convert_loguniform(self, challenger_dict):
+        '''
+        convert the values of type `loguniform` back to their initial range
+        '''
+        for key, value in challenger_dict.items():
+            if key in self.loguniform_key:
+                challenger_dict[key] = np.exp(challenger_dict[key])
+        return challenger_dict
+
     def generate_parameters(self, parameter_id):
         '''
         generate one instance of hyperparameters
@@ -158,25 +169,27 @@ class SMACTuner(Tuner):
             init_challenger = self.smbo_solver.nni_smac_start()
             self.total_data[parameter_id] = init_challenger
             json_tricks.dumps(init_challenger.get_dictionary())
-            return init_challenger.get_dictionary()
+            return self.convert_loguniform(init_challenger.get_dictionary())
         else:
             challengers = self.smbo_solver.nni_smac_request_challengers()
             for challenger in challengers:
                 self.total_data[parameter_id] = challenger
                 json_tricks.dumps(challenger.get_dictionary())
-                return challenger.get_dictionary()
+                return self.convert_loguniform(challenger.get_dictionary())
 
     def generate_multiple_parameters(self, parameter_id_list):
         '''
         generate mutiple instances of hyperparameters
         '''
+        
+
         if self.first_one:
             params = []
             for one_id in parameter_id_list:
                 init_challenger = self.smbo_solver.nni_smac_start()
                 self.total_data[one_id] = init_challenger
                 json_tricks.dumps(init_challenger.get_dictionary())
-                params.append(init_challenger.get_dictionary())
+                params.append(self.convert_loguniform(init_challenger.get_dictionary()))
         else:
             challengers = self.smbo_solver.nni_smac_request_challengers()
             cnt = 0
@@ -186,6 +199,6 @@ class SMACTuner(Tuner):
                     break
                 self.total_data[parameter_id_list[cnt]] = challenger
                 json_tricks.dumps(challenger.get_dictionary())
-                params.append(challenger.get_dictionary())
+                params.append(self.convert_loguniform(challenger.get_dictionary()))
                 cnt += 1
         return params