mindspore 2.0.0rc1__cp38-cp38-manylinux1_x86_64.whl → 2.2.0__cp38-cp38-manylinux1_x86_64.whl

mindspore/train/summary/_summary_adapter.py

@@ -175,7 +175,7 @@ def _nptype_to_prototype(np_value):
         np.uint32: 'DT_UINT32',
         np.uint64: 'DT_UINT64',
         np.float16: 'DT_FLOAT16',
-        np.float: 'DT_FLOAT64',
+        float: 'DT_FLOAT64',
         np.float32: 'DT_FLOAT32',
         np.float64: 'DT_FLOAT64',
         None: 'DT_UNDEFINED'
@@ -421,7 +421,10 @@ def _make_image(tensor, rescale=1):
     scaled_height = int(height * rescale)
     scaled_width = int(width * rescale)
     image = Image.fromarray(tensor)
-    image = image.resize((scaled_width, scaled_height), Image.ANTIALIAS)
+    if hasattr(Image, 'ANTIALIAS'):
+        image = image.resize((scaled_width, scaled_height), Image.ANTIALIAS)
+    else:
+        image = image.resize((scaled_width, scaled_height), Image.LANCZOS)
     output = io.BytesIO()
     image.save(output, format='PNG')
     image_string = output.getvalue()

mindspore/train/summary/_writer_pool.py

@@ -69,16 +69,17 @@ class WriterPool(ctx.Process):
         max_file_size (Optional[int]): The maximum size of each file that can be written to disk in bytes.
         raise_exception (bool, optional): Sets whether to throw an exception when an RuntimeError exception occurs
             in recording data. Default: False, this means that error logs are printed and no exception is thrown.
-        export_options (Union[None, dict]): Perform custom operations on the export data. Default: None.
+        export_options (Union[None, dict]): Perform custom operations on the export data. Default: ``None``.
         filedict (dict): The mapping from plugin to filename.
     """
 
-    def __init__(self, base_dir, max_file_size, raise_exception=False, **filedict) -> None:
+    def __init__(self, base_dir, max_file_size, num_process=32, raise_exception=False, **filedict) -> None:
         super().__init__()
         self._base_dir, self._filedict = base_dir, filedict
         self._queue, self._writers_ = ctx.Queue(ctx.cpu_count() * 2), None
         self._max_file_size = max_file_size
         self._raise_exception = raise_exception
+        self._num_process = num_process
         self._training_pid = os.getpid()
         self.start()
 
@@ -97,7 +98,7 @@ class WriterPool(ctx.Process):
         # which causes the main process to fail to exit.
         signal.signal(signal.SIGINT, signal.SIG_IGN)
 
-        with ctx.Pool(min(ctx.cpu_count(), 32)) as pool:
+        with ctx.Pool(min(ctx.cpu_count(), self._num_process)) as pool:
             deq = deque()
             while True:
                 if self._check_heartbeat():

mindspore/train/summary/summary_record.py

@@ -141,22 +141,25 @@ class SummaryRecord:
 
     Args:
         log_dir (str): The log_dir is a directory location to save the summary.
-        file_prefix (str): The prefix of file. Default: "events".
-        file_suffix (str): The suffix of file. Default: "_MS".
-        network (Cell): Obtain a pipeline through network for saving graph summary. Default: None.
+        file_prefix (str): The prefix of file. Default: ``"events"`` .
+        file_suffix (str): The suffix of file. Default: ``"_MS"`` .
+        num_process (int): Number of processes saving summary data. The more processes there are, the better the
+            performance, but there may be host memory overflow issues. Default: ``32`` .
+        network (Cell): Obtain a pipeline through network for saving graph summary. Default: ``None`` .
         max_file_size (int, optional): The maximum size of each file that can be written to disk (in bytes).
             For example, to write not larger than 4GB, specify `max_file_size=4*1024**3`.
-            Default: None, which means no limit.
+            Default: ``None`` , which means no limit.
         raise_exception (bool, optional): Sets whether to throw an exception when a RuntimeError or OSError exception
-            occurs in recording data. Default: False, this means that error logs are printed and no exception is thrown.
+            occurs in recording data. Default: ``False`` , this means that error logs are printed and no exception is
+            thrown.
         export_options (Union[None, dict]): Perform custom operations on the export data.
             Note that the size of export files is not limited by the max_file_size.
             You can customize the export data with a dictionary. For example, you can set {'tensor_format': 'npy'}
-            to export tensor as npy file. The data that supports control is shown below. Default: None, it means that
-            the data is not exported.
+            to export tensor as npy file. The data that supports control is shown below. Default: ``None`` , it means
+            that the data is not exported.
 
             - tensor_format (Union[str, None]): Customize the export tensor format. Supports ["npy", None].
-              Default: None, it means that the tensor is not exported.
+              Default: ``None`` , it means that the tensor is not exported.
 
               - npy: export tensor as npy file.
 
@@ -180,7 +183,7 @@ class SummaryRecord:
 
     count = 0
 
-    def __init__(self, log_dir, file_prefix="events", file_suffix="_MS",
+    def __init__(self, log_dir, file_prefix="events", file_suffix="_MS", num_process=32,
                  network=None, max_file_size=None, raise_exception=False, export_options=None):
         self._check_count()
         with _instance_lock:
@@ -203,6 +206,7 @@ class SummaryRecord:
         self.file_suffix = file_suffix
         self.network = network
         self.max_file_size = max_file_size
+        self._num_process = num_process
         self.raise_exception = raise_exception
         self._export_options = export_options
         try:
@@ -230,8 +234,8 @@ class SummaryRecord:
             mode (str): The mode to be set, which should be 'train' or 'eval'. When the mode is 'eval',
                 summary_record will not record the data of summary operators.
 
-                - train：the model running phase is train mode.
-                - eval：the model running phase is eval mode，When the mode is 'eval',
+                - train: the model running phase is train mode.
+                - eval: the model running phase is eval mode, When the mode is 'eval',
                   summary_record will not record the data of summary operators.
 
         Raises:
@@ -273,25 +277,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/r2.0/mindspore/ccsrc/utils/anf_ir.proto>`_) object
+                  <https://gitee.com/mindspore/mindspore/blob/r2.2/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/r2.0/mindspore/ccsrc/utils/lineage.proto>`_.
+                  <https://gitee.com/mindspore/mindspore/blob/r2.2/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/r2.0/mindspore/ccsrc/utils/lineage.proto>`_.
+                  <https://gitee.com/mindspore/mindspore/blob/r2.2/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/r2.0/mindspore/ccsrc/utils/lineage.proto>`_.
+                  <https://gitee.com/mindspore/mindspore/blob/r2.2/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/r2.0/mindspore/ccsrc/utils/lineage.proto>`_.
+                  <https://gitee.com/mindspore/mindspore/blob/r2.2/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/r2.0/mindspore/ccsrc/utils/summary.proto>`_.
+                  <https://gitee.com/mindspore/mindspore/blob/r2.2/mindspore/ccsrc/utils/summary.proto>`_.
 
         Raises:
             ValueError: `plugin` is not in the optional value.
@@ -344,16 +348,16 @@ class SummaryRecord:
         Args:
             step (int): Represents training step number.
             train_network (Cell): The spare network for saving graph.
-                Default: None, it means just do not save the graph summary when the original network graph is None.
+                Default: ``None``, it means just do not save the graph summary when the original network graph is None.
             plugin_filter (Callable[[str], bool], optional): The filter function, \
-                which is used to filter out which plugin should be written. Default: None.
+                which is used to filter out which plugin should be written. Default: ``None``.
 
         Returns:
             bool, whether the record process is successful or not.
 
         Raises:
             TypeError: `step` is not int, or `train_network` is not `mindspore.nn.Cell
-                <https://www.mindspore.cn/docs/en/r2.0/api_python/nn/mindspore.nn.Cell.html#mindspore-nn-cell>`_ 。
+                <https://www.mindspore.cn/docs/en/r2.2/api_python/nn/mindspore.nn.Cell.html#mindspore-nn-cell>`_ .
 
         Examples:
             >>> import mindspore as ms
@@ -361,9 +365,6 @@ class SummaryRecord:
             ...     with ms.SummaryRecord(log_dir="./summary_dir", file_prefix="xx_", file_suffix="_yy") \
             ...             as summary_record:
             ...         result = summary_record.record(step=2)
-            ...         print(result)
-            ...
-            True
         """
         logger.debug("SummaryRecord step is %r.", step)
         Validator.check_value_type(arg_name='step', arg_value=step, valid_types=int)
@@ -437,6 +438,7 @@ class SummaryRecord:
                              exporter=export_dir)
         self._event_writer = WriterPool(self.base_log_dir,
                                         self.max_file_size,
+                                        self._num_process,
                                         self.raise_exception,
                                         **filename_dict)
         _get_summary_tensor_data()

mindspore/train/train_thor/convert_utils.py

@@ -23,6 +23,10 @@ from mindspore import context
 class ConvertNetUtils:
     """
     Convert net to thor layer net, used to compute and store second-order information matrix.
+
+    Examples:
+        >>> import mindspore as ms
+        >>> convert_net_utils = ms.train.ConvertNetUtils()
     """
     def __init__(self):
         self._convert_method_map = {nn.Dense: ConvertNetUtils._convert_dense,
@@ -165,8 +169,23 @@ class ConvertNetUtils:
             ``Ascend`` ``GPU``
 
         Examples:
-            >>> ConvertNetUtils().convert_to_thor_net(net)
-
+            >>> import mindspore as ms
+            >>> from mindspore import nn
+            >>> from mindspore import Tensor
+            >>> from mindspore.nn import thor
+            >>>
+            >>> # Define the network structure of LeNet5. Refer to
+            >>> # https://gitee.com/mindspore/docs/blob/r2.2/docs/mindspore/code/lenet.py
+            >>> net = LeNet5()
+            >>> temp = Tensor([4e-4, 1e-4, 1e-5, 1e-5], ms.float32)
+            >>> opt = thor(net, learning_rate=temp, damping=temp, momentum=0.9, loss_scale=128, frequency=4)
+            >>> loss = nn.SoftmaxCrossEntropyWithLogits(sparse=True, reduction='mean')
+            >>> loss_scale = ms.FixedLossScaleManager(128, drop_overflow_update=False)
+            >>> model = ms.Model(net, loss_fn=loss, optimizer=opt, loss_scale_manager=loss_scale, metrics={'acc'},
+            ...               amp_level="O2", keep_batchnorm_fp32=False)
+            >>> model = ms.train.ConvertModelUtils.convert_to_thor_model(model=model, network=net, loss_fn=loss,
+            ...                                           optimizer=opt,loss_scale_manager=loss_scale, metrics={'acc'},
+            ...                                           amp_level="O2", keep_batchnorm_fp32=False)
         """
 
         net.update_cell_prefix()
@@ -187,11 +206,12 @@ class ConvertModelUtils:
         Args:
             model (Object): High-Level API for Training.
             network (Cell): A training network.
-            loss_fn (Cell): Objective function. Default: None.
-            optimizer (Cell): Optimizer used to updating the weights. Default: None.
+            loss_fn (Cell): Objective function. Default: ``None`` .
+            optimizer (Cell): Optimizer used to updating the weights. Default: ``None`` .
             metrics (Union[dict, set]): A Dictionary or a set of metrics to be evaluated by the model during
-                                        training. eg: {'accuracy', 'recall'}. Default: None.
-            amp_level (str): Level for mixed precision training. Supports ["O0", "O2", "O3", "auto"]. Default: "O0".
+                                        training. eg: {'accuracy', 'recall'}. Default: ``None`` .
+            amp_level (str): Level for mixed precision training. Supports ["O0", "O2", "O3", "auto"].
+                Default: ``"O0"`` .
 
                 - O0: Do not change.
                 - O2: Cast network to float16, keep batchnorm run in float32, using dynamic loss scale.
@@ -202,9 +222,9 @@ class ConvertModelUtils:
 
             loss_scale_manager (Union[None, LossScaleManager]): If it is None, the loss would not be scaled.
                 Otherwise, scale the loss by LossScaleManager and optimizer can not be None. It is a key argument.
-                e.g. Use `loss_scale_manager=None` to set the value.
+                e.g. Use `loss_scale_manager=None` to set the value. Default: ``None`` .
             keep_batchnorm_fp32 (bool): Keep Batchnorm running in `float32`. If True, the level setting before
-                will be overwritten. Default: False.
+                will be overwritten. Default: ``False`` .
 
         Returns:
              model (Object), High-Level API for Training.
@@ -213,30 +233,26 @@ 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
             >>> from mindspore.nn import thor
             >>>
-            >>> net = Net()
+            >>> # Define the network structure of LeNet5. Refer to
+            >>> # https://gitee.com/mindspore/docs/blob/r2.2/docs/mindspore/code/lenet.py
+            >>> net = LeNet5()
+            >>> # Create the dataset taking MNIST as an example. Refer to
+            >>> # https://gitee.com/mindspore/docs/blob/r2.2/docs/mindspore/code/mnist.py
             >>> dataset = create_dataset()
-            >>> temp = Tensor([4e-4, 1e-4, 1e-5, 1e-5], mstype.float32)
+            >>> temp = Tensor([4e-4, 1e-4, 1e-5, 1e-5], ms.float32)
             >>> opt = thor(net, learning_rate=temp, damping=temp, momentum=0.9, loss_scale=128, frequency=4)
             >>> loss = nn.SoftmaxCrossEntropyWithLogits(sparse=True, reduction='mean')
-            >>> loss_scale = ms.FixedLossScaleManager(128, drop_overflow_update=False)
-            >>> model = ms.Model(net, loss_fn=loss, optimizer=opt, loss_scale_manager=loss_scale, metrics={'acc'},
+            >>> loss_scale = ms.amp.FixedLossScaleManager(128, drop_overflow_update=False)
+            >>> model = ms.train.Model(net, loss_fn=loss, optimizer=opt, loss_scale_manager=loss_scale, metrics={'acc'},
             ...               amp_level="O2", keep_batchnorm_fp32=False)
-            >>> model = ConvertModelUtils.convert_to_thor_model(model=model, network=net, loss_fn=loss, optimizer=opt,
-            ...                                                 loss_scale_manager=loss_scale, metrics={'acc'},
-            ...                                                 amp_level="O2", keep_batchnorm_fp32=False)
-            >>> loss_cb = ms.LossMonitor()
-            >>> model.train(1, dataset, callbacks=loss_cb, sink_size=4, dataset_sink_mode=True)
+            >>> model = ms.train.ConvertModelUtils.convert_to_thor_model(model=model, network=net, loss_fn=loss,
+            ...                                          optimizer=opt, loss_scale_manager=loss_scale, metrics={'acc'},
+            ...                                          amp_level="O2", keep_batchnorm_fp32=False)
         """
 
         optim_name = type(optimizer).__name__

mindspore/train/train_thor/dataset_helper.py

@@ -51,8 +51,9 @@ class DatasetHelper:
 
     Args:
         dataset (DataSet): The training dataset iterator.
-        dataset_sink_mode (bool): If true use GetNext to fetch the data, or else feed the data from host. Default: True.
-        sink_size (int): Control the amount of data in each sink.
+        dataset_sink_mode (bool): If true use GetNext to fetch the data, or else feed the data from host.
+            Default: ``True``.
+        sink_size (int): Control the number of steps for each sinking.
                              If sink_size=-1, sink the complete dataset for each epoch.
                              If sink_size>0, sink sink_size data for each epoch. Default: -1.
         epoch_num (int): Control the number of epoch data to send. Default: 1.
@@ -146,7 +147,7 @@ class _DatasetIter:
         if hasattr(self.dataset, '__loop_size__'):
             sink_size = self.dataset.__loop_size__
         else:
-            if context.get_context("enable_ge") or context.get_context("device_target") == "Ascend":
+            if context.get_context("device_target") == "Ascend":
                 if self.sink_size > 0:
                     sink_size = self.sink_size
                 else:

mindspore/train/train_thor/model_thor.py

@@ -85,17 +85,17 @@ class ModelThor(Model):
         network (Cell): A training or testing network.
         loss_fn (Cell): Objective function, if loss_fn is None, the
                              network should contain the logic of loss and grads calculation, and the logic
-                             of parallel if needed. Default: None.
-        optimizer (Cell): Optimizer for updating the weights. Default: None.
+                             of parallel if needed. Default: ``None``.
+        optimizer (Cell): Optimizer for updating the weights. Default: ``None``.
         metrics (Union[dict, set]): A Dictionary or a set of metrics to be evaluated by the model during
-                        training and testing. eg: {'accuracy', 'recall'}. Default: None.
+                        training and testing. eg: {'accuracy', 'recall'}. Default: ``None``.
         eval_network (Cell): Network for evaluation. If not defined, `network` and `loss_fn` would be wrapped as
-                             `eval_network`. Default: None.
+                             `eval_network`. Default: ``None``.
         eval_indexes (list): When defining the `eval_network`, if `eval_indexes` is None, all outputs of the
                              `eval_network` would be passed to metrics, otherwise `eval_indexes` must contain three
                              elements, including the positions of loss value, predicted value and label. The loss
                              value would be passed to the `Loss` metric, the predicted value and label would be passed
-                             to other metric. Default: None.
+                             to other metric. Default: ``None``.
         amp_level (str): Option for argument `level` in `mindspore.amp.build_train_network`, level for mixed
             precision training. Supports [O0, O2, O3]. Default: "O0".
 
@@ -109,7 +109,7 @@ class ModelThor(Model):
             scale the loss by LossScaleManager. It is a key argument.
             e.g. Use `loss_scale_manager=None` to set the value.
         keep_batchnorm_fp32 (bool): Keep Batchnorm running in `float32`. If it is set to true, the level setting before
-            will be overwritten. Default: True.
+            will be overwritten. Default: ``True``.
     """
 
     def __init__(self, network, loss_fn=None, optimizer=None, metrics=None, eval_network=None,
@@ -199,8 +199,8 @@ class ModelThor(Model):
                                      returned and passed to the network. Otherwise, a tuple (data, label) should
                                      be returned. The data and label would be passed to the network and loss
                                      function respectively.
-            list_callback (Callback): Executor of callback list. Default: None.
-            cb_params (_InternalCallbackParam): Callback parameters. Default: None.
+            list_callback (Callback): Executor of callback list. Default: ``None``.
+            cb_params (_InternalCallbackParam): Callback parameters. Default: ``None``.
             sink_size (int): Control the amount of data in each sink. Default: -1.
             initial_epoch (int): Epoch at which to start train, it useful for resuming a previous training run.
                                  Default: 0.

mindspore/version.py

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

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

@@ -1,16 +1,15 @@
 Metadata-Version: 2.1
 Name: mindspore
-Version: 2.0.0rc1
+Version: 2.2.0
 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
+Download-URL: https://github.com/mindspore-ai/mindspore/tags
 Author: The MindSpore Authors
 Author-email: contact@mindspore.cn
 License: Apache 2.0
-Download-URL: https://github.com/mindspore-ai/mindspore/tags
 Project-URL: Sources, https://github.com/mindspore-ai/mindspore
 Project-URL: Issue Tracker, https://github.com/mindspore-ai/mindspore/issues
 Keywords: mindspore machine learning
-Platform: UNKNOWN
 Classifier: Development Status :: 4 - Beta
 Classifier: Environment :: Console
 Classifier: Intended Audience :: Science/Research
@@ -40,7 +39,7 @@ Requires-Dist: astunparse (>=1.6.3)
 
 [![PyPI - Python Version](https://img.shields.io/pypi/pyversions/mindspore.svg)](https://pypi.org/project/mindspore)
 [![PyPI](https://badge.fury.io/py/mindspore.svg)](https://badge.fury.io/py/mindspore)
-[![Downloads](https://pepy.tech/badge/mindspore)](https://pepy.tech/project/mindspore)
+[![Downloads](https://static.pepy.tech/badge/mindspore)](https://pepy.tech/project/mindspore)
 [![DockerHub](https://img.shields.io/docker/pulls/mindspore/mindspore-cpu.svg)](https://hub.docker.com/r/mindspore/mindspore-cpu)
 [![LICENSE](https://img.shields.io/github/license/mindspore-ai/mindspore.svg?style=flat-square)](https://github.com/mindspore-ai/mindspore/blob/master/LICENSE)
 [![Slack](https://img.shields.io/badge/slack-chat-green.svg?logo=slack)](https://join.slack.com/t/mindspore/shared_invite/zt-dgk65rli-3ex4xvS4wHX7UDmsQmfu8w)
@@ -319,10 +318,12 @@ Project stable branches will be in one of the following states:
 
 | **Branch** | **Status**   | **Initial Release Date** | **Next Phase**                         | **EOL Date**|
 |------------|--------------|--------------------------|----------------------------------------|-------------|
+| **r2.1**   | Maintained   | 2023-07-29               | Unmaintained <br> 2024-07-29 estimated |             |
+| **r2.0**   | Maintained   | 2023-06-15               | Unmaintained <br> 2024-06-15 estimated |             |
 | **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.8**   | End Of Life  | 2022-07-29               |                                        | 2023-07-29  |
+| **r1.7**   | End Of Life  | 2022-04-29               |                                        | 2023-04-29  |
 | **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  |
@@ -344,5 +345,3 @@ The release notes, see our [RELEASE](https://gitee.com/mindspore/mindspore/blob/
 ## License
 
 [Apache License 2.0](https://gitee.com/mindspore/mindspore/blob/master/LICENSE)
-
-