mindspore 2.3.0__cp310-cp310-win_amd64.whl → 2.4.1__cp310-cp310-win_amd64.whl

mindspore/dataset/engine/validators.py

@@ -27,7 +27,7 @@ from ..core.validator_helpers import parse_user_args, type_check, type_check_lis
     INT32_MAX, check_valid_detype, check_dir, check_file, check_sampler_shuffle_shard_options, \
     validate_dataset_param_value, check_padding_options, \
     check_num_parallel_workers, check_columns, check_pos_int32, check_valid_str, check_dataset_num_shards_shard_id, \
-    check_valid_list_tuple, check_int32
+    check_valid_list_tuple, check_int32, check_independent_mode
 
 from . import datasets
 from . import samplers
@@ -1035,6 +1035,7 @@ def check_minddataset(method):
         check_sampler_shuffle_shard_options(param_dict)
 
         check_padding_options(param_dict)
+        check_cache_option(param_dict.get('cache'))
         return method(self, *args, **kwargs)
 
     return new_method
@@ -1114,7 +1115,9 @@ def check_generatordataset(method):
         nreq_param_bool = ["shuffle", "python_multiprocessing"]
         validate_dataset_param_value(nreq_param_bool, param_dict, bool)
 
-        check_value(param_dict.get("max_rowsize"), [-1, INT32_MAX], "max_rowsize")
+        max_rowsize = param_dict.get("max_rowsize")
+        if max_rowsize is not None:
+            check_value(max_rowsize, [-1, INT32_MAX], "max_rowsize")
 
         num_shards = param_dict.get("num_shards")
         shard_id = param_dict.get("shard_id")
@@ -1282,7 +1285,7 @@ def get_batch_kwargs_from_dict(param_dict):
         input_columns = param_dict.get("input_columns", None)
         output_columns = param_dict.get("output_columns", None)
         python_multiprocessing = param_dict.get("python_multiprocessing", False)
-        max_rowsize = param_dict.get("max_rowsize", 16)
+        max_rowsize = param_dict.get("max_rowsize", None)
     return per_batch_map, input_columns, output_columns, python_multiprocessing, max_rowsize
 
 
@@ -1373,6 +1376,19 @@ def check_sync_wait(method):
         type_check(condition_name, (str,), "condition_name")
         type_check(num_batch, (int,), "num_batch")
 
+        check_independent_mode("Dataset sync wait")
+
+        return method(self, *args, **kwargs)
+
+    return new_method
+
+
+def check_sync_update(method):
+    """check the input arguments of sync_update."""
+
+    @wraps(method)
+    def new_method(self, *args, **kwargs):
+        check_independent_mode("Dataset sync update")
         return method(self, *args, **kwargs)
 
     return new_method
@@ -1398,7 +1414,7 @@ def get_map_kwargs_from_dict(param_dict):
     """get map operation kwargs parameters."""
     if param_dict is not None:
         python_multiprocessing = param_dict.get("python_multiprocessing", False)
-        max_rowsize = param_dict.get("max_rowsize", 16)
+        max_rowsize = param_dict.get("max_rowsize", None)
         cache = param_dict.get("cache", None)
         callbacks = param_dict.get("callbacks", None)
         offload = param_dict.get("offload", None)
@@ -1407,16 +1423,17 @@ def get_map_kwargs_from_dict(param_dict):
 
 def check_max_rowsize(max_rowsize):
     """check the max_rowsize"""
-    type_check(max_rowsize, (int, list), "max_rowsize")
-    if isinstance(max_rowsize, int):
-        type_check(max_rowsize, (int,), "max_rowsize")
-        check_value(max_rowsize, [-1, INT32_MAX], "max_rowsize")
-    elif isinstance(max_rowsize, list) and len(max_rowsize) == 2:
-        for index, value in enumerate(max_rowsize):
-            type_check(value, (int,), "max_rowsize[{}]".format(index))
-            check_value(value, [-1, INT32_MAX], "max_rowsizei[{}]".format(index))
-    else:
-        raise TypeError("max_rowsize should be a single integer or a list[in_rowsize, out_rowsize] of length 2.")
+    if max_rowsize is not None:
+        type_check(max_rowsize, (int, list), "max_rowsize")
+        if isinstance(max_rowsize, int):
+            type_check(max_rowsize, (int,), "max_rowsize")
+            check_value(max_rowsize, [-1, INT32_MAX], "max_rowsize")
+        elif isinstance(max_rowsize, list) and len(max_rowsize) == 2:
+            for index, value in enumerate(max_rowsize):
+                type_check(value, (int,), "max_rowsize[{}]".format(index))
+                check_value(value, [-1, INT32_MAX], "max_rowsizei[{}]".format(index))
+        else:
+            raise TypeError("max_rowsize should be a single integer or a list[in_rowsize, out_rowsize] of length 2.")
 
 
 def check_map(method):
@@ -1477,12 +1494,14 @@ def check_map(method):
         check_max_rowsize(max_rowsize)
         if offload is not None:
             type_check(offload, (bool,), "offload")
+            check_independent_mode("Dataset Offload", offload)
 
         if callbacks is not None:
             if isinstance(callbacks, (list, tuple)):
                 type_check_list(callbacks, (DSCallback,), "callbacks")
             else:
                 type_check(callbacks, (DSCallback,), "callbacks")
+            check_independent_mode("Dataset Callbacks")
 
         for param_name, param in zip(nreq_param_columns, [input_columns, output_columns]):
             if param is not None:
@@ -2020,6 +2039,7 @@ def check_cache_option(cache):
     """Sanity check for cache parameter"""
     if cache is not None:
         type_check(cache, (cache_client.DatasetCache,), "cache")
+        check_independent_mode("Dataset Cache")
 
 
 def check_to_device_send(method):

mindspore/dataset/text/__init__.py

@@ -24,9 +24,6 @@ Common imported modules in corresponding API examples are as follows:
     import mindspore.dataset as ds
     import mindspore.dataset.text as text
 
-See `Text Transforms
-<https://www.mindspore.cn/tutorials/en/master/beginner/transforms.html#text-transforms>`_ tutorial for more details.
-
 Descriptions of common data processing terms are as follows:
 
 - TensorOperation, the base class of all data processing operations implemented in C++.
@@ -38,7 +35,7 @@ The data transform operation can be executed in the data processing pipeline or
   `introduction to data processing pipeline <https://www.mindspore.cn/docs/en/master/api_python/
   mindspore.dataset.html#introduction-to-data-processing-pipeline>`_ .
 - Eager mode is more like a function call to process data. Examples refer to
-  `Lightweight Data Processing <https://www.mindspore.cn/tutorials/en/master/advanced/dataset/eager.html>`_ .
+  `Lightweight Data Processing <https://www.mindspore.cn/docs/en/master/model_train/dataset/eager.html>`_ .
 """
 import platform
 

mindspore/dataset/transforms/__init__.py

@@ -30,9 +30,6 @@ Note: Legacy c_transforms and py_transforms are deprecated but can still be impo
     from mindspore.dataset.transforms import c_transforms
     from mindspore.dataset.transforms import py_transforms
 
-See `Common Transforms
-<https://www.mindspore.cn/tutorials/en/master/beginner/transforms.html#common-transforms>`_ tutorial for more details.
-
 Descriptions of common data processing terms are as follows:
 
 - TensorOperation, the base class of all data processing operations implemented in C++.

mindspore/dataset/utils/line_reader.py

@@ -118,6 +118,8 @@ class LineReader:
 
     def close(self):
         """Close the file handle."""
+        if not hasattr(self, 'fo_handle'):
+            return
         if self.fo_handle is None:
             return
         self.fo_handle.close()

mindspore/dataset/vision/__init__.py

@@ -31,9 +31,6 @@ Note: Legacy c_transforms and py_transforms are deprecated but can still be impo
     import mindspore.dataset.vision.c_transforms as c_vision
     import mindspore.dataset.vision.py_transforms as py_vision
 
-See `Vision Transforms
-<https://www.mindspore.cn/tutorials/en/master/beginner/transforms.html#vision-transforms>`_ tutorial for more details.
-
 Descriptions of common data processing terms are as follows:
 
 - TensorOperation, the base class of all data processing operations implemented in C++.
@@ -46,7 +43,7 @@ The data transform operation can be executed in the data processing pipeline or
   `introduction to data processing pipeline <https://www.mindspore.cn/docs/en/master/api_python/
   mindspore.dataset.html#introduction-to-data-processing-pipeline>`_ .
 - Eager mode is more like a function call to process data. Examples refer to
-  `Lightweight Data Processing <https://www.mindspore.cn/tutorials/en/master/advanced/dataset/eager.html>`_ .
+  `Lightweight Data Processing <https://www.mindspore.cn/docs/en/master/model_train/dataset/eager.html>`_ .
 """
 from . import c_transforms
 from . import py_transforms

mindspore/dataset/vision/utils.py

@@ -263,7 +263,7 @@ class ConvertMode(IntEnum):
 
         mode = c_values.get(mode)
         if mode is None:
-            raise RuntimeError("Unsupported ConvertMode, see https://www.mindspore.cn/docs/zh-CN/master/api_python/"
+            raise RuntimeError("Unsupported ConvertMode, see https://www.mindspore.cn/docs/en/master/api_python/"
                                "dataset_vision/mindspore.dataset.vision.ConvertColor.html for more details.")
         return mode
 

mindspore/dataset/vision/validators.py

@@ -24,7 +24,7 @@ from mindspore.dataset.core.validator_helpers import check_value, check_uint8, F
     check_pos_float32, check_float32, check_2tuple, check_range, check_positive, INT32_MAX, INT32_MIN, \
     parse_user_args, type_check, type_check_list, check_c_tensor_op, UINT8_MAX, UINT8_MIN, check_value_normalize_std, \
     check_value_cutoff, check_value_ratio, check_odd, check_non_negative_float32, check_non_negative_int32, \
-    check_pos_int32, check_int32, check_tensor_op, deprecator_factory, check_valid_str
+    check_pos_int32, check_int32, check_tensor_op, deprecator_factory, check_valid_str, check_independent_mode
 from mindspore.dataset.transforms.validators import check_transform_op_type
 from .utils import Inter, Border, ImageBatchFormat, ConvertMode, SliceMode, AutoAugmentPolicy
 
@@ -358,6 +358,7 @@ def check_device_target(method):
     def new_method(self, *args, **kwargs):
         [device_target], _ = parse_user_args(method, *args, **kwargs)
         check_valid_str(device_target, ["CPU", "Ascend"], "device_target")
+        check_independent_mode("Transform in Ascend mode", (device_target == "Ascend"))
         return method(self, *args, **kwargs)
     return new_method
 

mindspore/{nn/extend → experimental/es}/__init__.py

@@ -12,18 +12,11 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 # ============================================================================
-"""
-nn Extend.
-"""
+"""Experimental module for EmbeddingService."""
 from __future__ import absolute_import
 
-from mindspore.nn.extend.embedding import Embedding
-from mindspore.nn.extend.basic import Linear
-from mindspore.nn.extend.pooling import MaxPool2d
-from mindspore.nn.extend import layer
-from mindspore.nn.extend.layer import *
+from mindspore.experimental.es.embedding_service import EmbeddingService
+from mindspore.experimental.es.embedding_service_layer import EsEmbeddingLookup, ESEmbeddingSmallTableLookup
 
-__all__ = ['Embedding', 'Linear', 'MaxPool2d']
-__all__.extend(layer.__all__)
 
-__all__.sort()
+__all__ = ['EmbeddingService', 'EsEmbeddingLookup', 'ESEmbeddingSmallTableLookup']