Promote Retiarii to NAS (step 2) - update imports (#5025)

nni/retiarii/oneshot/pytorch/sampling.py

+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT license.
+
+# pylint: disable=wildcard-import,unused-wildcard-import
+
+from nni.nas.oneshot.pytorch.sampling import *

nni/retiarii/oneshot/pytorch/strategy.py

+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT license.
+
+# pylint: disable=wildcard-import,unused-wildcard-import
+
+from nni.nas.oneshot.pytorch.strategy import *

nni/retiarii/oneshot/pytorch/supermodule/_operation_utils.py

+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT license.
+
+# pylint: disable=wildcard-import,unused-wildcard-import
+
+from nni.nas.oneshot.pytorch.supermodule._operation_utils import *

nni/retiarii/oneshot/pytorch/supermodule/_singlepathnas.py

+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT license.
+
+# pylint: disable=wildcard-import,unused-wildcard-import
+
+from nni.nas.oneshot.pytorch.supermodule._singlepathnas import *

nni/retiarii/oneshot/pytorch/supermodule/_valuechoice_utils.py

+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT license.
+
+# pylint: disable=wildcard-import,unused-wildcard-import
+
+from nni.nas.oneshot.pytorch.supermodule._valuechoice_utils import *

nni/retiarii/oneshot/pytorch/supermodule/base.py

+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT license.
+
+# pylint: disable=wildcard-import,unused-wildcard-import
+
+from nni.nas.oneshot.pytorch.supermodule.base import *

nni/retiarii/oneshot/pytorch/supermodule/differentiable.py

+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT license.
+
+# pylint: disable=wildcard-import,unused-wildcard-import
+
+from nni.nas.oneshot.pytorch.supermodule.differentiable import *

nni/retiarii/oneshot/pytorch/supermodule/operation.py

+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT license.
+
+# pylint: disable=wildcard-import,unused-wildcard-import
+
+from nni.nas.oneshot.pytorch.supermodule.operation import *

nni/retiarii/oneshot/pytorch/supermodule/proxyless.py

+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT license.
+
+# pylint: disable=wildcard-import,unused-wildcard-import
+
+from nni.nas.oneshot.pytorch.supermodule.proxyless import *

nni/retiarii/oneshot/pytorch/supermodule/sampling.py

+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT license.
+
+# pylint: disable=wildcard-import,unused-wildcard-import
+
+from nni.nas.oneshot.pytorch.supermodule.sampling import *

nni/retiarii/oneshot/pytorch/utils.py

@@ -12,7 +12,6 @@ import torch
 from torch.utils.data import DataLoader, Dataset
 
 import nni.retiarii.nn.pytorch as nn
-from nni.nas.pytorch.mutables import InputChoice, LayerChoice
 
 _logger = logging.getLogger(__name__)
 
@@ -163,7 +162,7 @@ def replace_layer_choice(root_module, init_fn, modules=None):
     list[tuple[str, nn.Module]]
         A list from layer choice keys (names) and replaced modules.
     """
-    return _replace_module_with_type(root_module, init_fn, (LayerChoice, nn.LayerChoice), modules)
+    return _replace_module_with_type(root_module, init_fn, nn.LayerChoice, modules)
 
 
 def replace_input_choice(root_module, init_fn, modules=None):
@@ -184,7 +183,7 @@ def replace_input_choice(root_module, init_fn, modules=None):
     list[tuple[str, nn.Module]]
         A list from layer choice keys (names) and replaced modules.
     """
-    return _replace_module_with_type(root_module, init_fn, (InputChoice, nn.InputChoice), modules)
+    return _replace_module_with_type(root_module, init_fn, nn.InputChoice, modules)
 
 
 class InterleavedTrainValDataLoader(DataLoader):

nni/retiarii/operation.py

+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT license.
+
+# pylint: disable=wildcard-import,unused-wildcard-import
+
+from nni.nas.execution.common.graph_op import *

nni/retiarii/operation_def/tf_op_def.py

+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT license.
+
+# pylint: disable=wildcard-import,unused-wildcard-import
+
+from nni.nas.execution.tensorflow.op_def import *

nni/retiarii/operation_def/torch_op_def.py

+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT license.
+
+# pylint: disable=wildcard-import,unused-wildcard-import
+
+from nni.nas.execution.pytorch.op_def import *

nni/retiarii/serializer.py

+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT license.
+
+# pylint: disable=wildcard-import,unused-wildcard-import
+
+from nni.nas.utils.serializer import *

nni/retiarii/strategy/base.py

+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT license.
+
+# pylint: disable=wildcard-import,unused-wildcard-import
+
+from nni.nas.strategy.base import *

nni/retiarii/strategy/bruteforce.py

+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT license.
+
+# pylint: disable=wildcard-import,unused-wildcard-import
+
+from nni.nas.strategy.bruteforce import *

nni/retiarii/strategy/evolution.py

+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT license.
+
+# pylint: disable=wildcard-import,unused-wildcard-import
+
+from nni.nas.strategy.evolution import *

nni/retiarii/strategy/local_debug_strategy.py

+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT license.
+
+# pylint: disable=wildcard-import,unused-wildcard-import
+
+from nni.nas.strategy.debug import *

nni/retiarii/strategy/oneshot.py

+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT license.
+
+# pylint: disable=wildcard-import,unused-wildcard-import
+
+from nni.nas.strategy.oneshot import *