Merge pull request #3030 from microsoft/v2.0

Merge v2.0 into master

src/sdk/pynni/nni/regularized_evolution_tuner/regularized_evolution_tuner.py → nni/algorithms/hpo/regularized_evolution_tuner/regularized_evolution_tuner.py

@@ -3,8 +3,8 @@ import logging
 import random
 from collections import deque
 
-import nni
 from schema import Schema, Optional
+import nni
 from nni.tuner import Tuner
 from nni import ClassArgsValidator
 from nni.utils import OptimizeMode, extract_scalar_reward

src/sdk/pynni/nni/nas/pytorch/cdarts/trainer.py → nni/algorithms/nas/pytorch/cdarts/trainer.py

@@ -10,7 +10,7 @@ import torch.nn as nn
 import torch.nn.functional as F
 import apex  # pylint: disable=import-error
 from apex.parallel import DistributedDataParallel  # pylint: disable=import-error
-from nni.nas.pytorch.cdarts import RegularizedDartsMutator, RegularizedMutatorParallel, DartsDiscreteMutator  # pylint: disable=wrong-import-order
+from .mutator import RegularizedDartsMutator, RegularizedMutatorParallel, DartsDiscreteMutator  # pylint: disable=wrong-import-order
 from nni.nas.pytorch.utils import AverageMeterGroup  # pylint: disable=wrong-import-order
 
 from .utils import CyclicIterator, TorchTensorEncoder, accuracy, reduce_metrics

src/sdk/pynni/nni/nas/pytorch/classic_nas/mutator.py → nni/algorithms/nas/pytorch/classic_nas/mutator.py

@@ -9,7 +9,7 @@ import sys
 import torch
 
 import nni
-from nni.env_vars import trial_env_vars
+from nni.runtime.env_vars import trial_env_vars
 from nni.nas.pytorch.mutables import LayerChoice, InputChoice, MutableScope
 from nni.nas.pytorch.mutator import Mutator