Refactor HPO tuner code hierarchy (#3187)

Co-authored-by: liuzhe <liuzhe.cs@pku.edu.cn>

nni/algorithms/hpo/medianstop_assessor/__init__.py

-# Copyright (c) Microsoft Corporation.
-# Licensed under the MIT license.
-
-from .medianstop_assessor import MedianstopAssessor

nni/algorithms/hpo/metis_tuner/__init__.py

+from .metis_tuner import MetisTuner, MetisClassArgsValidator

nni/algorithms/hpo/networkmorphism_tuner/__init__.py

+from .networkmorphism_tuner import NetworkMorphismTuner, NetworkMorphismClassArgsValidator

nni/algorithms/hpo/ppo_tuner/__init__.py

-from .ppo_tuner import PPOTuner
+from .ppo_tuner import PPOTuner, PPOClassArgsValidator

nni/algorithms/hpo/ppo_tuner/requirements.txt

-enum34
-gym

nni/algorithms/hpo/regularized_evolution_tuner/__init__.py

-from .regularized_evolution_tuner import RegularizedEvolutionTuner

nni/algorithms/hpo/smac_tuner/__init__.py

 # Copyright (c) Microsoft Corporation.
 # Licensed under the MIT license.
 
-from .smac_tuner import SMACTuner
+from .smac_tuner import SMACTuner, SMACClassArgsValidator

nni/algorithms/hpo/smac_tuner/requirements.txt

-git+https://github.com/QuanluZhang/ConfigSpace.git
-git+https://github.com/QuanluZhang/SMAC3.git

nni/algorithms/nas/pytorch/cdarts/__init__.py

@@ -2,4 +2,4 @@
 # Licensed under the MIT license.
 
 from .mutator import RegularizedDartsMutator, RegularizedMutatorParallel, DartsDiscreteMutator
-from .trainer import CdartsTrainer
\ No newline at end of file
+from .trainer import CdartsTrainer

nni/algorithms/nas/pytorch/random/__init__.py

-from .mutator import RandomMutator
\ No newline at end of file
+from .mutator import RandomMutator

nni/compression/pytorch/compressor.py

@@ -662,7 +662,7 @@ class QuantGrad(torch.autograd.Function):
         if quant_type == QuantType.QUANT_INPUT:
             output = wrapper.quantizer.quantize_input(tensor, wrapper, **kwargs)
         elif quant_type == QuantType.QUANT_WEIGHT:
-            output =  wrapper.quantizer.quantize_weight(wrapper, **kwargs)
+            output = wrapper.quantizer.quantize_weight(wrapper, **kwargs)
         elif quant_type == QuantType.QUANT_OUTPUT:
             output = wrapper.quantizer.quantize_output(tensor, wrapper, **kwargs)
         else:

nni/experiment/config/base.py

@@ -87,7 +87,7 @@ class ConfigBase:
         """
         return dataclasses.asdict(
             self.canonical(),
-            dict_factory = lambda items: dict((util.camel_case(k), v) for k, v in items if v is not None)
+            dict_factory=lambda items: dict((util.camel_case(k), v) for k, v in items if v is not None)
         )
 
     def canonical(self: T) -> T:

nni/experiment/launcher.py

@@ -32,7 +32,7 @@ def start_experiment(config: ExperimentConfig, port: int, debug: bool) -> Tuple[
     exp_id = management.generate_experiment_id()
 
     try:
-        _logger.info(f'Creating experiment {colorama.Fore.CYAN}{exp_id}')
+        _logger.info('Creating experiment %s%s', colorama.Fore.CYAN, exp_id)
         pipe = Pipe(exp_id)
         proc = _start_rest_server(config, port, debug, exp_id, pipe.path)
         _logger.info('Connecting IPC pipe...')

nni/nas/pytorch/__init__.py

+from .base_mutator import BaseMutator
+from .base_trainer import BaseTrainer
+from .fixed import apply_fixed_architecture
+from .mutables import Mutable, LayerChoice, InputChoice
+from .mutator import Mutator
+from .trainer import Trainer

nni/tools/package_utils/__init__.py

@@ -43,8 +43,8 @@ def get_registered_algo_meta(builtin_name, algo_type=None):
     -------
         Returns meta information of speicified builtin alogorithms, for example:
         {
-            'classArgsValidator': 'nni.smac_tuner.smac_tuner.SMACClassArgsValidator',
-            'className': 'nni.smac_tuner.smac_tuner.SMACTuner',
+            'classArgsValidator': 'nni.smac_tuner.SMACClassArgsValidator',
+            'className': 'nni.smac_tuner.SMACTuner',
             'builtinName': 'SMAC'
         }
     """

test/ut/sdk/test_builtin_tuners.py

@@ -11,22 +11,21 @@ import sys
 from collections import deque
 from unittest import TestCase, main
 
-from nni.algorithms.hpo.batch_tuner.batch_tuner import BatchTuner
-from nni.algorithms.hpo.evolution_tuner.evolution_tuner import EvolutionTuner
-from nni.algorithms.hpo.gp_tuner.gp_tuner import GPTuner
-from nni.algorithms.hpo.gridsearch_tuner.gridsearch_tuner import GridSearchTuner
-from nni.algorithms.hpo.hyperopt_tuner.hyperopt_tuner import HyperoptTuner
-from nni.algorithms.hpo.metis_tuner.metis_tuner import MetisTuner
-from nni.algorithms.hpo.pbt_tuner.pbt_tuner import PBTTuner
-from nni.algorithms.hpo.regularized_evolution_tuner.regularized_evolution_tuner import RegularizedEvolutionTuner
+from nni.algorithms.hpo.batch_tuner import BatchTuner
+from nni.algorithms.hpo.evolution_tuner import EvolutionTuner
+from nni.algorithms.hpo.gp_tuner import GPTuner
+from nni.algorithms.hpo.gridsearch_tuner import GridSearchTuner
+from nni.algorithms.hpo.hyperopt_tuner import HyperoptTuner
+from nni.algorithms.hpo.metis_tuner import MetisTuner
+from nni.algorithms.hpo.pbt_tuner import PBTTuner
+from nni.algorithms.hpo.regularized_evolution_tuner import RegularizedEvolutionTuner
 from nni.runtime.msg_dispatcher import _pack_parameter, MsgDispatcher
 
 if sys.platform != 'win32':
-    from nni.algorithms.hpo.smac_tuner.smac_tuner import SMACTuner
+    from nni.algorithms.hpo.smac_tuner import SMACTuner
 
 from nni.tuner import Tuner
 
-
 logging.basicConfig(level=logging.INFO)
 logger = logging.getLogger('test_tuner')