From aff2399bf9d98210869f5a8dd4875e267e1b6d62 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E5=8D=97?= <wangnan39@huawei.com> Date: Mon, 26 Dec 2022 22:12:35 +0800 Subject: [PATCH] =?UTF-8?q?use=20standed=20=E2=80=9Dimport=E2=80=9C=20in?= =?UTF-8?q?=20cases?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- tests/st/auto_monad/test_auto_monad_mindtester.py | 2 +- tests/st/auto_parallel/cell_shard.py | 3 +-- .../auto_parallel/multifieldembeddinglookup_parallel.py | 4 ++-- tests/st/auto_parallel/optimizer_parallel.py | 4 ++-- tests/st/auto_parallel/parallel_strategy_search.py | 4 ++-- tests/st/auto_parallel/resnet50_expand_loss.py | 4 ++-- .../st/auto_parallel/soft_entropy_loss_expand_parallel.py | 3 +-- tests/st/broadcast/lenet_broadcast_auto_parallel.py | 5 ++--- tests/st/dataset/test_gpu_reset.py | 3 +-- tests/st/dump/test_dynamic_shape.py | 2 +- tests/st/dynamic_shape/test_dcn_dynamic_gpu.py | 3 +-- tests/st/dynamic_shape/test_dynamic_asr.py | 3 +-- tests/st/dynamic_shape/test_dynamic_transformer.py | 3 +-- tests/st/dynamic_shape/test_dynamic_wenet_ascend.py | 3 +-- .../st/dynamic_shape/yolov5_dynamic/run_yolov5_dynamic.py | 2 +- tests/st/export_and_load/test_ckpt.py | 2 +- tests/st/frontend_compile_cache/run_lenet_ps.py | 5 ++--- tests/st/map_parameter/network/src/model.py | 5 ++--- tests/st/mem_reuse/resnet_cifar_memreuse.py | 3 +-- tests/st/mem_reuse/resnet_cifar_normal.py | 3 +-- tests/st/mix_precision/test_mix_precision.py | 2 +- tests/st/model_zoo_tests/DeepFM/src/callback.py | 2 +- tests/st/model_zoo_tests/DeepFM/src/deepfm.py | 4 ++-- tests/st/model_zoo_tests/DeepFM/test_deepfm.py | 2 +- .../deeplabv3/train_one_epoch_with_loss.py | 3 +-- tests/st/model_zoo_tests/transformer/test_transformer.py | 3 +-- .../wide_and_deep/python_file_for_ci/callbacks.py | 2 +- .../python_file_for_ci/train_and_test_multinpu_ci.py | 2 +- .../train_and_test_multinpu_ci_data_parallel.py | 2 +- tests/st/model_zoo_tests/yolov3/test_yolov3.py | 3 +-- .../yolov3_darknet53/test_yolov3_darknet53.py | 2 +- .../st/networks/models/bert/bert_performance/src/utils.py | 3 +-- .../models/bert/bert_performance/test_bert_tdt_ge.py | 3 +-- .../bert/bert_performance/test_bert_tdt_lossscale.py | 4 ++-- .../models/bert/bert_performance/test_bert_thor.py | 5 ++--- .../models/bert/bert_precision/test_bert_tdt_lossscale.py | 3 +-- tests/st/networks/models/deeplabv3/src/miou_precision.py | 2 +- tests/st/networks/models/deeplabv3/test_deeplabv3.py | 2 +- tests/st/networks/models/resnet50/src/callback.py | 2 +- .../st/networks/models/resnet50/test_resnet50_imagenet.py | 4 ++-- tests/st/networks/models/resnet50/train_resnet50_thor.py | 2 +- tests/st/networks/test_gpu_lenet.py | 5 ++--- tests/st/ops/ascend/test_shape.py | 3 ++- tests/st/ops/ascend/test_tbe_ops/test_batchmatmul.py | 2 +- tests/st/ops/ascend/test_tbe_ops/test_fast_gelu.py | 2 +- tests/st/ops/ascend/test_tbe_ops/test_gelu.py | 2 +- tests/st/ops/ascend/test_tbe_ops/test_greater.py | 2 +- tests/st/ops/ascend/test_tbe_ops/test_layernorm.py | 2 +- tests/st/ops/ascend/test_tbe_ops/test_maximum.py | 2 +- tests/st/ops/ascend/test_tbe_ops/test_minimum.py | 2 +- tests/st/ops/ascend/test_tbe_ops/test_pow.py | 2 +- tests/st/ops/ascend/test_tbe_ops/test_select.py | 2 +- tests/st/ops/ascend/test_tbe_ops/test_stridedslice.py | 2 +- tests/st/ops/ascend/test_tbe_ops/test_tanh.py | 2 +- tests/st/ops/ascend/test_tbe_ops/test_tanh_grad.py | 2 +- tests/st/ops/ascend/test_tbe_ops/test_transpose_d.py | 2 +- tests/st/place/general_split/test_general_split_lenet.py | 5 ++--- tests/st/place/optimizer_split/test_optimizer_split.py | 4 ++-- tests/st/place/ref_split/test_ref_split.py | 2 +- .../simple_dynamic_shape/test_simple_dynamic_shape.py | 5 ++--- tests/st/probability/zhusuan/vae/vae_mnist.py | 3 +-- tests/st/profiler/run_net.py | 2 +- tests/st/profiler/test_profiler.py | 3 +-- tests/st/ps/embedding_cache/src/model.py | 5 ++--- tests/st/ps/full_ps/test_full_ps_lenet.py | 4 +--- .../test_pynative_layernorm_input_and_argmaxwithvalue.py | 2 +- tests/st/pynative/test_pynative_resnet50_ascend.py | 4 ++-- tests/st/summary/test_summary_collector.py | 5 ++--- tests/st/summary/test_summary_ops.py | 2 +- tests/st/tbe_networks/resnet_cifar.py | 4 ++-- tests/st/tbe_networks/test_resnet_cifar_1p.py | 4 ++-- tests/st/tbe_networks/test_resnet_cifar_8p.py | 3 +-- ...t_early_stopping_and_reduce_LR_on_plateau_callbacks.py | 4 ++-- tests/st/train/test_fit.py | 4 ++-- tests/st/train/test_on_request_exit_callback.py | 3 +-- .../gtest_input/pipeline/parse/parse_compile.py | 2 +- .../gtest_input/pipeline/parse/parser_integrate.py | 2 +- tests/ut/python/dataset/test_callbacks.py | 3 +-- tests/ut/python/metrics/test_accuracy.py | 2 +- tests/ut/python/metrics/test_auc.py | 2 +- tests/ut/python/metrics/test_bleu_score.py | 2 +- tests/ut/python/metrics/test_confusion_matrix.py | 2 +- tests/ut/python/metrics/test_confusion_matrix_metric.py | 2 +- tests/ut/python/metrics/test_cosine_similarity.py | 2 +- tests/ut/python/metrics/test_dice.py | 2 +- tests/ut/python/metrics/test_error.py | 2 +- tests/ut/python/metrics/test_fbeta.py | 2 +- tests/ut/python/metrics/test_hausdorff_distance.py | 2 +- tests/ut/python/metrics/test_loss.py | 2 +- tests/ut/python/metrics/test_mean_surface_distance.py | 2 +- tests/ut/python/metrics/test_metric_factory.py | 2 +- tests/ut/python/metrics/test_occlusion_sensitivity.py | 2 +- tests/ut/python/metrics/test_perplexity.py | 2 +- tests/ut/python/metrics/test_precision.py | 2 +- tests/ut/python/metrics/test_recall.py | 2 +- tests/ut/python/metrics/test_roc.py | 2 +- tests/ut/python/metrics/test_root_mean_square_distance.py | 2 +- tests/ut/python/metrics/test_topk.py | 2 +- .../test_auto_parallel_pangu_alpha_shard_propagation.py | 2 +- tests/ut/python/parallel/test_auto_parallel_resnet.py | 2 +- .../python/parallel/test_auto_parallel_resnet_predict.py | 2 +- .../test_auto_parallel_resnet_sharding_propagation.py | 2 +- .../test_auto_parallel_resnet_sharding_propagation2.py | 2 +- tests/ut/python/parallel/test_bias_add.py | 2 +- tests/ut/python/parallel/test_comm_fusion.py | 2 +- tests/ut/python/parallel/test_control_flow.py | 2 +- tests/ut/python/parallel/test_parallel_mirror_group.py | 4 ++-- tests/ut/python/parallel/test_parameter_merge.py | 2 +- tests/ut/python/parallel/test_pipeline_end_node.py | 2 +- tests/ut/python/parallel/test_pipeline_opt_detection.py | 2 +- tests/ut/python/parallel/test_pipeline_remove_node.py | 2 +- .../ut/python/parallel/test_pipeline_shared_parameter.py | 2 +- tests/ut/python/parallel/test_pipeline_split.py | 2 +- tests/ut/python/train/summary/test_image_summary.py | 4 ++-- tests/ut/python/train/summary/test_summary_collector.py | 3 +-- tests/ut/python/train/test_landscape.py | 5 ++--- tests/ut/python/train/test_run_config.py | 2 +- tests/ut/python/train/test_training.py | 8 ++++---- tests/ut/python/utils/test_callback.py | 5 +++-- tests/ut/python/utils/test_checkparam.py | 4 ++-- tests/ut/python/utils/test_initializer_fuzz.py | 2 +- tests/ut/python/utils/test_serialize.py | 3 ++- 122 files changed, 155 insertions(+), 185 deletions(-) diff --git a/tests/st/auto_monad/test_auto_monad_mindtester.py b/tests/st/auto_monad/test_auto_monad_mindtester.py index 61002e88d16..cf981c46c53 100644 --- a/tests/st/auto_monad/test_auto_monad_mindtester.py +++ b/tests/st/auto_monad/test_auto_monad_mindtester.py @@ -21,7 +21,7 @@ from mindspore.nn import Cell from mindspore import context, Tensor from mindspore.common.parameter import Parameter from mindspore.common.initializer import initializer -from mindspore.train.model import Model +from mindspore.train import Model from mindspore.ops.composite import GradOperation from mindspore.common import ParameterTuple from tests.security_utils import security_off_wrap diff --git a/tests/st/auto_parallel/cell_shard.py b/tests/st/auto_parallel/cell_shard.py index f8b2f0f8deb..1f17efc48d5 100644 --- a/tests/st/auto_parallel/cell_shard.py +++ b/tests/st/auto_parallel/cell_shard.py @@ -26,8 +26,7 @@ from mindspore.communication.management import init from mindspore.nn.loss.loss import LossBase from mindspore.nn.optim.momentum import Momentum from mindspore.ops import operations as P -from mindspore.train.callback import Callback -from mindspore.train.model import Model +from mindspore.train import Callback, Model from mindspore.context import ParallelMode import mindspore.dataset as ds diff --git a/tests/st/auto_parallel/multifieldembeddinglookup_parallel.py b/tests/st/auto_parallel/multifieldembeddinglookup_parallel.py index bee75c33d2c..f989f46f628 100644 --- a/tests/st/auto_parallel/multifieldembeddinglookup_parallel.py +++ b/tests/st/auto_parallel/multifieldembeddinglookup_parallel.py @@ -23,8 +23,8 @@ from mindspore.nn import MultiFieldEmbeddingLookup as embedding from mindspore import Tensor from mindspore import context from mindspore.train import Model -from mindspore.train.callback import CheckpointConfig -from mindspore.train.callback import ModelCheckpoint +from mindspore.train import CheckpointConfig +from mindspore.train import ModelCheckpoint from mindspore.train.serialization import load_checkpoint from mindspore.train.serialization import load_param_into_net from mindspore.communication.management import init diff --git a/tests/st/auto_parallel/optimizer_parallel.py b/tests/st/auto_parallel/optimizer_parallel.py index 561599b597b..ece0d47a41d 100644 --- a/tests/st/auto_parallel/optimizer_parallel.py +++ b/tests/st/auto_parallel/optimizer_parallel.py @@ -27,8 +27,8 @@ from mindspore.nn import Flatten from mindspore.nn import Momentum import mindspore.ops.operations as P from mindspore.train.serialization import load_param_into_net -from mindspore.train.callback import CheckpointConfig -from mindspore.train.callback import ModelCheckpoint +from mindspore.train import CheckpointConfig +from mindspore.train import ModelCheckpoint from mindspore.train.serialization import load_checkpoint from mindspore.nn import SoftmaxCrossEntropyWithLogits diff --git a/tests/st/auto_parallel/parallel_strategy_search.py b/tests/st/auto_parallel/parallel_strategy_search.py index b00b49c885c..ebd3c07a674 100644 --- a/tests/st/auto_parallel/parallel_strategy_search.py +++ b/tests/st/auto_parallel/parallel_strategy_search.py @@ -26,8 +26,8 @@ from mindspore.nn import Dense from mindspore.nn import Softmax import mindspore.ops.operations as P from mindspore.train.serialization import load_param_into_net -from mindspore.train.callback import CheckpointConfig -from mindspore.train.callback import ModelCheckpoint +from mindspore.train import CheckpointConfig +from mindspore.train import ModelCheckpoint from mindspore.train.serialization import load_checkpoint from mindspore.nn import Momentum from mindspore.nn import SoftmaxCrossEntropyWithLogits diff --git a/tests/st/auto_parallel/resnet50_expand_loss.py b/tests/st/auto_parallel/resnet50_expand_loss.py index 485c39d14d7..795d4b41839 100644 --- a/tests/st/auto_parallel/resnet50_expand_loss.py +++ b/tests/st/auto_parallel/resnet50_expand_loss.py @@ -27,8 +27,8 @@ from mindspore.nn.loss.loss import LossBase from mindspore.nn.optim.momentum import Momentum from mindspore.ops import operations as P from mindspore.parallel import set_algo_parameters -from mindspore.train.callback import Callback -from mindspore.train.model import Model +from mindspore.train import Callback +from mindspore.train import Model from mindspore.context import ParallelMode context.set_context(mode=context.GRAPH_MODE, device_target="Ascend") diff --git a/tests/st/auto_parallel/soft_entropy_loss_expand_parallel.py b/tests/st/auto_parallel/soft_entropy_loss_expand_parallel.py index 496106a07a7..c0b06102fe8 100644 --- a/tests/st/auto_parallel/soft_entropy_loss_expand_parallel.py +++ b/tests/st/auto_parallel/soft_entropy_loss_expand_parallel.py @@ -27,8 +27,7 @@ from mindspore.nn import Cell from mindspore.nn.optim.momentum import Momentum from mindspore.ops import functional as F from mindspore.ops import operations as P -from mindspore.train import Model -from mindspore.train.callback import Callback +from mindspore.train import Model, Callback np.set_printoptions(threshold=np.inf) device_num = 2 diff --git a/tests/st/broadcast/lenet_broadcast_auto_parallel.py b/tests/st/broadcast/lenet_broadcast_auto_parallel.py index 48faf7d8a55..cf46f3ee190 100644 --- a/tests/st/broadcast/lenet_broadcast_auto_parallel.py +++ b/tests/st/broadcast/lenet_broadcast_auto_parallel.py @@ -20,9 +20,8 @@ import numpy as np import mindspore.communication.management as distributedTool import mindspore.nn as nn from mindspore import context -from mindspore.train.metrics import Accuracy -from mindspore.train import Model -from mindspore.train.callback import LossMonitor, TimeMonitor +from mindspore.train import Accuracy +from mindspore.train import Model, LossMonitor, TimeMonitor from tests.models.official.cv.lenet.src.dataset import create_dataset from tests.models.official.cv.lenet.src.lenet import LeNet5 diff --git a/tests/st/dataset/test_gpu_reset.py b/tests/st/dataset/test_gpu_reset.py index 8424285c1cc..9226874f9a5 100644 --- a/tests/st/dataset/test_gpu_reset.py +++ b/tests/st/dataset/test_gpu_reset.py @@ -16,10 +16,9 @@ import pytest from mindspore.ops import operations as P import mindspore.nn as nn -from mindspore.train import Model +from mindspore.train import Model, Callback from mindspore.common import set_seed import mindspore.dataset as ds -from mindspore.train.callback import Callback from mindspore import log as logger set_seed(1) diff --git a/tests/st/dump/test_dynamic_shape.py b/tests/st/dump/test_dynamic_shape.py index 6663e8bcaef..93dbe9d9856 100644 --- a/tests/st/dump/test_dynamic_shape.py +++ b/tests/st/dump/test_dynamic_shape.py @@ -33,7 +33,7 @@ from mindspore.nn import Dense from mindspore.nn import SoftmaxCrossEntropyWithLogits from mindspore.nn import WithLossCell from mindspore import dataset as ds -from mindspore import Model +from mindspore.train import Model from dump_test_utils import generate_dump_json, generate_statistic_dump_json, check_dump_structure from tests.security_utils import security_off_wrap diff --git a/tests/st/dynamic_shape/test_dcn_dynamic_gpu.py b/tests/st/dynamic_shape/test_dcn_dynamic_gpu.py index 339e7c63638..848a2a85e60 100644 --- a/tests/st/dynamic_shape/test_dcn_dynamic_gpu.py +++ b/tests/st/dynamic_shape/test_dcn_dynamic_gpu.py @@ -19,8 +19,7 @@ import pytest from mindspore import ops, nn, Tensor, Parameter, ParameterTuple, context, set_seed from mindspore.common.initializer import initializer, XavierUniform import mindspore.dataset as ds -from mindspore.train.callback import Callback -from mindspore.train import Model +from mindspore.train import Callback, Model from mindspore.common import dtype as mstype import mindspore as ms diff --git a/tests/st/dynamic_shape/test_dynamic_asr.py b/tests/st/dynamic_shape/test_dynamic_asr.py index f0687fd2ee3..e938b96a4d7 100644 --- a/tests/st/dynamic_shape/test_dynamic_asr.py +++ b/tests/st/dynamic_shape/test_dynamic_asr.py @@ -35,8 +35,7 @@ from mindspore.nn.wrap.grad_reducer import DistributedGradReducer from mindspore.ops import composite as C, functional as F from mindspore.ops.functional import stop_gradient from mindspore.parallel._utils import _get_parallel_mode, _get_device_num, _get_gradients_mean -from mindspore.train import Model -from mindspore.train.callback._callback import Callback +from mindspore.train import Model, Callback logging.basicConfig(level=logging.DEBUG, format="%(asctime)s %(levelname)s %(message)s") diff --git a/tests/st/dynamic_shape/test_dynamic_transformer.py b/tests/st/dynamic_shape/test_dynamic_transformer.py index 3a552344d3d..69d2e44e6f4 100644 --- a/tests/st/dynamic_shape/test_dynamic_transformer.py +++ b/tests/st/dynamic_shape/test_dynamic_transformer.py @@ -21,9 +21,8 @@ import pytest import mindspore as ms from mindspore.common.tensor import Tensor from mindspore.nn.optim import Adam -from mindspore.train.model import Model from mindspore.train.loss_scale_manager import DynamicLossScaleManager -from mindspore.train.callback import Callback, TimeMonitor +from mindspore.train import Callback, TimeMonitor, Model from mindspore.common import set_seed import mindspore.dataset as de from transformer.transformer_for_train import TransformerNetworkWithLoss, TransformerTrainOneStepWithLossScaleCell diff --git a/tests/st/dynamic_shape/test_dynamic_wenet_ascend.py b/tests/st/dynamic_shape/test_dynamic_wenet_ascend.py index 8d09502825a..f3957e19e23 100644 --- a/tests/st/dynamic_shape/test_dynamic_wenet_ascend.py +++ b/tests/st/dynamic_shape/test_dynamic_wenet_ascend.py @@ -39,8 +39,7 @@ from mindspore.nn.wrap.loss_scale import DynamicLossScaleUpdateCell from mindspore.nn.wrap.grad_reducer import DistributedGradReducer from mindspore.nn.optim import Adam -from mindspore.train import Model -from mindspore.train.callback._callback import Callback +from mindspore.train import Model, Callback from mindspore import context, ParameterTuple, set_seed from mindspore.context import ParallelMode from mindspore.communication.management import get_group_size diff --git a/tests/st/dynamic_shape/yolov5_dynamic/run_yolov5_dynamic.py b/tests/st/dynamic_shape/yolov5_dynamic/run_yolov5_dynamic.py index 184b473eeb1..994cff366e6 100644 --- a/tests/st/dynamic_shape/yolov5_dynamic/run_yolov5_dynamic.py +++ b/tests/st/dynamic_shape/yolov5_dynamic/run_yolov5_dynamic.py @@ -18,7 +18,7 @@ import numpy as np from mindspore.train import Model from mindspore import Tensor import mindspore.dataset as ds -from mindspore.train.callback import LossMonitor +from mindspore.train import LossMonitor import mindspore as ms import mindspore.nn as nn import mindspore.communication as comm diff --git a/tests/st/export_and_load/test_ckpt.py b/tests/st/export_and_load/test_ckpt.py index 2e379c86556..e336b6838d3 100644 --- a/tests/st/export_and_load/test_ckpt.py +++ b/tests/st/export_and_load/test_ckpt.py @@ -22,7 +22,7 @@ import mindspore.dataset as ds import mindspore.dataset.transforms as C import mindspore.dataset.vision as CV import mindspore.nn as nn -from mindspore.train.callback import ModelCheckpoint, CheckpointConfig, Callback +from mindspore.train import ModelCheckpoint, CheckpointConfig, Callback from mindspore import load_checkpoint from mindspore.common import dtype as mstype from mindspore.dataset.vision import Inter diff --git a/tests/st/frontend_compile_cache/run_lenet_ps.py b/tests/st/frontend_compile_cache/run_lenet_ps.py index cfd1a64f25a..7fca85c361a 100644 --- a/tests/st/frontend_compile_cache/run_lenet_ps.py +++ b/tests/st/frontend_compile_cache/run_lenet_ps.py @@ -23,9 +23,8 @@ import mindspore.dataset.vision as CV import mindspore.nn as nn from mindspore.common import dtype as mstype from mindspore.dataset.vision import Inter -from mindspore.train.metrics import Accuracy -from mindspore.train import Model -from mindspore.train.callback import LossMonitor +from mindspore.train import Accuracy +from mindspore.train import Model, LossMonitor from mindspore.common.initializer import TruncatedNormal from mindspore.communication.management import init diff --git a/tests/st/map_parameter/network/src/model.py b/tests/st/map_parameter/network/src/model.py index d786fe5a26d..cdffbd78106 100644 --- a/tests/st/map_parameter/network/src/model.py +++ b/tests/st/map_parameter/network/src/model.py @@ -28,9 +28,8 @@ from mindspore.experimental import MapParameter from mindspore.nn import Cell, Flatten, Dense from mindspore.nn import SoftmaxCrossEntropyWithLogits from mindspore.nn import Adam -from mindspore.train import Model -from mindspore.train.callback import CheckpointConfig, ModelCheckpoint -from mindspore.train.metrics import Accuracy +from mindspore.train import Model, CheckpointConfig, ModelCheckpoint +from mindspore.train import Accuracy from mindspore.common import set_seed diff --git a/tests/st/mem_reuse/resnet_cifar_memreuse.py b/tests/st/mem_reuse/resnet_cifar_memreuse.py index 6529006a1c9..9865908ce15 100644 --- a/tests/st/mem_reuse/resnet_cifar_memreuse.py +++ b/tests/st/mem_reuse/resnet_cifar_memreuse.py @@ -29,8 +29,7 @@ from mindspore.communication.management import init from mindspore.nn.optim.momentum import Momentum from mindspore.ops import functional as F from mindspore.ops import operations as P -from mindspore.train.callback import ModelCheckpoint, CheckpointConfig, LossMonitor -from mindspore.train.model import Model +from mindspore.train import ModelCheckpoint, CheckpointConfig, LossMonitor, Model from mindspore.context import ParallelMode random.seed(1) diff --git a/tests/st/mem_reuse/resnet_cifar_normal.py b/tests/st/mem_reuse/resnet_cifar_normal.py index f537046c6c7..f8a3507cd01 100644 --- a/tests/st/mem_reuse/resnet_cifar_normal.py +++ b/tests/st/mem_reuse/resnet_cifar_normal.py @@ -29,8 +29,7 @@ from mindspore.communication.management import init from mindspore.nn.optim.momentum import Momentum from mindspore.ops import functional as F from mindspore.ops import operations as P -from mindspore.train.callback import ModelCheckpoint, CheckpointConfig, LossMonitor -from mindspore.train.model import Model +from mindspore.train import ModelCheckpoint, CheckpointConfig, LossMonitor, Model from mindspore.context import ParallelMode random.seed(1) diff --git a/tests/st/mix_precision/test_mix_precision.py b/tests/st/mix_precision/test_mix_precision.py index 1583e9345f1..ebe6f94a0c8 100644 --- a/tests/st/mix_precision/test_mix_precision.py +++ b/tests/st/mix_precision/test_mix_precision.py @@ -24,7 +24,7 @@ from mindspore import amp from mindspore import Tensor from mindspore import context from mindspore.train.loss_scale_manager import FixedLossScaleManager -from mindspore.train.model import Model +from mindspore.train import Model from utils import FakeData from utils import allclose_nparray from utils import FakeDataInitMode diff --git a/tests/st/model_zoo_tests/DeepFM/src/callback.py b/tests/st/model_zoo_tests/DeepFM/src/callback.py index 0f5844ae5eb..ed53e448776 100644 --- a/tests/st/model_zoo_tests/DeepFM/src/callback.py +++ b/tests/st/model_zoo_tests/DeepFM/src/callback.py @@ -16,7 +16,7 @@ Defined callback for DeepFM. """ import time -from mindspore.train.callback import Callback +from mindspore.train import Callback def add_write(file_path, out_str): diff --git a/tests/st/model_zoo_tests/DeepFM/src/deepfm.py b/tests/st/model_zoo_tests/DeepFM/src/deepfm.py index df824f2b4d0..db0e6d68272 100644 --- a/tests/st/model_zoo_tests/DeepFM/src/deepfm.py +++ b/tests/st/model_zoo_tests/DeepFM/src/deepfm.py @@ -22,10 +22,10 @@ from mindspore.ops import composite as C from mindspore.ops import operations as P from mindspore.nn import Dropout from mindspore.nn.optim import Adam -from mindspore.train.metrics import Metric +from mindspore.train import Metric from mindspore import nn, Tensor, ParameterTuple, Parameter from mindspore.common.initializer import Uniform, initializer -from mindspore.train.callback import ModelCheckpoint, CheckpointConfig +from mindspore.train import ModelCheckpoint, CheckpointConfig from mindspore.parallel._utils import _get_device_num, _get_parallel_mode, _get_gradients_mean from mindspore.context import ParallelMode from mindspore.nn.wrap.grad_reducer import DistributedGradReducer diff --git a/tests/st/model_zoo_tests/DeepFM/test_deepfm.py b/tests/st/model_zoo_tests/DeepFM/test_deepfm.py index 181166ef102..848c8c55140 100644 --- a/tests/st/model_zoo_tests/DeepFM/test_deepfm.py +++ b/tests/st/model_zoo_tests/DeepFM/test_deepfm.py @@ -17,7 +17,7 @@ import os import pytest from mindspore import context -from mindspore.train.model import Model +from mindspore.train import Model from mindspore.common import set_seed from src.deepfm import ModelBuilder, AUCMetric diff --git a/tests/st/model_zoo_tests/deeplabv3/train_one_epoch_with_loss.py b/tests/st/model_zoo_tests/deeplabv3/train_one_epoch_with_loss.py index 878ab37812b..d64d17de444 100644 --- a/tests/st/model_zoo_tests/deeplabv3/train_one_epoch_with_loss.py +++ b/tests/st/model_zoo_tests/deeplabv3/train_one_epoch_with_loss.py @@ -17,9 +17,8 @@ import argparse import time from mindspore import context from mindspore.nn.optim.momentum import Momentum -from mindspore import Model from mindspore.train.serialization import load_checkpoint, load_param_into_net -from mindspore.train.callback import Callback +from mindspore.train import Callback, Model from src.md_dataset import create_dataset from src.losses import OhemLoss from src.deeplabv3 import deeplabv3_resnet50 diff --git a/tests/st/model_zoo_tests/transformer/test_transformer.py b/tests/st/model_zoo_tests/transformer/test_transformer.py index 8845e7aca35..865bcc1c802 100644 --- a/tests/st/model_zoo_tests/transformer/test_transformer.py +++ b/tests/st/model_zoo_tests/transformer/test_transformer.py @@ -21,9 +21,8 @@ import numpy as np import mindspore.common.dtype as mstype from mindspore.common.tensor import Tensor from mindspore.nn.optim import Adam -from mindspore.train.model import Model +from mindspore.train import Model, Callback from mindspore.train.loss_scale_manager import DynamicLossScaleManager -from mindspore.train.callback import Callback import mindspore.dataset as ds import mindspore.dataset.transforms as deC from mindspore import context diff --git a/tests/st/model_zoo_tests/wide_and_deep/python_file_for_ci/callbacks.py b/tests/st/model_zoo_tests/wide_and_deep/python_file_for_ci/callbacks.py index 54f6de5c06f..09d2ae1c61f 100644 --- a/tests/st/model_zoo_tests/wide_and_deep/python_file_for_ci/callbacks.py +++ b/tests/st/model_zoo_tests/wide_and_deep/python_file_for_ci/callbacks.py @@ -15,7 +15,7 @@ callbacks """ import time -from mindspore.train.callback import Callback +from mindspore.train import Callback from mindspore import context from mindspore.context import ParallelMode from mindspore.communication.management import get_rank diff --git a/tests/st/model_zoo_tests/wide_and_deep/python_file_for_ci/train_and_test_multinpu_ci.py b/tests/st/model_zoo_tests/wide_and_deep/python_file_for_ci/train_and_test_multinpu_ci.py index 202475fc80c..acc87fd15c5 100644 --- a/tests/st/model_zoo_tests/wide_and_deep/python_file_for_ci/train_and_test_multinpu_ci.py +++ b/tests/st/model_zoo_tests/wide_and_deep/python_file_for_ci/train_and_test_multinpu_ci.py @@ -18,7 +18,7 @@ import os import sys from mindspore import Model, context -from mindspore.train.callback import TimeMonitor +from mindspore.train import TimeMonitor from mindspore.context import ParallelMode from mindspore.communication.management import get_rank, get_group_size, init from mindspore.nn.wrap.cell_wrapper import VirtualDatasetCellTriple diff --git a/tests/st/model_zoo_tests/wide_and_deep/train_and_test_multinpu_ci_data_parallel.py b/tests/st/model_zoo_tests/wide_and_deep/train_and_test_multinpu_ci_data_parallel.py index 09e1b5ea092..464dfb9e966 100644 --- a/tests/st/model_zoo_tests/wide_and_deep/train_and_test_multinpu_ci_data_parallel.py +++ b/tests/st/model_zoo_tests/wide_and_deep/train_and_test_multinpu_ci_data_parallel.py @@ -18,7 +18,7 @@ import os import sys import numpy as np from mindspore import Model, context -from mindspore.train.callback import ModelCheckpoint, CheckpointConfig, TimeMonitor +from mindspore.train import ModelCheckpoint, CheckpointConfig, TimeMonitor from mindspore.context import ParallelMode from mindspore.communication.management import get_rank, get_group_size, init diff --git a/tests/st/model_zoo_tests/yolov3/test_yolov3.py b/tests/st/model_zoo_tests/yolov3/test_yolov3.py index 64045a96842..66f7979c5ac 100644 --- a/tests/st/model_zoo_tests/yolov3/test_yolov3.py +++ b/tests/st/model_zoo_tests/yolov3/test_yolov3.py @@ -28,9 +28,8 @@ import pytest import numpy as np import mindspore.nn as nn from mindspore import context, Tensor -from mindspore.train import Model +from mindspore.train import Model, Callback from mindspore.common.initializer import initializer -from mindspore.train.callback import Callback from src.yolov3 import yolov3_resnet18, YoloWithLossCell, TrainingWrapper from src.dataset import create_yolo_dataset diff --git a/tests/st/model_zoo_tests/yolov3_darknet53/test_yolov3_darknet53.py b/tests/st/model_zoo_tests/yolov3_darknet53/test_yolov3_darknet53.py index 4a17de9b463..bd5d1ac8165 100644 --- a/tests/st/model_zoo_tests/yolov3_darknet53/test_yolov3_darknet53.py +++ b/tests/st/model_zoo_tests/yolov3_darknet53/test_yolov3_darknet53.py @@ -27,7 +27,7 @@ import numpy as np from mindspore import context, Tensor from mindspore.common.initializer import initializer -from mindspore.train.callback import Callback +from mindspore.train import Callback from mindspore.context import ParallelMode from mindspore.nn.optim.momentum import Momentum import mindspore as ms diff --git a/tests/st/networks/models/bert/bert_performance/src/utils.py b/tests/st/networks/models/bert/bert_performance/src/utils.py index d2b6c499aef..7a2617d524c 100644 --- a/tests/st/networks/models/bert/bert_performance/src/utils.py +++ b/tests/st/networks/models/bert/bert_performance/src/utils.py @@ -26,9 +26,8 @@ from mindspore import log as logger from mindspore.common import dtype as mstype from mindspore.common.tensor import Tensor from mindspore.nn.learning_rate_schedule import LearningRateSchedule, PolynomialDecayLR, WarmUpLR -from mindspore.train.metrics import Metric from mindspore.ops import operations as P -from mindspore.train.callback import Callback +from mindspore.train import Callback, Metric class CrossEntropyCalculation(nn.Cell): diff --git a/tests/st/networks/models/bert/bert_performance/test_bert_tdt_ge.py b/tests/st/networks/models/bert/bert_performance/test_bert_tdt_ge.py index f9b581065da..3cd7aa9296b 100644 --- a/tests/st/networks/models/bert/bert_performance/test_bert_tdt_ge.py +++ b/tests/st/networks/models/bert/bert_performance/test_bert_tdt_ge.py @@ -25,8 +25,7 @@ from mindspore import log as logger from mindspore.ops import operations as P from mindspore.common.tensor import Tensor from mindspore.nn.optim import Lamb -from mindspore.train.callback import Callback -from mindspore.train.model import Model +from mindspore.train import Callback, Model import mindspore.nn.learning_rate_schedule as lr_schedules from tests.models.official.nlp.bert.src.bert_for_pre_training import BertNetworkWithLoss from tests.models.official.nlp.bert.src.bert_for_pre_training import BertTrainOneStepCell diff --git a/tests/st/networks/models/bert/bert_performance/test_bert_tdt_lossscale.py b/tests/st/networks/models/bert/bert_performance/test_bert_tdt_lossscale.py index a0b9a406e8c..2efee342174 100644 --- a/tests/st/networks/models/bert/bert_performance/test_bert_tdt_lossscale.py +++ b/tests/st/networks/models/bert/bert_performance/test_bert_tdt_lossscale.py @@ -27,9 +27,9 @@ from mindspore import log as logger from mindspore.ops import operations as P from mindspore.common.tensor import Tensor from mindspore.nn.optim import Lamb -from mindspore.train.callback import Callback +from mindspore.train import Callback from mindspore.train.loss_scale_manager import DynamicLossScaleManager -from mindspore.train.model import Model +from mindspore.train import Model import mindspore.nn.learning_rate_schedule as lr_schedules from tests.models.official.nlp.bert.src.bert_for_pre_training import BertNetworkWithLoss from tests.models.official.nlp.bert.src.bert_for_pre_training import BertTrainOneStepWithLossScaleCell diff --git a/tests/st/networks/models/bert/bert_performance/test_bert_thor.py b/tests/st/networks/models/bert/bert_performance/test_bert_thor.py index 9c7c0d81b20..ef7ebf89ff5 100644 --- a/tests/st/networks/models/bert/bert_performance/test_bert_thor.py +++ b/tests/st/networks/models/bert/bert_performance/test_bert_thor.py @@ -25,12 +25,11 @@ import mindspore.common.dtype as mstype import mindspore.communication.management as D from mindspore import context from mindspore import log as logger -from mindspore.train.callback import Callback +from mindspore.train import Callback from mindspore.context import ParallelMode from mindspore.train.serialization import load_checkpoint, load_param_into_net from mindspore.nn.optim import thor -from mindspore.train.model import Model -from mindspore.train.train_thor import ConvertModelUtils +from mindspore.train import Model, ConvertModelUtils import mindspore.dataset.transforms as C from tests.st.networks.models.bert.bert_performance.src.bert_for_pre_training import BertNetworkWithLoss, \ diff --git a/tests/st/networks/models/bert/bert_precision/test_bert_tdt_lossscale.py b/tests/st/networks/models/bert/bert_precision/test_bert_tdt_lossscale.py index 5eabd94eb63..2aa1bceccee 100644 --- a/tests/st/networks/models/bert/bert_precision/test_bert_tdt_lossscale.py +++ b/tests/st/networks/models/bert/bert_precision/test_bert_tdt_lossscale.py @@ -27,9 +27,8 @@ from mindspore import log as logger from mindspore.ops import operations as P from mindspore.common.tensor import Tensor from mindspore.nn.optim import Lamb -from mindspore.train.callback import Callback from mindspore.train.loss_scale_manager import DynamicLossScaleManager -from mindspore.train.model import Model +from mindspore.train import Model, Callback import mindspore.nn.learning_rate_schedule as lr_schedules from tests.models.official.nlp.bert.src.bert_for_pre_training import BertNetworkWithLoss from tests.models.official.nlp.bert.src.bert_for_pre_training import BertTrainOneStepWithLossScaleCell diff --git a/tests/st/networks/models/deeplabv3/src/miou_precision.py b/tests/st/networks/models/deeplabv3/src/miou_precision.py index d00bcf29204..1304f36d6b6 100644 --- a/tests/st/networks/models/deeplabv3/src/miou_precision.py +++ b/tests/st/networks/models/deeplabv3/src/miou_precision.py @@ -14,7 +14,7 @@ # ============================================================================ """mIou.""" import numpy as np -from mindspore.train.metrics import Metric +from mindspore.train import Metric def confuse_matrix(target, pred, n): diff --git a/tests/st/networks/models/deeplabv3/test_deeplabv3.py b/tests/st/networks/models/deeplabv3/test_deeplabv3.py index da2f2b93f1a..086cba27600 100644 --- a/tests/st/networks/models/deeplabv3/test_deeplabv3.py +++ b/tests/st/networks/models/deeplabv3/test_deeplabv3.py @@ -20,7 +20,7 @@ import numpy as np from mindspore import context, Tensor from mindspore.nn.optim.momentum import Momentum from mindspore import Model -from mindspore.train.callback import Callback +from mindspore.train import Callback from src.md_dataset import create_dataset from src.losses import OhemLoss from src.deeplabv3 import deeplabv3_resnet50 diff --git a/tests/st/networks/models/resnet50/src/callback.py b/tests/st/networks/models/resnet50/src/callback.py index d8d74067de9..8c18ead9a1b 100644 --- a/tests/st/networks/models/resnet50/src/callback.py +++ b/tests/st/networks/models/resnet50/src/callback.py @@ -16,7 +16,7 @@ import time import numpy as np import mindspore as ms -from mindspore.train.callback import Callback +from mindspore.train import Callback class LossGet(Callback): diff --git a/tests/st/networks/models/resnet50/test_resnet50_imagenet.py b/tests/st/networks/models/resnet50/test_resnet50_imagenet.py index 25174424e0f..1111386f516 100644 --- a/tests/st/networks/models/resnet50/test_resnet50_imagenet.py +++ b/tests/st/networks/models/resnet50/test_resnet50_imagenet.py @@ -22,9 +22,9 @@ import numpy as np from mindspore import context from mindspore.common.tensor import Tensor import mindspore.communication.management as D -from mindspore.train.model import Model +from mindspore.train import Model from mindspore.context import ParallelMode -from mindspore.train.callback import Callback +from mindspore.train import Callback from mindspore.train.loss_scale_manager import FixedLossScaleManager import mindspore.nn as nn import mindspore.dataset as ds diff --git a/tests/st/networks/models/resnet50/train_resnet50_thor.py b/tests/st/networks/models/resnet50/train_resnet50_thor.py index 748f597c78f..6af5151c14c 100644 --- a/tests/st/networks/models/resnet50/train_resnet50_thor.py +++ b/tests/st/networks/models/resnet50/train_resnet50_thor.py @@ -17,7 +17,7 @@ import os import numpy as np import mindspore as ms from mindspore import nn -from mindspore.train.train_thor import ConvertModelUtils +from mindspore.train import ConvertModelUtils from tests.st.networks.models.resnet50.src.callback import LossGet from tests.st.networks.models.resnet50.src_thor.config import config as thor_config from tests.st.networks.models.resnet50.src_thor.dataset import create_dataset2 as create_dataset_thor diff --git a/tests/st/networks/test_gpu_lenet.py b/tests/st/networks/test_gpu_lenet.py index 77853035f2d..b7787267540 100644 --- a/tests/st/networks/test_gpu_lenet.py +++ b/tests/st/networks/test_gpu_lenet.py @@ -27,12 +27,11 @@ from mindspore import Tensor, ParameterTuple from mindspore.common import dtype as mstype from mindspore.dataset.vision import Inter from mindspore.nn import Dense, TrainOneStepCell, WithLossCell, ForwardValueAndGrad -from mindspore.train.metrics import Accuracy +from mindspore.train import Accuracy from mindspore.nn.optim import Momentum from mindspore.ops import operations as P from mindspore.ops import functional as F -from mindspore.train import Model -from mindspore.train.callback import LossMonitor +from mindspore.train import Model, LossMonitor from mindspore.common.initializer import TruncatedNormal context.set_context(mode=context.GRAPH_MODE, device_target="GPU") diff --git a/tests/st/ops/ascend/test_shape.py b/tests/st/ops/ascend/test_shape.py index 134cc4bb7d7..671d87c5977 100644 --- a/tests/st/ops/ascend/test_shape.py +++ b/tests/st/ops/ascend/test_shape.py @@ -18,7 +18,8 @@ import mindspore.context as context import mindspore.nn as nn import mindspore.dataset as ds from mindspore.ops import operations as P -from mindspore import Model, Tensor +from mindspore import Tensor +from mindspore.train import Model import mindspore as ms context.set_context(mode=context.GRAPH_MODE, diff --git a/tests/st/ops/ascend/test_tbe_ops/test_batchmatmul.py b/tests/st/ops/ascend/test_tbe_ops/test_batchmatmul.py index ba85da20ca5..871568649aa 100644 --- a/tests/st/ops/ascend/test_tbe_ops/test_batchmatmul.py +++ b/tests/st/ops/ascend/test_tbe_ops/test_batchmatmul.py @@ -18,7 +18,7 @@ from mindspore import context from mindspore.common.tensor import Tensor from mindspore.nn import Cell from mindspore.ops import operations as P -from mindspore.train.model import Model +from mindspore.train import Model context.set_context(mode=context.GRAPH_MODE, device_target="Ascend") diff --git a/tests/st/ops/ascend/test_tbe_ops/test_fast_gelu.py b/tests/st/ops/ascend/test_tbe_ops/test_fast_gelu.py index 21b2116b295..b214d508650 100644 --- a/tests/st/ops/ascend/test_tbe_ops/test_fast_gelu.py +++ b/tests/st/ops/ascend/test_tbe_ops/test_fast_gelu.py @@ -18,7 +18,7 @@ import pytest from mindspore import context from mindspore.common.tensor import Tensor from mindspore.nn import FastGelu -from mindspore.train.model import Model +from mindspore.train import Model context.set_context(mode=context.GRAPH_MODE, device_target="Ascend") diff --git a/tests/st/ops/ascend/test_tbe_ops/test_gelu.py b/tests/st/ops/ascend/test_tbe_ops/test_gelu.py index f44daaac1b5..db91154d4a1 100644 --- a/tests/st/ops/ascend/test_tbe_ops/test_gelu.py +++ b/tests/st/ops/ascend/test_tbe_ops/test_gelu.py @@ -19,7 +19,7 @@ from mindspore import context from mindspore import log as logger from mindspore.common.tensor import Tensor from mindspore.nn import GELU -from mindspore.train.model import Model +from mindspore.train import Model context.set_context(mode=context.GRAPH_MODE, device_target="Ascend") diff --git a/tests/st/ops/ascend/test_tbe_ops/test_greater.py b/tests/st/ops/ascend/test_tbe_ops/test_greater.py index 6d34cd59f69..06cdcd4ef8a 100644 --- a/tests/st/ops/ascend/test_tbe_ops/test_greater.py +++ b/tests/st/ops/ascend/test_tbe_ops/test_greater.py @@ -20,7 +20,7 @@ from mindspore import log as logger from mindspore.common.tensor import Tensor from mindspore.nn import Cell from mindspore.ops import operations as P -from mindspore.train.model import Model +from mindspore.train import Model context.set_context(mode=context.GRAPH_MODE, device_target="Ascend") diff --git a/tests/st/ops/ascend/test_tbe_ops/test_layernorm.py b/tests/st/ops/ascend/test_tbe_ops/test_layernorm.py index 6295d7ae533..a7789014a8c 100644 --- a/tests/st/ops/ascend/test_tbe_ops/test_layernorm.py +++ b/tests/st/ops/ascend/test_tbe_ops/test_layernorm.py @@ -20,7 +20,7 @@ from mindspore import log as logger from mindspore.common.tensor import Tensor from mindspore.nn import Cell from mindspore.nn import LayerNorm -from mindspore.train.model import Model +from mindspore.train import Model context.set_context(mode=context.GRAPH_MODE, device_target="Ascend") diff --git a/tests/st/ops/ascend/test_tbe_ops/test_maximum.py b/tests/st/ops/ascend/test_tbe_ops/test_maximum.py index 02b51305b2a..c05322e9acf 100644 --- a/tests/st/ops/ascend/test_tbe_ops/test_maximum.py +++ b/tests/st/ops/ascend/test_tbe_ops/test_maximum.py @@ -19,7 +19,7 @@ import mindspore.context as context import mindspore.nn as nn from mindspore import Tensor from mindspore.ops import operations as P -from mindspore.train.model import Model +from mindspore.train import Model context.set_context(device_target="Ascend") diff --git a/tests/st/ops/ascend/test_tbe_ops/test_minimum.py b/tests/st/ops/ascend/test_tbe_ops/test_minimum.py index e9ba1a2b092..fc97088f140 100644 --- a/tests/st/ops/ascend/test_tbe_ops/test_minimum.py +++ b/tests/st/ops/ascend/test_tbe_ops/test_minimum.py @@ -19,7 +19,7 @@ import mindspore.context as context import mindspore.nn as nn from mindspore import Tensor from mindspore.ops import operations as P -from mindspore.train.model import Model +from mindspore.train import Model context.set_context(mode=context.GRAPH_MODE, device_target="Ascend") diff --git a/tests/st/ops/ascend/test_tbe_ops/test_pow.py b/tests/st/ops/ascend/test_tbe_ops/test_pow.py index 370781fa021..d53548e5eef 100644 --- a/tests/st/ops/ascend/test_tbe_ops/test_pow.py +++ b/tests/st/ops/ascend/test_tbe_ops/test_pow.py @@ -19,7 +19,7 @@ import mindspore.context as context from mindspore import Tensor from mindspore.nn import Cell from mindspore.ops import operations as P -from mindspore.train.model import Model +from mindspore.train import Model context.set_context(mode=context.GRAPH_MODE, device_target="Ascend") diff --git a/tests/st/ops/ascend/test_tbe_ops/test_select.py b/tests/st/ops/ascend/test_tbe_ops/test_select.py index 3cae87cefde..9f5b5d31aaf 100644 --- a/tests/st/ops/ascend/test_tbe_ops/test_select.py +++ b/tests/st/ops/ascend/test_tbe_ops/test_select.py @@ -21,7 +21,7 @@ from mindspore import Tensor from mindspore.nn import Cell import mindspore.ops as ops from mindspore.ops import operations as P -from mindspore.train.model import Model +from mindspore.train import Model context.set_context(mode=context.GRAPH_MODE, device_target="Ascend") diff --git a/tests/st/ops/ascend/test_tbe_ops/test_stridedslice.py b/tests/st/ops/ascend/test_tbe_ops/test_stridedslice.py index 96a40c4d1ab..1a477845695 100644 --- a/tests/st/ops/ascend/test_tbe_ops/test_stridedslice.py +++ b/tests/st/ops/ascend/test_tbe_ops/test_stridedslice.py @@ -18,7 +18,7 @@ import mindspore.context as context import mindspore.ops.operations as P from mindspore.common.tensor import Tensor from mindspore.nn import Cell -from mindspore.train.model import Model +from mindspore.train import Model context.set_context(mode=context.GRAPH_MODE, device_target="Ascend") diff --git a/tests/st/ops/ascend/test_tbe_ops/test_tanh.py b/tests/st/ops/ascend/test_tbe_ops/test_tanh.py index 5af2d296001..ed2401e6fe1 100644 --- a/tests/st/ops/ascend/test_tbe_ops/test_tanh.py +++ b/tests/st/ops/ascend/test_tbe_ops/test_tanh.py @@ -18,7 +18,7 @@ import mindspore.context as context import mindspore.nn as nn from mindspore import Tensor from mindspore.ops import operations as P -from mindspore.train.model import Model +from mindspore.train import Model context.set_context(device_target="Ascend") diff --git a/tests/st/ops/ascend/test_tbe_ops/test_tanh_grad.py b/tests/st/ops/ascend/test_tbe_ops/test_tanh_grad.py index b9dd0080878..f3793a70cb7 100644 --- a/tests/st/ops/ascend/test_tbe_ops/test_tanh_grad.py +++ b/tests/st/ops/ascend/test_tbe_ops/test_tanh_grad.py @@ -18,7 +18,7 @@ import mindspore.context as context import mindspore.nn as nn from mindspore import Tensor from mindspore.ops.operations import _grad_ops as G -from mindspore.train.model import Model +from mindspore.train import Model context.set_context(device_target="Ascend") diff --git a/tests/st/ops/ascend/test_tbe_ops/test_transpose_d.py b/tests/st/ops/ascend/test_tbe_ops/test_transpose_d.py index 8f246fb07ce..cfae79c2d43 100644 --- a/tests/st/ops/ascend/test_tbe_ops/test_transpose_d.py +++ b/tests/st/ops/ascend/test_tbe_ops/test_transpose_d.py @@ -18,7 +18,7 @@ import mindspore.context as context import mindspore.nn as nn from mindspore import Tensor from mindspore.ops import operations as P -from mindspore.train.model import Model +from mindspore.train import Model context.set_context(device_target="Ascend") diff --git a/tests/st/place/general_split/test_general_split_lenet.py b/tests/st/place/general_split/test_general_split_lenet.py index 35e1b1fc74b..8b09488a155 100644 --- a/tests/st/place/general_split/test_general_split_lenet.py +++ b/tests/st/place/general_split/test_general_split_lenet.py @@ -15,9 +15,8 @@ import mindspore.context as context from mindspore import set_seed -from mindspore.train.metrics import Accuracy -from mindspore.train import Model -from mindspore.train.callback import LossMonitor, TimeMonitor +from mindspore.train import Accuracy +from mindspore.train import Model, LossMonitor, TimeMonitor from mindspore.communication.management import init from src.lenet import Net, get_optimizer, get_loss, get_dataset diff --git a/tests/st/place/optimizer_split/test_optimizer_split.py b/tests/st/place/optimizer_split/test_optimizer_split.py index dcb184964a9..698c1e1ee1c 100644 --- a/tests/st/place/optimizer_split/test_optimizer_split.py +++ b/tests/st/place/optimizer_split/test_optimizer_split.py @@ -15,9 +15,9 @@ import mindspore.context as context from mindspore import set_seed -from mindspore.train.metrics import Accuracy +from mindspore.train import Accuracy from mindspore.train import Model -from mindspore.train.callback import LossMonitor, TimeMonitor +from mindspore.train import LossMonitor, TimeMonitor from mindspore.communication.management import init, get_rank from src.net import SplitRefWithoutOptimNet, SplitOptimNet, get_optimizer, get_loss, get_dataset diff --git a/tests/st/place/ref_split/test_ref_split.py b/tests/st/place/ref_split/test_ref_split.py index a58c5cae8bd..4f1b0cf9495 100644 --- a/tests/st/place/ref_split/test_ref_split.py +++ b/tests/st/place/ref_split/test_ref_split.py @@ -15,7 +15,7 @@ import mindspore.context as context from mindspore import set_seed -from mindspore.train.metrics import Accuracy +from mindspore.train import Accuracy from mindspore.train import Model from mindspore.communication.management import init, get_rank diff --git a/tests/st/place/simple_dynamic_shape/test_simple_dynamic_shape.py b/tests/st/place/simple_dynamic_shape/test_simple_dynamic_shape.py index 75f6cba8f2a..5cc6cb82d35 100644 --- a/tests/st/place/simple_dynamic_shape/test_simple_dynamic_shape.py +++ b/tests/st/place/simple_dynamic_shape/test_simple_dynamic_shape.py @@ -15,9 +15,8 @@ import mindspore.context as context from mindspore import set_seed -from mindspore.train.metrics import Accuracy -from mindspore.train import Model -from mindspore.train.callback import TimeMonitor +from mindspore.train import Accuracy +from mindspore.train import Model, TimeMonitor from mindspore.communication.management import init from src.dynamic_embedding import Net, get_optimizer, get_loss, get_dataset diff --git a/tests/st/probability/zhusuan/vae/vae_mnist.py b/tests/st/probability/zhusuan/vae/vae_mnist.py index 6e1aadac0d7..3808e6fe6bc 100644 --- a/tests/st/probability/zhusuan/vae/vae_mnist.py +++ b/tests/st/probability/zhusuan/vae/vae_mnist.py @@ -23,8 +23,7 @@ import mindspore.nn as nn from mindspore import context from mindspore import Tensor -from mindspore.train import Model -from mindspore.train.callback import LossMonitor +from mindspore.train import Model, LossMonitor from mindspore.ops import operations as P from mindspore.common import dtype as mstype diff --git a/tests/st/profiler/run_net.py b/tests/st/profiler/run_net.py index 7321e229446..90589481bf7 100644 --- a/tests/st/profiler/run_net.py +++ b/tests/st/profiler/run_net.py @@ -17,7 +17,7 @@ from argparse import ArgumentParser from mindspore import dataset as ds from mindspore import nn, Tensor, context -from mindspore.train.metrics import Accuracy +from mindspore.train import Accuracy from mindspore.nn.optim import Momentum from mindspore.dataset.transforms import transforms as C from mindspore.dataset.vision import transforms as CV diff --git a/tests/st/profiler/test_profiler.py b/tests/st/profiler/test_profiler.py index 52bcdc730b2..3803f55476a 100644 --- a/tests/st/profiler/test_profiler.py +++ b/tests/st/profiler/test_profiler.py @@ -22,14 +22,13 @@ import pytest from mindspore import dataset as ds from mindspore import nn, Tensor, context -from mindspore.train.metrics import Accuracy from mindspore.nn.optim import Momentum from mindspore.dataset.transforms import transforms as C from mindspore.dataset.vision import transforms as CV from mindspore.dataset.vision import Inter from mindspore.common import dtype as mstype from mindspore.common.initializer import TruncatedNormal -from mindspore.train import Model +from mindspore.train import Model, Accuracy from mindspore import Profiler diff --git a/tests/st/ps/embedding_cache/src/model.py b/tests/st/ps/embedding_cache/src/model.py index e8755310f96..4675730b947 100644 --- a/tests/st/ps/embedding_cache/src/model.py +++ b/tests/st/ps/embedding_cache/src/model.py @@ -20,9 +20,8 @@ import mindspore from mindspore.nn import Cell, Flatten, Dense from mindspore.nn import EmbeddingLookup, SoftmaxCrossEntropyWithLogits from mindspore.nn import Adam -from mindspore.train import Model -from mindspore.train.callback import CheckpointConfig, ModelCheckpoint -from mindspore.train.metrics import Accuracy +from mindspore.train import Model, CheckpointConfig, ModelCheckpoint +from mindspore.train import Accuracy from mindspore.common import set_seed from mindspore.communication.management import get_rank import mindspore.ops.operations as op diff --git a/tests/st/ps/full_ps/test_full_ps_lenet.py b/tests/st/ps/full_ps/test_full_ps_lenet.py index 766c1f3b36c..56abdb5dda6 100644 --- a/tests/st/ps/full_ps/test_full_ps_lenet.py +++ b/tests/st/ps/full_ps/test_full_ps_lenet.py @@ -23,9 +23,7 @@ import mindspore.dataset.vision as CV import mindspore.nn as nn from mindspore.common import dtype as mstype from mindspore.dataset.vision import Inter -from mindspore.train.metrics import Accuracy -from mindspore.train import Model -from mindspore.train.callback import LossMonitor +from mindspore.train import Model, LossMonitor, Accuracy from mindspore.common.initializer import TruncatedNormal from mindspore.communication.management import init diff --git a/tests/st/pynative/test_pynative_layernorm_input_and_argmaxwithvalue.py b/tests/st/pynative/test_pynative_layernorm_input_and_argmaxwithvalue.py index a412dbe9463..662bd42274c 100644 --- a/tests/st/pynative/test_pynative_layernorm_input_and_argmaxwithvalue.py +++ b/tests/st/pynative/test_pynative_layernorm_input_and_argmaxwithvalue.py @@ -21,7 +21,7 @@ from mindspore import Tensor, context from mindspore.nn import LayerNorm, Cell from mindspore.common import ParameterTuple from mindspore.ops.composite import GradOperation -from mindspore.train.model import Model +from mindspore.train import Model class _Grad(Cell): def __init__(self, grad, network, wrt_params=False, real_inputs_count=None): diff --git a/tests/st/pynative/test_pynative_resnet50_ascend.py b/tests/st/pynative/test_pynative_resnet50_ascend.py index 161a3e28bd5..335b29aacf0 100644 --- a/tests/st/pynative/test_pynative_resnet50_ascend.py +++ b/tests/st/pynative/test_pynative_resnet50_ascend.py @@ -35,10 +35,10 @@ from mindspore.nn import Cell from mindspore.ops import operations as P from mindspore.ops import composite as CP from mindspore.nn.optim.momentum import Momentum -from mindspore.train.callback import Callback +from mindspore.train import Callback from mindspore.nn.loss import SoftmaxCrossEntropyWithLogits from mindspore.train.loss_scale_manager import FixedLossScaleManager -from mindspore.train.model import Model +from mindspore.train import Model from mindspore.context import ParallelMode import mindspore.communication.management as D MINDSPORE_HCCL_CONFIG_PATH = "/home/workspace/mindspore_config/hccl/rank_table_8p.json" diff --git a/tests/st/summary/test_summary_collector.py b/tests/st/summary/test_summary_collector.py index 4777beb3f96..08636199353 100644 --- a/tests/st/summary/test_summary_collector.py +++ b/tests/st/summary/test_summary_collector.py @@ -25,12 +25,11 @@ import pytest from mindspore.common import set_seed from mindspore import nn, Tensor, context from mindspore.common.initializer import Normal -from mindspore.train.metrics import Loss +from mindspore.train import Loss from mindspore.nn.optim import Momentum from mindspore.ops import operations as P from mindspore.train import Model -from mindspore.train.callback import SummaryCollector, SummaryLandscape -from mindspore.train.summary.summary_record import SummaryRecord +from mindspore import SummaryCollector, SummaryLandscape, SummaryRecord from tests.st.summary.dataset import create_mnist_dataset from tests.summary_utils import SummaryReader from tests.security_utils import security_off_wrap diff --git a/tests/st/summary/test_summary_ops.py b/tests/st/summary/test_summary_ops.py index faef510461c..241444fece4 100644 --- a/tests/st/summary/test_summary_ops.py +++ b/tests/st/summary/test_summary_ops.py @@ -22,7 +22,7 @@ import pytest from mindspore import nn, Tensor, context from mindspore.common.initializer import Normal -from mindspore.train.metrics import Loss +from mindspore.train import Loss from mindspore.nn.optim import Momentum from mindspore.ops import operations as P from mindspore.train import Model diff --git a/tests/st/tbe_networks/resnet_cifar.py b/tests/st/tbe_networks/resnet_cifar.py index fd52dc61d74..5f9c8e94cd2 100644 --- a/tests/st/tbe_networks/resnet_cifar.py +++ b/tests/st/tbe_networks/resnet_cifar.py @@ -20,7 +20,7 @@ from resnet import resnet50 import mindspore.common.dtype as mstype import mindspore.ops.functional as F -from mindspore.train.callback import ModelCheckpoint, CheckpointConfig, LossMonitor, TimeMonitor +from mindspore.train import ModelCheckpoint, CheckpointConfig, LossMonitor, TimeMonitor from mindspore.train.serialization import load_checkpoint, load_param_into_net import mindspore.dataset as ds import mindspore.dataset.transforms as C @@ -31,7 +31,7 @@ from mindspore import context from mindspore.communication.management import init from mindspore.nn.optim.momentum import Momentum from mindspore.ops import operations as P -from mindspore.train.model import Model +from mindspore.train import Model from mindspore.context import ParallelMode random.seed(1) diff --git a/tests/st/tbe_networks/test_resnet_cifar_1p.py b/tests/st/tbe_networks/test_resnet_cifar_1p.py index 916a20eb208..ea0d41628fc 100644 --- a/tests/st/tbe_networks/test_resnet_cifar_1p.py +++ b/tests/st/tbe_networks/test_resnet_cifar_1p.py @@ -28,8 +28,8 @@ from mindspore import Tensor from mindspore import context from mindspore.nn.optim.momentum import Momentum from mindspore.ops import operations as P -from mindspore.train.callback import Callback -from mindspore.train.model import Model +from mindspore.train import Callback +from mindspore.train import Model random.seed(1) np.random.seed(1) diff --git a/tests/st/tbe_networks/test_resnet_cifar_8p.py b/tests/st/tbe_networks/test_resnet_cifar_8p.py index 5da14488fb3..43ec8b34366 100644 --- a/tests/st/tbe_networks/test_resnet_cifar_8p.py +++ b/tests/st/tbe_networks/test_resnet_cifar_8p.py @@ -30,8 +30,7 @@ from mindspore import context from mindspore.communication.management import init from mindspore.nn.optim.momentum import Momentum from mindspore.ops import operations as P -from mindspore.train.callback import Callback -from mindspore.train.model import Model +from mindspore.train import Callback, Model from mindspore.context import ParallelMode random.seed(1) diff --git a/tests/st/train/test_early_stopping_and_reduce_LR_on_plateau_callbacks.py b/tests/st/train/test_early_stopping_and_reduce_LR_on_plateau_callbacks.py index c9e2764b030..ebac61df5b8 100644 --- a/tests/st/train/test_early_stopping_and_reduce_LR_on_plateau_callbacks.py +++ b/tests/st/train/test_early_stopping_and_reduce_LR_on_plateau_callbacks.py @@ -23,8 +23,8 @@ from mindspore import nn, Model from mindspore import dataset as ds from mindspore.nn.optim import Momentum from mindspore.common.initializer import Normal -from mindspore.train.callback import RunContext, _InternalCallbackParam, \ - _CallbackManager, ReduceLROnPlateau, EarlyStopping +from mindspore.train import RunContext, ReduceLROnPlateau, EarlyStopping +from mindspore.train.callback import _InternalCallbackParam, _CallbackManager def get_data(num, w=4.0, b=5.0): diff --git a/tests/st/train/test_fit.py b/tests/st/train/test_fit.py index 6df9387e15c..2a5c01301f1 100644 --- a/tests/st/train/test_fit.py +++ b/tests/st/train/test_fit.py @@ -17,9 +17,9 @@ import pytest import numpy as np -from mindspore import Model, nn, Tensor +from mindspore import nn, Tensor from mindspore.common.initializer import Normal -from mindspore.train.callback import Callback, TimeMonitor, LossMonitor +from mindspore.train import Callback, TimeMonitor, LossMonitor, Model from mindspore import dataset as ds diff --git a/tests/st/train/test_on_request_exit_callback.py b/tests/st/train/test_on_request_exit_callback.py index 33ee78ae231..a4eb4ce9f90 100644 --- a/tests/st/train/test_on_request_exit_callback.py +++ b/tests/st/train/test_on_request_exit_callback.py @@ -23,11 +23,10 @@ from multiprocessing import Process import numpy as np import pytest -from mindspore import Model from mindspore import nn, context from mindspore import dataset as ds from mindspore.common.initializer import TruncatedNormal -from mindspore.train.callback import Callback, OnRequestExit, LossMonitor +from mindspore.train import Callback, OnRequestExit, LossMonitor, Model def conv(in_channels, out_channels, kernel_size, stride=1, padding=0): diff --git a/tests/ut/cpp/python_input/gtest_input/pipeline/parse/parse_compile.py b/tests/ut/cpp/python_input/gtest_input/pipeline/parse/parse_compile.py index 3c3c769e797..66a6e0d415f 100644 --- a/tests/ut/cpp/python_input/gtest_input/pipeline/parse/parse_compile.py +++ b/tests/ut/cpp/python_input/gtest_input/pipeline/parse/parse_compile.py @@ -24,7 +24,7 @@ import numpy as np import mindspore.nn as nn from mindspore.common.tensor import Tensor from mindspore.nn.optim import Momentum -from mindspore.train.model import Model +from mindspore.train import Model log = logging.getLogger("test") log.setLevel(level=logging.ERROR) diff --git a/tests/ut/cpp/python_input/gtest_input/pipeline/parse/parser_integrate.py b/tests/ut/cpp/python_input/gtest_input/pipeline/parse/parser_integrate.py index 07437108351..9c289811de5 100644 --- a/tests/ut/cpp/python_input/gtest_input/pipeline/parse/parser_integrate.py +++ b/tests/ut/cpp/python_input/gtest_input/pipeline/parse/parser_integrate.py @@ -23,7 +23,7 @@ from mindspore.common.api import jit, _cell_graph_executor from mindspore.common.parameter import Parameter from mindspore.common.tensor import Tensor from mindspore.ops import functional as F -from mindspore.train.model import Model +from mindspore.train import Model from tests.ut.python.model.resnet import resnet50 diff --git a/tests/ut/python/dataset/test_callbacks.py b/tests/ut/python/dataset/test_callbacks.py index 945cd4d356b..f613754e6d2 100644 --- a/tests/ut/python/dataset/test_callbacks.py +++ b/tests/ut/python/dataset/test_callbacks.py @@ -20,8 +20,7 @@ import pytest from mindspore import context from mindspore import log as logger from mindspore.dataset.callback import DSCallback, WaitedDSCallback -from mindspore.train import Model -from mindspore.train.callback import Callback +from mindspore.train import Model, Callback import mindspore.dataset as ds import mindspore.nn as nn diff --git a/tests/ut/python/metrics/test_accuracy.py b/tests/ut/python/metrics/test_accuracy.py index 5d5b6636cba..b54bf808e65 100644 --- a/tests/ut/python/metrics/test_accuracy.py +++ b/tests/ut/python/metrics/test_accuracy.py @@ -18,7 +18,7 @@ import numpy as np import pytest from mindspore import Tensor -from mindspore.train.metrics import Accuracy +from mindspore.train import Accuracy def test_classification_accuracy(): diff --git a/tests/ut/python/metrics/test_auc.py b/tests/ut/python/metrics/test_auc.py index 98ad71d78ff..9e07d6dacab 100644 --- a/tests/ut/python/metrics/test_auc.py +++ b/tests/ut/python/metrics/test_auc.py @@ -17,7 +17,7 @@ import math import numpy as np from mindspore import Tensor -from mindspore.train.metrics import ROC, auc +from mindspore.train import ROC, auc def test_auc(): diff --git a/tests/ut/python/metrics/test_bleu_score.py b/tests/ut/python/metrics/test_bleu_score.py index 54aee4dddb0..e37c456f823 100644 --- a/tests/ut/python/metrics/test_bleu_score.py +++ b/tests/ut/python/metrics/test_bleu_score.py @@ -15,7 +15,7 @@ """test_bleu_score""" import math import pytest -from mindspore.train.metrics import BleuScore +from mindspore.train import BleuScore def test_bleu_score(): diff --git a/tests/ut/python/metrics/test_confusion_matrix.py b/tests/ut/python/metrics/test_confusion_matrix.py index 6bfe810912b..292774e452b 100644 --- a/tests/ut/python/metrics/test_confusion_matrix.py +++ b/tests/ut/python/metrics/test_confusion_matrix.py @@ -16,7 +16,7 @@ import numpy as np import pytest from mindspore import Tensor -from mindspore.train.metrics import ConfusionMatrix +from mindspore.train import ConfusionMatrix def test_confusion_matrix(): diff --git a/tests/ut/python/metrics/test_confusion_matrix_metric.py b/tests/ut/python/metrics/test_confusion_matrix_metric.py index 6875b659d83..e737501b790 100644 --- a/tests/ut/python/metrics/test_confusion_matrix_metric.py +++ b/tests/ut/python/metrics/test_confusion_matrix_metric.py @@ -16,7 +16,7 @@ import numpy as np import pytest from mindspore import Tensor -from mindspore.train.metrics import ConfusionMatrixMetric +from mindspore.train import ConfusionMatrixMetric def test_confusion_matrix_metric(): diff --git a/tests/ut/python/metrics/test_cosine_similarity.py b/tests/ut/python/metrics/test_cosine_similarity.py index 5cb9780c7f6..4be62f42dd3 100644 --- a/tests/ut/python/metrics/test_cosine_similarity.py +++ b/tests/ut/python/metrics/test_cosine_similarity.py @@ -16,7 +16,7 @@ import pytest import numpy as np from sklearn.metrics import pairwise -from mindspore.train.metrics import CosineSimilarity +from mindspore.train import CosineSimilarity def test_cosine_similarity(): diff --git a/tests/ut/python/metrics/test_dice.py b/tests/ut/python/metrics/test_dice.py index cc74e55b125..79b71fef392 100644 --- a/tests/ut/python/metrics/test_dice.py +++ b/tests/ut/python/metrics/test_dice.py @@ -17,7 +17,7 @@ import math import numpy as np import pytest from mindspore import Tensor -from mindspore.train.metrics import get_metric_fn, Dice +from mindspore.train import get_metric_fn, Dice def test_classification_dice(): diff --git a/tests/ut/python/metrics/test_error.py b/tests/ut/python/metrics/test_error.py index afef5142de7..9068be58bab 100644 --- a/tests/ut/python/metrics/test_error.py +++ b/tests/ut/python/metrics/test_error.py @@ -18,7 +18,7 @@ import numpy as np import pytest from mindspore import Tensor -from mindspore.train.metrics import MAE, MSE +from mindspore.train import MAE, MSE def test_MAE(): diff --git a/tests/ut/python/metrics/test_fbeta.py b/tests/ut/python/metrics/test_fbeta.py index 424957adc36..8b6899d1513 100755 --- a/tests/ut/python/metrics/test_fbeta.py +++ b/tests/ut/python/metrics/test_fbeta.py @@ -17,7 +17,7 @@ import numpy as np import pytest from mindspore import Tensor -from mindspore.train.metrics import get_metric_fn, Fbeta +from mindspore.train import get_metric_fn, Fbeta def test_classification_fbeta(): diff --git a/tests/ut/python/metrics/test_hausdorff_distance.py b/tests/ut/python/metrics/test_hausdorff_distance.py index e692be631e0..32a72e7948d 100644 --- a/tests/ut/python/metrics/test_hausdorff_distance.py +++ b/tests/ut/python/metrics/test_hausdorff_distance.py @@ -18,7 +18,7 @@ import math import numpy as np import pytest from mindspore import Tensor -from mindspore.train.metrics import get_metric_fn, HausdorffDistance +from mindspore.train import get_metric_fn, HausdorffDistance def test_hausdorff_distance(): diff --git a/tests/ut/python/metrics/test_loss.py b/tests/ut/python/metrics/test_loss.py index af2403eaec8..4beb6d0a657 100644 --- a/tests/ut/python/metrics/test_loss.py +++ b/tests/ut/python/metrics/test_loss.py @@ -17,7 +17,7 @@ import numpy as np import pytest from mindspore import Tensor -from mindspore.train.metrics import Loss +from mindspore.train import Loss def test_loss_inputs_error(): diff --git a/tests/ut/python/metrics/test_mean_surface_distance.py b/tests/ut/python/metrics/test_mean_surface_distance.py index 2fb634f21c3..69603011ff9 100644 --- a/tests/ut/python/metrics/test_mean_surface_distance.py +++ b/tests/ut/python/metrics/test_mean_surface_distance.py @@ -18,7 +18,7 @@ import math import numpy as np import pytest from mindspore import Tensor -from mindspore.train.metrics import get_metric_fn, MeanSurfaceDistance +from mindspore.train import get_metric_fn, MeanSurfaceDistance def test_mean_surface_distance(): diff --git a/tests/ut/python/metrics/test_metric_factory.py b/tests/ut/python/metrics/test_metric_factory.py index d6a20df3a9b..b19410641d9 100644 --- a/tests/ut/python/metrics/test_metric_factory.py +++ b/tests/ut/python/metrics/test_metric_factory.py @@ -17,7 +17,7 @@ import math import numpy as np from mindspore import Tensor -from mindspore.train.metrics import get_metric_fn, rearrange_inputs +from mindspore.train import get_metric_fn, rearrange_inputs def test_classification_accuracy(): diff --git a/tests/ut/python/metrics/test_occlusion_sensitivity.py b/tests/ut/python/metrics/test_occlusion_sensitivity.py index 14067a21084..2a94276bcbf 100644 --- a/tests/ut/python/metrics/test_occlusion_sensitivity.py +++ b/tests/ut/python/metrics/test_occlusion_sensitivity.py @@ -17,7 +17,7 @@ import pytest import numpy as np from mindspore import nn, context from mindspore.common.tensor import Tensor -from mindspore.train.metrics import OcclusionSensitivity +from mindspore.train import OcclusionSensitivity context.set_context(mode=context.GRAPH_MODE) class DenseNet(nn.Cell): diff --git a/tests/ut/python/metrics/test_perplexity.py b/tests/ut/python/metrics/test_perplexity.py index 7ee008bb492..9fff50eea3a 100644 --- a/tests/ut/python/metrics/test_perplexity.py +++ b/tests/ut/python/metrics/test_perplexity.py @@ -18,7 +18,7 @@ import math import numpy as np import pytest from mindspore import Tensor -from mindspore.train.metrics import get_metric_fn, Perplexity +from mindspore.train import get_metric_fn, Perplexity def test_perplexity(): diff --git a/tests/ut/python/metrics/test_precision.py b/tests/ut/python/metrics/test_precision.py index cc8ddfd6b4e..3de3bc09d84 100644 --- a/tests/ut/python/metrics/test_precision.py +++ b/tests/ut/python/metrics/test_precision.py @@ -18,7 +18,7 @@ import numpy as np import pytest from mindspore import Tensor -from mindspore.train.metrics import Precision +from mindspore.train import Precision def test_classification_precision(): diff --git a/tests/ut/python/metrics/test_recall.py b/tests/ut/python/metrics/test_recall.py index 2202714e761..60022157f0d 100644 --- a/tests/ut/python/metrics/test_recall.py +++ b/tests/ut/python/metrics/test_recall.py @@ -18,7 +18,7 @@ import numpy as np import pytest from mindspore import Tensor -from mindspore.train.metrics import Recall +from mindspore.train import Recall def test_classification_recall(): diff --git a/tests/ut/python/metrics/test_roc.py b/tests/ut/python/metrics/test_roc.py index 0edefdab664..c796901c377 100644 --- a/tests/ut/python/metrics/test_roc.py +++ b/tests/ut/python/metrics/test_roc.py @@ -17,7 +17,7 @@ import numpy as np import pytest from mindspore import Tensor -from mindspore.train.metrics import ROC +from mindspore.train import ROC def test_roc(): diff --git a/tests/ut/python/metrics/test_root_mean_square_distance.py b/tests/ut/python/metrics/test_root_mean_square_distance.py index 4bc89190985..5fb6bae1048 100644 --- a/tests/ut/python/metrics/test_root_mean_square_distance.py +++ b/tests/ut/python/metrics/test_root_mean_square_distance.py @@ -18,7 +18,7 @@ import math import numpy as np import pytest from mindspore import Tensor -from mindspore.train.metrics import get_metric_fn, RootMeanSquareDistance +from mindspore.train import get_metric_fn, RootMeanSquareDistance def test_root_mean_square_distance(): diff --git a/tests/ut/python/metrics/test_topk.py b/tests/ut/python/metrics/test_topk.py index 573bf433c57..0f080dc4810 100644 --- a/tests/ut/python/metrics/test_topk.py +++ b/tests/ut/python/metrics/test_topk.py @@ -18,7 +18,7 @@ import numpy as np import pytest from mindspore import Tensor -from mindspore.train.metrics import TopKCategoricalAccuracy, Top1CategoricalAccuracy, Top5CategoricalAccuracy +from mindspore.train import TopKCategoricalAccuracy, Top1CategoricalAccuracy, Top5CategoricalAccuracy def test_type_topk(): diff --git a/tests/ut/python/parallel/test_auto_parallel_pangu_alpha_shard_propagation.py b/tests/ut/python/parallel/test_auto_parallel_pangu_alpha_shard_propagation.py index 95b3ddaeb5b..d69fb1ebe85 100644 --- a/tests/ut/python/parallel/test_auto_parallel_pangu_alpha_shard_propagation.py +++ b/tests/ut/python/parallel/test_auto_parallel_pangu_alpha_shard_propagation.py @@ -27,7 +27,7 @@ from mindspore import context from mindspore.nn.wrap.cell_wrapper import _VirtualDatasetCell from mindspore.parallel import set_algo_parameters from mindspore.nn.layer.activation import get_activation -from mindspore.train.model import Model +from mindspore.train import Model from mindspore.common.api import _cell_graph_executor from tests.dataset_mock import MindData context.set_context(mode=context.GRAPH_MODE, device_target="Ascend") diff --git a/tests/ut/python/parallel/test_auto_parallel_resnet.py b/tests/ut/python/parallel/test_auto_parallel_resnet.py index d8cfd84419e..d9370202179 100644 --- a/tests/ut/python/parallel/test_auto_parallel_resnet.py +++ b/tests/ut/python/parallel/test_auto_parallel_resnet.py @@ -29,7 +29,7 @@ from mindspore.ops import operations as P from mindspore.parallel import _cost_model_context as cost_model_context from mindspore.parallel import set_algo_parameters from mindspore.parallel._utils import _reset_op_id as resset_op_id -from mindspore.train.model import Model +from mindspore.train import Model from mindspore.context import ParallelMode from mindspore.communication._comm_helper import GlobalComm diff --git a/tests/ut/python/parallel/test_auto_parallel_resnet_predict.py b/tests/ut/python/parallel/test_auto_parallel_resnet_predict.py index 15a8d647d3f..d7b05f1f839 100644 --- a/tests/ut/python/parallel/test_auto_parallel_resnet_predict.py +++ b/tests/ut/python/parallel/test_auto_parallel_resnet_predict.py @@ -16,7 +16,7 @@ from mindspore import Tensor from mindspore import context from mindspore.communication.management import init from mindspore.parallel import set_algo_parameters -from mindspore.train.model import Model +from mindspore.train import Model from mindspore.context import ParallelMode from mindspore.communication._comm_helper import GlobalComm from .test_auto_parallel_resnet import resnet50 diff --git a/tests/ut/python/parallel/test_auto_parallel_resnet_sharding_propagation.py b/tests/ut/python/parallel/test_auto_parallel_resnet_sharding_propagation.py index e99e629d9d8..8f06746b9bf 100644 --- a/tests/ut/python/parallel/test_auto_parallel_resnet_sharding_propagation.py +++ b/tests/ut/python/parallel/test_auto_parallel_resnet_sharding_propagation.py @@ -29,7 +29,7 @@ from mindspore.ops import operations as P from mindspore.parallel import _cost_model_context as cost_model_context from mindspore.parallel import set_algo_parameters from mindspore.parallel._utils import _reset_op_id as resset_op_id -from mindspore.train.model import Model +from mindspore.train import Model from mindspore.context import ParallelMode from mindspore.communication._comm_helper import GlobalComm diff --git a/tests/ut/python/parallel/test_auto_parallel_resnet_sharding_propagation2.py b/tests/ut/python/parallel/test_auto_parallel_resnet_sharding_propagation2.py index de032611dbc..538afe9c944 100644 --- a/tests/ut/python/parallel/test_auto_parallel_resnet_sharding_propagation2.py +++ b/tests/ut/python/parallel/test_auto_parallel_resnet_sharding_propagation2.py @@ -28,7 +28,7 @@ from mindspore.nn.optim.momentum import Momentum from mindspore.ops import operations as P from mindspore.parallel import set_algo_parameters from mindspore.parallel._utils import _reset_op_id as resset_op_id -from mindspore.train.model import Model +from mindspore.train import Model from mindspore.context import ParallelMode from mindspore.communication._comm_helper import GlobalComm diff --git a/tests/ut/python/parallel/test_bias_add.py b/tests/ut/python/parallel/test_bias_add.py index fb1e3774ab1..aa8be068771 100644 --- a/tests/ut/python/parallel/test_bias_add.py +++ b/tests/ut/python/parallel/test_bias_add.py @@ -18,7 +18,7 @@ import mindspore.nn as nn from mindspore import Tensor from mindspore import context from mindspore.ops import operations as P -from mindspore.train.model import Model +from mindspore.train import Model class CrossEntropyLoss(nn.Cell): def __init__(self, reduction='mean'): diff --git a/tests/ut/python/parallel/test_comm_fusion.py b/tests/ut/python/parallel/test_comm_fusion.py index a917756f973..0ea84ebc9a9 100644 --- a/tests/ut/python/parallel/test_comm_fusion.py +++ b/tests/ut/python/parallel/test_comm_fusion.py @@ -21,7 +21,7 @@ from mindspore import Tensor from mindspore.ops import operations as P from mindspore.common.parameter import Parameter from mindspore.common.initializer import initializer -from mindspore.train.model import Model +from mindspore.train import Model from mindspore.nn.wrap.cell_wrapper import PipelineCell from mindspore.parallel._auto_parallel_context import auto_parallel_context from tests.ut.python.parallel.test_adafactor import compile_net diff --git a/tests/ut/python/parallel/test_control_flow.py b/tests/ut/python/parallel/test_control_flow.py index 2ece2c686d4..c9e8b1a252f 100644 --- a/tests/ut/python/parallel/test_control_flow.py +++ b/tests/ut/python/parallel/test_control_flow.py @@ -17,7 +17,7 @@ import mindspore as ms import mindspore.nn as nn from mindspore import Tensor from mindspore import context -from mindspore.train.model import Model +from mindspore.train import Model from mindspore.common.initializer import initializer from mindspore.common.parameter import Parameter from mindspore.ops import operations as P diff --git a/tests/ut/python/parallel/test_parallel_mirror_group.py b/tests/ut/python/parallel/test_parallel_mirror_group.py index 7a729fb3752..36eb2fbee2d 100644 --- a/tests/ut/python/parallel/test_parallel_mirror_group.py +++ b/tests/ut/python/parallel/test_parallel_mirror_group.py @@ -149,7 +149,7 @@ def test_pipeline_split_stage0_mirror_group(): Expectation: group info list match expectation value. """ import mindspore as ms - from mindspore import Model + from mindspore.train import Model from .test_pipeline_split import PipelineCell, PipelineSplit, DatasetLenet os.environ['GROUP_INFO_FILE'] = "./test_pipeline_split_stage0_mirror_group.pb" context.set_auto_parallel_context(device_num=64, global_rank=0, pipeline_stages=2) @@ -175,7 +175,7 @@ def test_pipeline_split_stage1_mirror_group(): Expectation: group info list match expectation value. """ import mindspore as ms - from mindspore import Model + from mindspore.train import Model from .test_pipeline_split import PipelineCell, PipelineSplit, DatasetLenet os.environ['GROUP_INFO_FILE'] = "./test_pipeline_split_stage1_mirror_group.pb" context.set_auto_parallel_context(device_num=64, global_rank=63, pipeline_stages=2) diff --git a/tests/ut/python/parallel/test_parameter_merge.py b/tests/ut/python/parallel/test_parameter_merge.py index 69eb653cf53..c7dc632d93d 100644 --- a/tests/ut/python/parallel/test_parameter_merge.py +++ b/tests/ut/python/parallel/test_parameter_merge.py @@ -20,7 +20,7 @@ from mindspore import context, Tensor, Parameter from mindspore.nn import Cell, Momentum from mindspore.ops import operations as P from mindspore.train import Model -from mindspore.train.callback import CheckpointConfig, ModelCheckpoint +from mindspore.train import CheckpointConfig, ModelCheckpoint from tests.dataset_mock import MindData class Dataset(MindData): diff --git a/tests/ut/python/parallel/test_pipeline_end_node.py b/tests/ut/python/parallel/test_pipeline_end_node.py index e9f55128cba..3f327980e7c 100644 --- a/tests/ut/python/parallel/test_pipeline_end_node.py +++ b/tests/ut/python/parallel/test_pipeline_end_node.py @@ -20,7 +20,7 @@ from mindspore import Tensor from mindspore.ops import operations as P from mindspore.common.parameter import Parameter from mindspore.common.initializer import initializer -from mindspore.train.model import Model +from mindspore.train import Model from mindspore.nn.wrap.cell_wrapper import PipelineCell, Cell diff --git a/tests/ut/python/parallel/test_pipeline_opt_detection.py b/tests/ut/python/parallel/test_pipeline_opt_detection.py index 7f4fa134197..20ef20183a1 100644 --- a/tests/ut/python/parallel/test_pipeline_opt_detection.py +++ b/tests/ut/python/parallel/test_pipeline_opt_detection.py @@ -20,7 +20,7 @@ from mindspore import Tensor from mindspore.ops import operations as P from mindspore.common.parameter import Parameter from mindspore.common.initializer import initializer -from mindspore.train.model import Model +from mindspore.train import Model from mindspore.nn.wrap.cell_wrapper import PipelineCell, MicroBatchInterleaved class DatasetLenet(): diff --git a/tests/ut/python/parallel/test_pipeline_remove_node.py b/tests/ut/python/parallel/test_pipeline_remove_node.py index 397ff5b2d0d..acb6f415de4 100644 --- a/tests/ut/python/parallel/test_pipeline_remove_node.py +++ b/tests/ut/python/parallel/test_pipeline_remove_node.py @@ -6,7 +6,7 @@ from mindspore import Tensor from mindspore import ParameterTuple from mindspore.ops import operations as P from mindspore.common.parameter import Parameter -from mindspore.train.model import Model +from mindspore.train import Model from mindspore.nn.wrap.cell_wrapper import PipelineCell class DatasetLenet(): diff --git a/tests/ut/python/parallel/test_pipeline_shared_parameter.py b/tests/ut/python/parallel/test_pipeline_shared_parameter.py index c9cd4354f8d..2d12a429fd0 100644 --- a/tests/ut/python/parallel/test_pipeline_shared_parameter.py +++ b/tests/ut/python/parallel/test_pipeline_shared_parameter.py @@ -20,7 +20,7 @@ from mindspore import Tensor from mindspore.ops import operations as P from mindspore.common.parameter import Parameter from mindspore.common.initializer import initializer -from mindspore.train.model import Model +from mindspore.train import Model from mindspore.nn.wrap.cell_wrapper import PipelineCell class DatasetLenet(): diff --git a/tests/ut/python/parallel/test_pipeline_split.py b/tests/ut/python/parallel/test_pipeline_split.py index a5f1129bd03..8cc4ef3b25f 100644 --- a/tests/ut/python/parallel/test_pipeline_split.py +++ b/tests/ut/python/parallel/test_pipeline_split.py @@ -25,7 +25,7 @@ from mindspore import Tensor from mindspore.ops import operations as P from mindspore.common.parameter import Parameter from mindspore.common.initializer import initializer -from mindspore.train.model import Model +from mindspore.train import Model from mindspore.nn.wrap.cell_wrapper import PipelineCell, MicroBatchInterleaved, _MicroBatch, Cell class DatasetLenet(): diff --git a/tests/ut/python/train/summary/test_image_summary.py b/tests/ut/python/train/summary/test_image_summary.py index e52f36939c3..9a87d7ab993 100644 --- a/tests/ut/python/train/summary/test_image_summary.py +++ b/tests/ut/python/train/summary/test_image_summary.py @@ -18,11 +18,11 @@ import os import numpy as np import mindspore.nn as nn -from mindspore import Model, context +from mindspore import context +from mindspore.train import Model, Callback from mindspore import Tensor from mindspore.nn.optim import Momentum from mindspore.train.summary.summary_record import SummaryRecord, _cache_summary_tensor_data -from mindspore.train.callback import Callback from tests.security_utils import security_off_wrap from .....dataset_mock import MindData diff --git a/tests/ut/python/train/summary/test_summary_collector.py b/tests/ut/python/train/summary/test_summary_collector.py index ea62228790f..177d207c87e 100644 --- a/tests/ut/python/train/summary/test_summary_collector.py +++ b/tests/ut/python/train/summary/test_summary_collector.py @@ -23,8 +23,7 @@ import numpy as np import pytest from mindspore import Tensor -from mindspore import Parameter -from mindspore.train.callback import SummaryCollector +from mindspore import Parameter, SummaryCollector from mindspore.train.callback import _InternalCallbackParam from mindspore.train.summary.enums import ModeEnum, PluginEnum from mindspore.train.summary import SummaryRecord diff --git a/tests/ut/python/train/test_landscape.py b/tests/ut/python/train/test_landscape.py index efa4cf8a877..bd57b3323c6 100644 --- a/tests/ut/python/train/test_landscape.py +++ b/tests/ut/python/train/test_landscape.py @@ -19,10 +19,9 @@ import tempfile import pytest from mindspore.common import set_seed -from mindspore import nn -from mindspore.train.metrics import Loss +from mindspore import nn, SummaryLandscape +from mindspore.train import Loss from mindspore.train import Model -from mindspore.train.callback import SummaryLandscape from tests.security_utils import security_off_wrap from tests.ut.python.train.dataset import create_mnist_dataset, LeNet5 diff --git a/tests/ut/python/train/test_run_config.py b/tests/ut/python/train/test_run_config.py index fc56cbab8d4..00b3482b306 100644 --- a/tests/ut/python/train/test_run_config.py +++ b/tests/ut/python/train/test_run_config.py @@ -15,7 +15,7 @@ """ test_run_config """ import pytest -from mindspore.train.callback import CheckpointConfig +from mindspore.train import CheckpointConfig def test_init(): diff --git a/tests/ut/python/train/test_training.py b/tests/ut/python/train/test_training.py index b3e572b0b27..40933f84182 100644 --- a/tests/ut/python/train/test_training.py +++ b/tests/ut/python/train/test_training.py @@ -18,10 +18,10 @@ import numpy as np import pytest import mindspore.nn as nn -from mindspore import Model, context -from mindspore import Tensor -from mindspore.train.callback import Callback -from mindspore.train.callback import BackupAndRestore +from mindspore import Tensor, context +from mindspore.train import Model +from mindspore.train import Callback +from mindspore.train import BackupAndRestore from mindspore.nn.optim import Momentum from ..ut_filter import non_graph_engine from ....dataset_mock import MindData diff --git a/tests/ut/python/utils/test_callback.py b/tests/ut/python/utils/test_callback.py index 25de629a67c..0d603d5d596 100644 --- a/tests/ut/python/utils/test_callback.py +++ b/tests/ut/python/utils/test_callback.py @@ -29,8 +29,9 @@ from mindspore.common.api import jit from mindspore.common.tensor import Tensor from mindspore.nn import TrainOneStepCell, WithLossCell from mindspore.nn.optim import Momentum -from mindspore.train.callback import ModelCheckpoint, RunContext, LossMonitor, _InternalCallbackParam, \ - _CallbackManager, Callback, CheckpointConfig, _set_cur_net, _checkpoint_cb_for_save_op, History, LambdaCallback +from mindspore.train import ModelCheckpoint, RunContext, LossMonitor, Callback, CheckpointConfig, \ + LambdaCallback, History +from mindspore.train.callback import _InternalCallbackParam, _CallbackManager, _checkpoint_cb_for_save_op, _set_cur_net from mindspore.train.callback._checkpoint import _chg_ckpt_file_name_if_same_exist diff --git a/tests/ut/python/utils/test_checkparam.py b/tests/ut/python/utils/test_checkparam.py index 4a5aeadf1b2..c6c5c5abf37 100644 --- a/tests/ut/python/utils/test_checkparam.py +++ b/tests/ut/python/utils/test_checkparam.py @@ -18,7 +18,7 @@ import pytest import mindspore import mindspore.nn as nn -from mindspore import Model, context +from mindspore import context from mindspore.common.tensor import Tensor @@ -50,7 +50,7 @@ def predict_checke_param(in_str): """ predict_checke_param """ net = LeNet5() # neural network context.set_context(mode=context.GRAPH_MODE) - model = Model(net) + model = mindspore.train.Model(net) a1, a2, b1, b2, b3, b4 = in_str.strip().split() a1 = int(a1) diff --git a/tests/ut/python/utils/test_initializer_fuzz.py b/tests/ut/python/utils/test_initializer_fuzz.py index 5cd76a1cd8c..34953ef2885 100644 --- a/tests/ut/python/utils/test_initializer_fuzz.py +++ b/tests/ut/python/utils/test_initializer_fuzz.py @@ -16,7 +16,7 @@ import pytest import mindspore.nn as nn -from mindspore import Model +from mindspore.train import Model class Net(nn.Cell): diff --git a/tests/ut/python/utils/test_serialize.py b/tests/ut/python/utils/test_serialize.py index 87c6bbc7560..49ffbfa9fa3 100644 --- a/tests/ut/python/utils/test_serialize.py +++ b/tests/ut/python/utils/test_serialize.py @@ -32,7 +32,8 @@ from mindspore.common.initializer import Normal from mindspore.nn import SoftmaxCrossEntropyWithLogits, WithLossCell, TrainOneStepCell, Accuracy from mindspore.nn.optim.momentum import Momentum from mindspore.ops import operations as P -from mindspore.train.callback import ModelCheckpoint, CheckpointConfig, LossMonitor, _CheckpointManager +from mindspore.train import ModelCheckpoint, CheckpointConfig, LossMonitor +from mindspore.train.callback import _CheckpointManager from mindspore.train.serialization import save_checkpoint, load_checkpoint, load_param_into_net, \ export, _save_graph, load from tests.security_utils import security_off_wrap