Merge pull request #158 from Microsoft/master

merge master

src/sdk/pynni/nni/bohb_advisor/requirements.txt

+ConfigSpace==0.4.7
+statsmodels==0.9.0
\ No newline at end of file

src/sdk/pynni/nni/constants.py

@@ -60,9 +60,11 @@ ClassArgs = {
 }
 
 AdvisorModuleName = {
-    'Hyperband': 'nni.hyperband_advisor.hyperband_advisor'
+    'Hyperband': 'nni.hyperband_advisor.hyperband_advisor',
+    'BOHB': 'nni.bohb_advisor.bohb_advisor'
 }
 
 AdvisorClassName = {
-    'Hyperband': 'Hyperband'
+    'Hyperband': 'Hyperband',
+    'BOHB': 'BOHB'
 }
\ No newline at end of file

tools/nni_cmd/config_schema.py

@@ -52,6 +52,27 @@ Optional('advisor'): Or({
     'className': str,
     Optional('classArgs'): dict,
     Optional('gpuNum'): And(int, lambda x: 0 <= x <= 99999),
+},{
+    'builtinAdvisorName': Or('BOHB'),
+    'classArgs': {
+        'optimize_mode': Or('maximize', 'minimize'),
+        Optional('min_budget'): And(int, lambda x: 0 <= x <= 9999),
+        Optional('max_budget'): And(int, lambda x: 0 <= x <= 9999),
+        Optional('eta'): And(int, lambda x: 0 <= x <= 9999),
+        Optional('min_points_in_model'): And(int, lambda x: 0 <= x <= 9999),
+        Optional('top_n_percent'): And(int, lambda x: 1 <= x <= 99),
+        Optional('num_samples'): And(int, lambda x: 1 <= x <= 9999),
+        Optional('random_fraction'): And(float, lambda x: 0.0 <= x <= 9999.0),
+        Optional('bandwidth_factor'): And(float, lambda x: 0.0 <= x <= 9999.0),
+        Optional('min_bandwidth'): And(float, lambda x: 0.0 <= x <= 9999.0)
+    },
+    Optional('gpuNum'): And(int, lambda x: 0 <= x <= 99999),
+},{
+    'codeDir': os.path.exists,
+    'classFileName': str,
+    'className': str,
+    Optional('classArgs'): dict,
+    Optional('gpuNum'): And(int, lambda x: 0 <= x <= 99999),
 }),
 Optional('tuner'): Or({
     'builtinTunerName': Or('TPE', 'Anneal', 'SMAC', 'Evolution'),

tools/nni_cmd/constants.py

@@ -76,7 +76,8 @@ TRIAL_MONITOR_CONTENT = '%-15s %-25s %-25s %-15s'
 TRIAL_MONITOR_TAIL = '-------------------------------------------------------------------------------------\n\n\n'
 
 PACKAGE_REQUIREMENTS = {
-    'SMAC': 'smac_tuner'
+    'SMAC': 'smac_tuner',
+    'BOHB': 'bohb_advisor'
 }
 
 COLOR_RED_FORMAT = '\033[1;31;31m%s\033[0m'