mindspore 1.10.0__cp38-cp38-win_amd64.whl → 2.0.0rc1__cp38-cp38-win_amd64.whl

mindspore/train/summary/_summary_adapter.py

@@ -28,7 +28,7 @@ from mindspore import context
 from mindspore.communication.management import get_rank
 from mindspore.communication.management import GlobalComm
 
-from mindspore._checkparam import Validator
+from mindspore import _checkparam as Validator
 from mindspore.train.anf_ir_pb2 import DataType, ModelProto
 from mindspore.train.summary_pb2 import Event
 

mindspore/train/summary/summary_record.py

@@ -24,13 +24,18 @@ from collections import defaultdict
 
 from mindspore import log as logger
 from mindspore.nn import Cell
-from mindspore._c_expression import Tensor, security
-from mindspore._checkparam import Validator
+from mindspore import context
+from mindspore._c_expression import security
+from mindspore._c_expression import Tensor as Tensor_
+from mindspore.common.tensor import Tensor
+from mindspore import _checkparam as Validator
 from mindspore.common.api import _cell_graph_executor
-from mindspore.train._utils import _check_lineage_value, _check_to_numpy, _make_directory, check_value_type
+from mindspore.train._utils import _check_lineage_value, _check_to_numpy, _make_directory, check_value_type, \
+    check_summary_param
 from mindspore.train.summary._summary_adapter import get_event_file_name, package_graph_event
 from mindspore.train.summary._writer_pool import WriterPool
 from mindspore.train.summary.enums import PluginEnum
+from mindspore.ops.operations import debug_ops
 
 # for the moment, this lock is for caution's sake,
 # there are actually no any concurrences happening.
@@ -58,6 +63,7 @@ def _cache_summary_tensor_data(summary):
 
 
 def _get_summary_tensor_data():
+    """Get summary tensor data."""
     global SUMMARY_TENSOR_CACHE
     with _summary_lock:
         data = SUMMARY_TENSOR_CACHE
@@ -65,6 +71,28 @@ def _get_summary_tensor_data():
         return data
 
 
+def _record_summary_tensor_data():
+    """Record summary tensor data."""
+    summary_list = list()
+    for data in debug_ops.SUMMARY_TENSOR_CACHE:
+        check_summary_param(data[0], data[1], data[2])
+        if data[0] == "TensorSummary":
+            summary_op_name = data[1] + "[:Tensor]"
+        elif data[0] == "ScalarSummary":
+            summary_op_name = data[1] + "[:Scalar]"
+        elif data[0] == "ImageSummary":
+            summary_op_name = data[1] + "[:Image]"
+        elif data[0] == "HistogramSummary":
+            summary_op_name = data[1] + "[:Histogram]"
+        summary_value = {
+            "name": summary_op_name,
+            "data": data[2]
+        }
+        summary_list.append(summary_value)
+    _cache_summary_tensor_data(summary_list)
+    debug_ops.SUMMARY_TENSOR_CACHE = []
+
+
 def process_export_options(export_options):
     """Check specified data type and value."""
     if export_options is None:
@@ -245,25 +273,25 @@ class SummaryRecord:
                 LossLandscape]): The value to store.
 
                 - The data type of value should be 'GraphProto' (see `mindspore/ccsrc/anf_ir.proto
-                  <https://gitee.com/mindspore/mindspore/blob/r1.10/mindspore/ccsrc/utils/anf_ir.proto>`_) object
+                  <https://gitee.com/mindspore/mindspore/blob/r2.0/mindspore/ccsrc/utils/anf_ir.proto>`_) object
                   when the plugin is 'graph'.
                 - The data type of value should be 'Tensor' object when the plugin is 'scalar', 'image', 'tensor'
                   or 'histogram'.
                 - The data type of value should be a 'TrainLineage' object when the plugin is 'train_lineage',
                   see `mindspore/ccsrc/lineage.proto
-                  <https://gitee.com/mindspore/mindspore/blob/r1.10/mindspore/ccsrc/utils/lineage.proto>`_.
+                  <https://gitee.com/mindspore/mindspore/blob/r2.0/mindspore/ccsrc/utils/lineage.proto>`_.
                 - The data type of value should be a 'EvaluationLineage' object when the plugin is 'eval_lineage',
                   see `mindspore/ccsrc/lineage.proto
-                  <https://gitee.com/mindspore/mindspore/blob/r1.10/mindspore/ccsrc/utils/lineage.proto>`_.
+                  <https://gitee.com/mindspore/mindspore/blob/r2.0/mindspore/ccsrc/utils/lineage.proto>`_.
                 - The data type of value should be a 'DatasetGraph' object when the plugin is 'dataset_graph',
                   see `mindspore/ccsrc/lineage.proto
-                  <https://gitee.com/mindspore/mindspore/blob/r1.10/mindspore/ccsrc/utils/lineage.proto>`_.
+                  <https://gitee.com/mindspore/mindspore/blob/r2.0/mindspore/ccsrc/utils/lineage.proto>`_.
                 - The data type of value should be a 'UserDefinedInfo' object when the plugin is 'custom_lineage_data',
                   see `mindspore/ccsrc/lineage.proto
-                  <https://gitee.com/mindspore/mindspore/blob/r1.10/mindspore/ccsrc/utils/lineage.proto>`_.
+                  <https://gitee.com/mindspore/mindspore/blob/r2.0/mindspore/ccsrc/utils/lineage.proto>`_.
                 - The data type of value should be a 'LossLandscape' object when the plugin is 'LANDSCAPE',
                   see `mindspore/ccsrc/summary.proto
-                  <https://gitee.com/mindspore/mindspore/blob/r1.10/mindspore/ccsrc/utils/summary.proto>`_.
+                  <https://gitee.com/mindspore/mindspore/blob/r2.0/mindspore/ccsrc/utils/summary.proto>`_.
 
         Raises:
             ValueError: `plugin` is not in the optional value.
@@ -282,7 +310,7 @@ class SummaryRecord:
             if not name or not isinstance(name, str):
                 raise ValueError(f'For "{self.__class__.__name__}", the parameter "name" type should be str, '
                                  f'but got {type(name)}.')
-            if not isinstance(value, Tensor):
+            if not isinstance(value, (Tensor, Tensor_)):
                 raise TypeError(f'For "{self.__class__.__name__}", the parameter "value" expect to be Tensor, '
                                 f'but got {type(value).__name__}')
             np_value = _check_to_numpy(plugin, value)
@@ -325,7 +353,7 @@ class SummaryRecord:
 
         Raises:
             TypeError: `step` is not int, or `train_network` is not `mindspore.nn.Cell
-                <https://www.mindspore.cn/docs/en/r1.10/api_python/nn/mindspore.nn.Cell.html#mindspore-nn-cell>`_ 。
+                <https://www.mindspore.cn/docs/en/r2.0/api_python/nn/mindspore.nn.Cell.html#mindspore-nn-cell>`_ 。
 
         Examples:
             >>> import mindspore as ms
@@ -351,7 +379,8 @@ class SummaryRecord:
             if graph_proto is None and train_network is not None:
                 graph_proto = _cell_graph_executor.get_optimize_graph_proto(train_network)
             if graph_proto is None:
-                logger.error("Failed to get proto for graph")
+                if not context.get_context("mode") == context.PYNATIVE_MODE:
+                    logger.error("Failed to get proto for graph.")
             else:
                 self._event_writer.write({'graph': [{'step': step, 'value': graph_proto}]})
                 self._status['has_graph'] = True
@@ -414,6 +443,8 @@ class SummaryRecord:
         atexit.register(self.close)
 
     def _add_summary_tensor_data(self):
+        """Add summary tensor data."""
+        _record_summary_tensor_data()
         summary_data = _get_summary_tensor_data()
         if not summary_data:
             logger.debug(f'No summary data bubbled from the network.')

mindspore/train/train_thor/convert_utils.py

@@ -134,7 +134,7 @@ class ConvertNetUtils:
             elif isinstance(subcell, (nn.DenseThor, nn.Conv2dThor, nn.EmbeddingThor, nn.EmbeddingLookupThor)):
                 continue
             elif isinstance(subcell, (nn.Conv2dTranspose, nn.Conv1d, nn.Conv1dTranspose, nn.BatchNorm1d, nn.GroupNorm,
-                                      nn.GlobalBatchNorm, nn.LayerNorm, nn.BatchNorm2d, nn.MaxPool2d)):
+                                      nn.LayerNorm, nn.BatchNorm2d, nn.MaxPool2d)):
                 continue
             elif isinstance(subcell, (nn.Embedding, nn.Dense, nn.Conv2d, nn.EmbeddingLookup)):
                 prefix = subcell.param_prefix
@@ -213,6 +213,12 @@ class ConvertModelUtils:
             ``Ascend`` ``GPU``
 
         Examples:
+            .. note::
+                Before running the following example, you need to customize the network Net and
+                dataset preparation function create_dataset. Refer to
+                `Building a Network <https://www.mindspore.cn/tutorials/en/r2.0/beginner/model.html>`_
+                and `Dataset <https://www.mindspore.cn/tutorials/en/r2.0/beginner/dataset.html>`_ .
+
             >>> import mindspore as ms
             >>> from mindspore import nn
             >>> from mindspore import Tensor

mindspore/train/train_thor/dataset_helper.py

@@ -17,12 +17,12 @@ from __future__ import absolute_import
 
 import math
 
-from mindspore._checkparam import Validator
+from mindspore import _checkparam as Validator
 from mindspore import context
 from mindspore.train._utils import _exec_datagraph, _get_types_and_shapes
 from mindspore.nn.wrap import GetNextSingleOp
 from mindspore.parallel._utils import _get_device_num, _need_to_full, _to_full_shapes
-from mindspore.parallel._ps_context import _is_role_pserver, _is_role_sched
+from mindspore.parallel._ps_context import _is_role_sched
 
 
 def _send_data(dataset, epoch_num):
@@ -163,7 +163,7 @@ class _DatasetIterMSLoopSink(_DatasetIter):
             loop_size = dataset.__loop_size__ + iter_first_order
             sink_count = int(sink_size / loop_size) * 2
         self.sink_count = sink_count
-        if _is_role_pserver() or _is_role_sched():
+        if _is_role_sched():
             self.sink_count = 1
         # for self._parallel_mode equal to semi_auto_parallel or auto_parallel, and not using full_batch,
         # use a complete tensor to compile, and slice tensor to run. The batch dimension of tensors for

mindspore/train/train_thor/model_thor.py

@@ -26,7 +26,6 @@ import math
 from mindspore.train.callback import RunContext
 from mindspore import context
 from mindspore import nn
-from mindspore.context import ParallelMode
 from mindspore.train.model import Model
 from mindspore.train.dataset_helper import connect_network_with_dataset
 from mindspore.parallel._utils import _need_to_full, _to_full_tensor
@@ -140,9 +139,6 @@ class ModelThor(Model):
         network.set_train(is_train)
         network.phase = phase
 
-        if self._parallel_mode in (ParallelMode.SEMI_AUTO_PARALLEL, ParallelMode.AUTO_PARALLEL):
-            network.set_auto_parallel()
-
         return dataset_helper, network
 
     def _train_gpu_sink_step(self, cb_params, inputs, list_callback, iter_first_order, run_context):

mindspore/version.py

@@ -1 +1 @@
-__version__ = '1.10.0'
+__version__ = '2.0.0rc1'

{mindspore-1.10.0.dist-info → mindspore-2.0.0rc1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: mindspore
-Version: 1.10.0
+Version: 2.0.0rc1
 Summary: MindSpore is a new open source deep learning training/inference framework that could be used for mobile, edge and cloud scenarios.
 Home-page: https://www.mindspore.cn
 Author: The MindSpore Authors
@@ -31,7 +31,7 @@ Requires-Dist: numpy (>=1.17.0)
 Requires-Dist: protobuf (>=3.13.0)
 Requires-Dist: asttokens (>=2.0.4)
 Requires-Dist: pillow (>=6.2.0)
-Requires-Dist: scipy (>=1.5.2)
+Requires-Dist: scipy (>=1.5.4)
 Requires-Dist: packaging (>=20.0)
 Requires-Dist: psutil (>=5.6.1)
 Requires-Dist: astunparse (>=1.6.3)
@@ -319,10 +319,11 @@ Project stable branches will be in one of the following states:
 
 | **Branch** | **Status**   | **Initial Release Date** | **Next Phase**                         | **EOL Date**|
 |------------|--------------|--------------------------|----------------------------------------|-------------|
+| **r1.10**  | Maintained   | 2023-02-02               | Unmaintained <br> 2024-02-02 estimated |             |
 | **r1.9**   | Maintained   | 2022-10-26               | Unmaintained <br> 2023-10-26 estimated |             |
 | **r1.8**   | Maintained   | 2022-07-29               | Unmaintained <br> 2023-07-29 estimated |             |
 | **r1.7**   | Maintained   | 2022-04-29               | Unmaintained <br> 2023-04-29 estimated |             |
-| **r1.6**   | Maintained   | 2022-01-29               | Unmaintained <br> 2023-01-29 estimated |             |
+| **r1.6**   | End Of Life  | 2022-01-29               |                                        | 2023-01-29  |
 | **r1.5**   | End Of Life  | 2021-10-15               |                                        | 2022-10-15  |
 | **r1.4**   | End Of Life  | 2021-08-15               |                                        | 2022-08-15  |
 | **r1.3**   | End Of Life  | 2021-07-15               |                                        | 2022-07-15  |