Merge pull request #3030 from microsoft/v2.0

Merge v2.0 into master

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

@@ -7,7 +7,7 @@ import numpy as np
 import torch
 from torch import nn
 
-from nni.nas.pytorch.darts import DartsMutator
+from nni.algorithms.nas.pytorch.darts import DartsMutator
 from nni.nas.pytorch.mutables import LayerChoice
 
 

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

@@ -5,7 +5,7 @@ import json
 import logging
 
 from nni.nas.pytorch.callbacks import LRSchedulerCallback
-from nni.nas.pytorch.darts import DartsTrainer
+from nni.algorithms.nas.pytorch.darts import DartsTrainer
 from nni.nas.pytorch.trainer import BaseTrainer, TorchTensorEncoder
 
 from .mutator import PdartsMutator

src/sdk/pynni/nni/nas/pytorch/spos/evolution.py → nni/algorithms/nas/pytorch/spos/evolution.py

@@ -9,7 +9,7 @@ from collections import deque
 
 import numpy as np
 from nni.tuner import Tuner
-from nni.nas.pytorch.classic_nas.mutator import LAYER_CHOICE, INPUT_CHOICE
+from nni.algorithms.nas.pytorch.classic_nas.mutator import LAYER_CHOICE, INPUT_CHOICE
 
 
 _logger = logging.getLogger(__name__)

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

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

src/sdk/pynni/nni/assessor.py → nni/assessor.py

@@ -50,8 +50,8 @@ class Assessor(Recoverable):
     See Also
     --------
     Builtin assessors:
-    :class:`~nni.medianstop_assessor.MedianstopAssessor`
-    :class:`~nni.curvefitting_assessor.CurvefittingAssessor`
+    :class:`~nni.algorithms.hpo.medianstop_assessor.MedianstopAssessor`
+    :class:`~nni.algorithms.hpo.curvefitting_assessor.CurvefittingAssessor`
     """
 
     def assess_trial(self, trial_job_id, trial_history):

src/sdk/pynni/nni/nas_utils.py → nni/common/nas_utils.py

@@ -4,7 +4,7 @@
 import functools
 import logging
 
-from . import trial
+from .. import trial
 
 
 _logger = logging.getLogger(__name__)