From b4ef971eefd8fa8de72ae530301971e01e066462 Mon Sep 17 00:00:00 2001 From: lvmingfu Date: Fri, 4 Mar 2022 16:49:20 +0800 Subject: [PATCH] modify nonstandard import in the documents for r1.6 --- docs/mindquantum/docs/source_en/vqe_for_quantum_chemistry.md | 2 +- .../docs/source_zh_cn/vqe_for_quantum_chemistry.ipynb | 2 +- docs/mindspore/faq/source_zh_cn/network_compilation.md | 2 +- .../source_en/api_mapping/pytorch_diff/SentencePieceVocab.md | 3 +-- .../api_mapping/pytorch_diff/SentencePieceVocab.md | 3 +-- docs/mindspore/programming_guide/source_en/control_flow.md | 2 +- docs/mindspore/programming_guide/source_en/parameter.md | 2 +- docs/mindspore/programming_guide/source_zh_cn/parameter.ipynb | 2 +- .../distributed_training_transformer/parallel_recover_train.py | 2 +- 9 files changed, 9 insertions(+), 11 deletions(-) diff --git a/docs/mindquantum/docs/source_en/vqe_for_quantum_chemistry.md b/docs/mindquantum/docs/source_en/vqe_for_quantum_chemistry.md index bbc8bd3bc8..9dbfd819ba 100644 --- a/docs/mindquantum/docs/source_en/vqe_for_quantum_chemistry.md +++ b/docs/mindquantum/docs/source_en/vqe_for_quantum_chemistry.md @@ -46,7 +46,7 @@ from mindquantum.core import Circuit from mindquantum.algorithm.nisq.chem import generate_uccsd import mindspore as ms import mindspore.context as context -from mindspore.common.parameter import Parameter +from mindspore import Parameter from mindspore.common.initializer import initializer context.set_context(mode=context.PYNATIVE_MODE, device_target="CPU") diff --git a/docs/mindquantum/docs/source_zh_cn/vqe_for_quantum_chemistry.ipynb b/docs/mindquantum/docs/source_zh_cn/vqe_for_quantum_chemistry.ipynb index 22b2d3dafc..c246f9571a 100644 --- a/docs/mindquantum/docs/source_zh_cn/vqe_for_quantum_chemistry.ipynb +++ b/docs/mindquantum/docs/source_zh_cn/vqe_for_quantum_chemistry.ipynb @@ -57,7 +57,7 @@ "from mindquantum.algorithm import generate_uccsd\n", "import mindspore as ms\n", "import mindspore.context as context\n", - "from mindspore.common.parameter import Parameter\n", + "from mindspore import Parameter\n", "\n", "context.set_context(mode=context.PYNATIVE_MODE, device_target=\"CPU\")" ] diff --git a/docs/mindspore/faq/source_zh_cn/network_compilation.md b/docs/mindspore/faq/source_zh_cn/network_compilation.md index 2b6df9396e..57588057d3 100644 --- a/docs/mindspore/faq/source_zh_cn/network_compilation.md +++ b/docs/mindspore/faq/source_zh_cn/network_compilation.md @@ -197,7 +197,7 @@ class BpropUserDefinedNet(nn.Cell): ```python from mindspore import Tensor, ms_function -from mindspore.common import dtype as mstype +from mindspore import dtype as mstype import mindspore.context as context ZERO = Tensor([0], mstype.int32) ONE = Tensor([1], mstype.int32) diff --git a/docs/mindspore/migration_guide/source_en/api_mapping/pytorch_diff/SentencePieceVocab.md b/docs/mindspore/migration_guide/source_en/api_mapping/pytorch_diff/SentencePieceVocab.md index 384a45b9cd..8b139d4edb 100644 --- a/docs/mindspore/migration_guide/source_en/api_mapping/pytorch_diff/SentencePieceVocab.md +++ b/docs/mindspore/migration_guide/source_en/api_mapping/pytorch_diff/SentencePieceVocab.md @@ -31,8 +31,7 @@ MindSpore: SentencePiece object that is used to perform words segmentation. ```python import mindspore.dataset as ds from mindspore.dataset import text -from mindspore.dataset.text.utils import to_str -from mindspore.dataset.text import SentencePieceModel, SPieceTokenizerOutType +from mindspore.dataset.text import SentencePieceModel, SPieceTokenizerOutType, to_str from torchtext.data.functional import load_sp_model # In MindSpore, return tokenizer from vocab object. diff --git a/docs/mindspore/migration_guide/source_zh_cn/api_mapping/pytorch_diff/SentencePieceVocab.md b/docs/mindspore/migration_guide/source_zh_cn/api_mapping/pytorch_diff/SentencePieceVocab.md index 03e6236510..1ad546db6d 100644 --- a/docs/mindspore/migration_guide/source_zh_cn/api_mapping/pytorch_diff/SentencePieceVocab.md +++ b/docs/mindspore/migration_guide/source_zh_cn/api_mapping/pytorch_diff/SentencePieceVocab.md @@ -31,8 +31,7 @@ MindSpore：构造用于单词分割的词汇表，输入可以是数据集对 ```python import mindspore.dataset as ds from mindspore.dataset import text -from mindspore.dataset.text import SentencePieceModel, SPieceTokenizerOutType -from mindspore.dataset.text.utils import to_str +from mindspore.dataset.text import SentencePieceModel, SPieceTokenizerOutType, to_str from torchtext.data.functional import load_sp_model # In MindSpore, return tokenizer from vocab object. diff --git a/docs/mindspore/programming_guide/source_en/control_flow.md b/docs/mindspore/programming_guide/source_en/control_flow.md index e231ba92a9..db7cf77635 100644 --- a/docs/mindspore/programming_guide/source_en/control_flow.md +++ b/docs/mindspore/programming_guide/source_en/control_flow.md @@ -285,7 +285,7 @@ Example 8: import numpy as np from mindspore import context from mindspore import Tensor, nn -from mindspore.common import dtype as ms +from mindspore import dtype as ms from mindspore import ops class IfInWhileNet(nn.Cell): diff --git a/docs/mindspore/programming_guide/source_en/parameter.md b/docs/mindspore/programming_guide/source_en/parameter.md index 9f7c8eecf8..718e62f7c7 100644 --- a/docs/mindspore/programming_guide/source_en/parameter.md +++ b/docs/mindspore/programming_guide/source_en/parameter.md @@ -341,7 +341,7 @@ Please note that a special set of operators for floating point overflow state de ```python import numpy as np -from mindspore.common.tensor import Tensor +from mindspore import Tensor from mindspore import ops, context context.set_context(device_target="Ascend") diff --git a/docs/mindspore/programming_guide/source_zh_cn/parameter.ipynb b/docs/mindspore/programming_guide/source_zh_cn/parameter.ipynb index 7fa558cb57..9961587530 100644 --- a/docs/mindspore/programming_guide/source_zh_cn/parameter.ipynb +++ b/docs/mindspore/programming_guide/source_zh_cn/parameter.ipynb @@ -468,7 +468,7 @@ ], "source": [ "import numpy as np\n", - "from mindspore.common.tensor import Tensor\n", + "from mindspore import Tensor\n", "from mindspore import ops, context\n", "\n", "context.set_context(device_target=\"Ascend\")\n", diff --git a/docs/sample_code/distributed_training_transformer/parallel_recover_train.py b/docs/sample_code/distributed_training_transformer/parallel_recover_train.py index ca59826395..3f66618669 100644 --- a/docs/sample_code/distributed_training_transformer/parallel_recover_train.py +++ b/docs/sample_code/distributed_training_transformer/parallel_recover_train.py @@ -23,7 +23,7 @@ from mindspore.context import ParallelMode from mindspore.nn import PipelineCell from mindspore.train.callback import TimeMonitor, LossMonitor, CheckpointConfig, ModelCheckpoint from mindspore.nn import AdamWeightDecay -from mindspore.train.serialization import load_checkpoint, load_param_into_net +from mindspore import load_checkpoint, load_param_into_net from mindspore import context from dataset import ToyDataset, Tokenzier from model import Net -- Gitee