mindspore 2.3.0__cp39-none-any.whl → 2.3.0rc2__cp39-none-any.whl

mindspore/dataset/vision/utils.py

@@ -1,4 +1,4 @@
-# Copyright 2019-2024 Huawei Technologies Co., Ltd
+# Copyright 2019-2022 Huawei Technologies Co., Ltd
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -15,7 +15,6 @@
 Interpolation Mode, Resampling Filters
 """
 from enum import Enum, IntEnum
-from fractions import Fraction
 import numbers
 
 import numpy as np
@@ -627,125 +626,6 @@ def read_image(filename, mode=ImageReadMode.UNCHANGED):
     return cde.read_image(filename, ImageReadMode.to_c_type(mode)).as_array()
 
 
-def read_video(filename, start_pts=0, end_pts=None, pts_unit="pts"):
-    """
-    Read the video, audio, metadata from a video file.
-
-    It supports AVI, H264, H265, MOV, MP4, WMV file formats.
-
-    Args:
-        filename(str): The path to the video file to be read.
-        start_pts(Union[float, Fraction, int], optional): The start presentation timestamp of the video. Default: 0.
-        end_pts(Union[float, Fraction, int], optional): The end presentation timestamp of the video. Default: None.
-            The None is represented by 2147483647.
-        pts_unit(str, optional): The unit of the timestamps. It can be any of ["pts", "sec"]. Default: "pts".
-
-    Returns:
-        - numpy.ndarray, four dimensions uint8 data for video. The format is [T, H, W, C]. `T` is the number of frames,
-          `H` is the height, `W` is the width, `C` is the channel for RGB.
-        - numpy.ndarray, two dimensions float for audio. The format is [C, L]. `C` is the number of channels.
-          `L` is the length of the points in one channel.
-        - dict, metadata for the video and audio.
-          It contains video_fps data of type float and audio_fps data of type int.
-
-    Raises:
-        TypeError: If `filename` is not of type str.
-        TypeError: If `start_pts` is not of type [float, Fraction, int].
-        TypeError: If `end_pts` is not of type [float, Fraction, int].
-        TypeError: If `pts_unit` is not of type str.
-        RuntimeError: If `filename` does not exist, or not a regular file, or not a supported video file.
-        ValueError: If `start_pts` is less than 0.
-        ValueError: If `end_pts` is less than `start_pts`.
-        ValueError: If `pts_unit` is not in ["pts", "sec"].
-
-    Supported Platforms:
-        ``CPU``
-
-    Examples:
-        >>> import mindspore.dataset.vision as vision
-        >>> video_output, audio_output, metadata_output = vision.read_video("/path/to/file")
-    """
-    if not isinstance(filename, str):
-        raise TypeError("Input filename is not of type {0}, but got: {1}.".format(str, type(filename)))
-    if not isinstance(start_pts, (float, Fraction, int)):
-        raise TypeError("Input start_pts is not of type [{0}, {1}, {2}], but got: {3}".format(float, Fraction, int,
-                                                                                              type(start_pts)))
-    if start_pts < 0.0:
-        err_msg = "Not supported start_pts for " + str(start_pts) + ". The start_pts should be >= 0."
-        raise ValueError(err_msg)
-    if end_pts is None:
-        end_pts = 2147483647.0
-    if not isinstance(end_pts, (float, Fraction, int)):
-        raise TypeError("Input end_pts is not of type [{0}, {1}, {2}], but got: {3}".format(float, Fraction, int,
-                                                                                            type(end_pts)))
-    if end_pts < start_pts:
-        err_msg = "Not supported end_pts for " + str(end_pts) + ". start_pts = " + str(start_pts) + "."
-        err_msg += " The end_pts should be >= start_pts."
-        raise ValueError(err_msg)
-    if not isinstance(pts_unit, str):
-        raise TypeError("Input pts_unit is not of type {0}, but got: {1}.".format(str, type(pts_unit)))
-    if pts_unit not in ["pts", "sec"]:
-        raise ValueError("Not supported pts_unit for " + pts_unit)
-
-    video_output, audio_output, raw_metadata = cde.read_video(filename, float(start_pts), float(end_pts), pts_unit)
-
-    if video_output is not None:
-        video_output = video_output.as_array()
-    if audio_output is not None:
-        audio_output = audio_output.as_array()
-    metadata_output = {}
-    for key in raw_metadata:
-        if key == "video_fps":
-            metadata_output[key] = float(raw_metadata[key])
-            continue
-        if key == "audio_fps":
-            metadata_output[key] = int(raw_metadata[key])
-            continue
-        metadata_output[key] = raw_metadata[key]
-    return video_output, audio_output, metadata_output
-
-
-def read_video_timestamps(filename, pts_unit="pts"):
-    """
-    Read the timestamps and frames per second of a video file.
-    It supports AVI, H264, H265, MOV, MP4, WMV files.
-
-    Args:
-        filename(str): The path to the video file to be read.
-        pts_unit(str, optional): The unit of the timestamps. It can be any of ["pts", "sec"]. Default: "pts".
-
-    Returns:
-        - list, when `pts_unit` is set to "pts", list[int] is returned, when `pts_unit` is set to "sec",
-          list[float] is returned.
-        - float, the frames per second of the video file.
-
-    Raises:
-        TypeError: If `filename` is not of type str.
-        TypeError: If `pts_unit` is not of type str.
-        RuntimeError: If `filename` does not exist, or not a regular file, or not a supported video file.
-        RuntimeError: If `pts_unit` is not in ["pts", "sec"].
-
-    Supported Platforms:
-        ``CPU``
-
-    Examples:
-        >>> import mindspore.dataset.vision as vision
-        >>> video_timestamps, video_fps = vision.read_video_timestamps("/path/to/file")
-    """
-    if not isinstance(filename, str):
-        raise TypeError("Input filename is not of type {0}, but got: {1}.".format(str, type(filename)))
-    if not isinstance(pts_unit, str):
-        raise TypeError("Input pts_unit is not of type {0}, but got: {1}.".format(str, type(pts_unit)))
-
-    video_pts, video_fps, time_base = cde.read_video_timestamps(filename, pts_unit)
-
-    if video_pts == []:
-        return video_pts, None
-    if pts_unit == "pts":
-        return video_pts, video_fps
-    return [x * time_base for x in video_pts], video_fps
-
-
 def write_file(filename, data):
     """
     Write the one dimension uint8 data into a file using binary mode.

mindspore/dataset/vision/validators.py

@@ -59,6 +59,8 @@ def check_affine(method):
             check_value(shear, [-180, 180], "shear")
 
         type_check(resample, (Inter,), "resample")
+        if resample in [Inter.ANTIALIAS, Inter.PILCUBIC]:
+            raise RuntimeError("Unsupported interpolation, only NEAREST, LINEAR, CUBIC and AREA.")
 
         check_fill_value(fill_value)
 
@@ -286,15 +288,7 @@ def check_erase(method):
         check_pos_int32(height, "height")
         check_pos_int32(width, "width")
         type_check(inplace, (bool,), "inplace")
-        type_check(value, (float, int, tuple), "value")
-        if isinstance(value, (float, int)):
-            value = tuple([value] * 3)
-        type_check_list(value, (float, int), "value")
-        if isinstance(value, tuple) and len(value) == 3:
-            for i, val in enumerate(value):
-                check_value(val, (UINT8_MIN, UINT8_MAX), "value[{}]".format(i))
-        else:
-            raise TypeError("value should be a single integer/float or a 3-tuple.")
+        check_fill_value(value)
 
         return method(self, *args, **kwargs)
 

mindspore/hal/__init__.py

@@ -24,17 +24,11 @@ from mindspore.hal.device import is_initialized, is_available, device_count, get
 from mindspore.hal.stream import Stream, synchronize, set_cur_stream, current_stream, default_stream,\
                                  StreamCtx
 from mindspore.hal.event import Event
-from mindspore.hal.memory import memory_stats, memory_reserved, max_memory_reserved, empty_cache,\
-                                 reset_peak_memory_stats, memory_summary, memory_allocated,\
-                                 max_memory_allocated, reset_max_memory_reserved, reset_max_memory_allocated
 
 __all__ = [
     "is_initialized", "is_available", "device_count", "get_device_capability",
     "get_device_properties", "get_device_name", "get_arch_list",
-    "Event", "Stream", "synchronize", "set_cur_stream", "current_stream", "default_stream", "StreamCtx",
-    "memory_stats", "memory_reserved", "max_memory_reserved", "empty_cache", "reset_peak_memory_stats",
-    "memory_summary", "memory_allocated", "max_memory_allocated", "reset_max_memory_reserved",
-    "reset_max_memory_allocated"
+    "Event", "Stream", "synchronize", "set_cur_stream", "current_stream", "default_stream", "StreamCtx"
 ]
 
 __all__.sort()

mindspore/hal/device.py

@@ -152,7 +152,7 @@ def is_initialized(device_target):
                          f"{valid_targets}, but got {device_target}.")
     _device_context = _device_context_mgr.get_device_context(device_target)
     if _device_context is None:
-        logger.info(f"Backend {device_target} is not created yet.")
+        logger.warning(f"Backend {device_target} is not created yet.")
         return False
     return _device_context.initialized()
 

mindspore/include/api/model.h

@@ -370,9 +370,6 @@ class MS_API Model {
   /// \return The value of the model info associated with the given key.
   inline std::string GetModelInfo(const std::string &key);
 
-  // release inference resourcec, only used for mindspore_lite's ascend backend now.
-  Status Finalize();
-
  private:
   friend class Serialization;
   // api without std::string

mindspore/include/dataset/vision.h

@@ -1,5 +1,5 @@
 /**
- * Copyright 2020-2024 Huawei Technologies Co., Ltd
+ * Copyright 2020-2023 Huawei Technologies Co., Ltd
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,7 +20,6 @@
 #include <map>
 #include <memory>
 #include <string>
-#include <tuple>
 #include <utility>
 #include <vector>
 
@@ -441,36 +440,6 @@ class DATASET_API CutOut final : public TensorTransform {
   std::shared_ptr<Data> data_;
 };
 
-/// \brief Decode the input video.
-class DATASET_API DecodeVideo final : public TensorTransform {
- public:
-  /// \brief Constructor. It will decode a vector containing a raw video tensor into a vector containing two tensors.
-  ///     The raw video tensor in the input vector should be 1D array of UINT8.
-  ///     The first tensor in the output vector is a visual tensor, the shape is <T,H,W,C>, the type is DE_UINT8. Pixel
-  ///     order is RGB. The second tensor in the output vector is an audio tensor, the shape is <C, L>.
-  /// \par Example
-  /// \code
-  ///     /* Read video file into tensor */
-  ///     mindspore::MSTensor video;
-  ///     ASSERT_OK(mindspore::dataset::vision::ReadFile("/path/to/video/file", &video));
-  ///     std::vector<mindspore::MSTensor> input_tensor;
-  ///     std::vector<mindspore::MSTensor> output_tensor;
-  ///     input_tensor.push_back(video);
-  ///     auto decode_video = vision::DecodeVideo();
-  ///     auto transform = Execute(decode_video);
-  ///     Status rc = transform(input_tensor, &output_tensor);
-  /// \endcode
-  DecodeVideo();
-
-  /// \brief Destructor.
-  ~DecodeVideo() = default;
-
- protected:
-  /// \brief The function to convert a TensorTransform object into a TensorOperation object.
-  /// \return Shared pointer to TensorOperation object.
-  std::shared_ptr<TensorOperation> Parse() override;
-};
-
 /// \brief Encode the image as JPEG data.
 /// \param[in] image The image to be encoded.
 /// \param[out] output The Tensor data.
@@ -526,7 +495,7 @@ class DATASET_API Erase final : public TensorTransform {
   ///                             std::make_shared<vision::Erase>(10, 10, 10, 10)}, // operations
   ///                            {"image"});                                        // input columns
   /// \endcode
-  Erase(int32_t top, int32_t left, int32_t height, int32_t width, const std::vector<float> &value = {0., 0., 0.},
+  Erase(int32_t top, int32_t left, int32_t height, int32_t width, const std::vector<uint8_t> &value = {0, 0, 0},
         bool inplace = false);
 
   /// \brief Destructor.
@@ -1717,27 +1686,6 @@ Status DATASET_API ReadFile(const std::string &filename, mindspore::MSTensor *ou
 Status DATASET_API ReadImage(const std::string &filename, mindspore::MSTensor *output,
                              ImageReadMode mode = ImageReadMode::kUNCHANGED);
 
-/// \brief Read the video, audio, metadata from a video file. It supports AVI, H264, H265, MOV, MP4, WMV file formats.
-/// \param[in] filename The path to the videoe file to be read.
-/// \param[out] video_output The video frames of the video file.
-/// \param[out] audio_output The audio frames of the video file.
-/// \param[out] metadata_output The metadata contains video_fps, audio_fps.
-/// \param[in] start_pts The start presentation timestamp of the video. Default: 0.0.
-/// \param[in] end_pts The end presentation timestamp of the video. Default: 2147483647.0.
-/// \param[in] pts_unit The unit for the timestamps, can be one of ["pts", "sec"]. Default: "pts".
-/// \return The status code.
-Status DATASET_API ReadVideo(const std::string &filename, mindspore::MSTensor *video_output,
-                             mindspore::MSTensor *audio_output, std::map<std::string, std::string> *metadata_output,
-                             float start_pts = 0.0, float end_pts = 2147483647.0, const std::string &pts_unit = "pts");
-
-/// \brief Read the timestamps and frame rate of a video file. It supports AVI, H264, H265, MOV, MP4, WMV files.
-/// \param[in] filename The path to the videoe file to be read.
-/// \param[out] output The tuple(video_timestamps, video_fps) of the video.
-/// \param[in] pts_unit The unit for the timestamps, can be one of ["pts", "sec"]. Default: "pts".
-/// \return The status code.
-Status DATASET_API ReadVideoTimestamps(const std::string &filename, std::tuple<std::vector<float>, float> *output,
-                                       const std::string &pts_unit = "pts");
-
 /// \brief Crop the given image and zoom to the specified size.
 class DATASET_API ResizedCrop final : public TensorTransform {
  public:

mindspore/include/mindapi/base/types.h

@@ -104,7 +104,6 @@ enum Reduction : int64_t {
   REDUCTION_SUM = 0,
   MEAN = 1,
   NONE = 2,
-  UPDATE = 3,
 };
 
 enum PadMode : int64_t {

mindspore/lib/plugin/ascend/custom_aicore_ops/op_impl/ai_core/tbe/config/ascend310p/aic-ascend310p-ops-info.json

@@ -89,41 +89,6 @@
             "paramType":"required"
         }
     },
-    "KVCacheMgr":{
-        "input0":{
-            "dtype":"float32, int32, uint32, float16, int16, uint16, int8, uint8",
-            "format":"ND,ND,ND,ND,ND,ND,ND,ND",
-            "name":"past",
-            "paramType":"required"
-        },
-        "input1":{
-            "dtype":"float32, int32, uint32, float16, int16, uint16, int8, uint8",
-            "format":"ND,ND,ND,ND,ND,ND,ND,ND",
-            "name":"cur",
-            "paramType":"required"
-        },
-        "input2":{
-            "dtype":"int32,int32,int32,int32,int32,int32,int32,int32",
-            "format":"ND,ND,ND,ND,ND,ND,ND,ND",
-            "name":"index",
-            "paramType":"required"
-        },
-        "needCheckSupport":{
-            "flag":"true"
-        },
-        "opFile":{
-            "value":"kv_cache_mgr"
-        },
-        "opInterface":{
-            "value":"kv_cache_mgr"
-        },
-        "output0":{
-            "dtype":"float32, int32, uint32, float16, int16, uint16, int8, uint8",
-            "format":"ND,ND,ND,ND,ND,ND,ND,ND",
-            "name":"past",
-            "paramType":"required"
-        }
-    },
     "MatmulTik":{
         "input0":{
             "dtype":"int8,uint8,float16",

mindspore/lib/plugin/ascend/custom_aicore_ops/op_impl/ai_core/tbe/custom_aicore_ops_impl/kv_cache_mgr.py

@@ -180,8 +180,6 @@ class KVCacheImpl(TilingHelper):
             bs_idx = core_idx * self.each_core_bs_num + each_core_bs_idx
             # because we fused bs * num_head, we need get the real bs_idx
             valid_idx.set_as(index_ub[bs_idx // self.num_head])
-            with self.tik_inst.if_scope(valid_idx >= self.seq_length):
-                self.tik_inst.tik_continue()
             with self.tik_inst.if_scope(valid_idx >= 0):
                 dst_offset = bs_idx * dst_bs_stride + valid_idx * self.size_per_head
                 src_offset = each_core_bs_idx * src_bs_stride

mindspore/lib/plugin/ascend/custom_aicore_ops/op_impl/vector_core/tbe/custom_aicore_ops_impl/kv_cache_mgr.py

@@ -180,8 +180,6 @@ class KVCacheImpl(TilingHelper):
             bs_idx = core_idx * self.each_core_bs_num + each_core_bs_idx
             # because we fused bs * num_head, we need get the real bs_idx
             valid_idx.set_as(index_ub[bs_idx // self.num_head])
-            with self.tik_inst.if_scope(valid_idx >= self.seq_length):
-                self.tik_inst.tik_continue()
             with self.tik_inst.if_scope(valid_idx >= 0):
                 dst_offset = bs_idx * dst_bs_stride + valid_idx * self.size_per_head
                 src_offset = each_core_bs_idx * src_bs_stride

mindspore/lib/plugin/ascend/custom_aicpu_ops/op_impl/cpu/config/cust_aicpu_kernel.json

@@ -8029,42 +8029,6 @@
             "type":"DT_FLOAT,DT_FLOAT16,DT_DOUBLE,DT_UINT8,DT_INT8,DT_UINT16,DT_INT16,DT_INT32,DT_UINT32,DT_UINT64,DT_INT64,DT_COMPLEX128,DT_COMPLEX64"
         }
     },
-    "CustTopKRouter":{
-        "input0":{
-            "name":"x",
-            "type":"DT_INT32,DT_INT64"
-        },
-        "input1":{
-            "name":"capcity",
-            "type":"DT_INT64"
-        },
-        "input2":{
-            "name":"expert_num",
-            "type":"DT_INT64"
-        },
-        "opInfo":{
-            "computeCost":"100",
-            "engine":"DNN_VM_AICPU",
-            "flagAsync":"False",
-            "flagPartial":"False",
-            "formatAgnostic":"False",
-            "functionName":"RunCpuKernel",
-            "kernelSo":"libcust_cpu_kernels.so",
-            "opKernelLib":"CUSTAICPUKernel",
-            "opsFlag":"OPS_FLAG_CLOSE",
-            "subTypeOfInferShape":"1",
-            "userDefined":"True",
-            "workspaceSize":"1024"
-        },
-        "output0":{
-            "name":"dispatch_index",
-            "type":"DT_INT32,DT_INT64"
-        },
-        "output1":{
-            "name":"combine_index",
-            "type":"DT_INT32,DT_INT64"
-        }
-    },
     "CustTrace":{
         "input0":{
             "format":"ND",
@@ -13328,42 +13292,6 @@
             "type":"DT_FLOAT,DT_FLOAT16,DT_DOUBLE,DT_UINT8,DT_INT8,DT_UINT16,DT_INT16,DT_INT32,DT_UINT32,DT_UINT64,DT_INT64,DT_COMPLEX128,DT_COMPLEX64"
         }
     },
-    "TopKRouter":{
-        "input0":{
-            "name":"x",
-            "type":"DT_INT32,DT_INT64"
-        },
-        "input1":{
-            "name":"capcity",
-            "type":"DT_INT64"
-        },
-        "input2":{
-            "name":"expert_num",
-            "type":"DT_INT64"
-        },
-        "opInfo":{
-            "computeCost":"100",
-            "engine":"DNN_VM_AICPU",
-            "flagAsync":"False",
-            "flagPartial":"False",
-            "formatAgnostic":"False",
-            "functionName":"RunCpuKernel",
-            "kernelSo":"libcust_cpu_kernels.so",
-            "opKernelLib":"CUSTAICPUKernel",
-            "opsFlag":"OPS_FLAG_CLOSE",
-            "subTypeOfInferShape":"1",
-            "userDefined":"True",
-            "workspaceSize":"1024"
-        },
-        "output0":{
-            "name":"dispatch_index",
-            "type":"DT_INT32,DT_INT64"
-        },
-        "output1":{
-            "name":"combine_index",
-            "type":"DT_INT32,DT_INT64"
-        }
-    },
     "Trace":{
         "input0":{
             "format":"ND",

mindspore/lib/plugin/ascend/custom_ascendc_ops/op_api/include/{aclnn_all_finite.h → aclnn_add_custom.h}

@@ -3,8 +3,8 @@
  * calution: this file was generated automaticlly donot change it.
 */
 
-#ifndef ACLNN_ALL_FINITE_H_
-#define ACLNN_ALL_FINITE_H_
+#ifndef ACLNN_ADD_CUSTOM_H_
+#define ACLNN_ADD_CUSTOM_H_
 
 #include "aclnn/acl_meta.h"
 
@@ -12,21 +12,23 @@
 extern "C" {
 #endif
 
-/* funtion: aclnnAllFiniteGetWorkspaceSize
+/* funtion: aclnnAddCustomGetWorkspaceSize
  * parameters :
- * gradient : required
+ * x : required
+ * y : required
  * out : required
  * workspaceSize : size of workspace(output).
  * executor : executor context(output).
  */
 __attribute__((visibility("default")))
-aclnnStatus aclnnAllFiniteGetWorkspaceSize(
-    const aclTensor *gradient,
+aclnnStatus aclnnAddCustomGetWorkspaceSize(
+    const aclTensor *x,
+    const aclTensor *y,
     const aclTensor *out,
     uint64_t *workspaceSize,
     aclOpExecutor **executor);
 
-/* funtion: aclnnAllFinite
+/* funtion: aclnnAddCustom
  * parameters :
  * workspace : workspace memory addr(input).
  * workspaceSize : size of workspace(input).
@@ -34,11 +36,11 @@ aclnnStatus aclnnAllFiniteGetWorkspaceSize(
  * stream : acl stream.
  */
 __attribute__((visibility("default")))
-aclnnStatus aclnnAllFinite(
+aclnnStatus aclnnAddCustom(
     void *workspace,
     uint64_t workspaceSize,
     aclOpExecutor *executor,
-    aclrtStream stream);
+    const aclrtStream stream);
 
 #ifdef __cplusplus
 }

mindspore/lib/plugin/ascend/custom_ascendc_ops/op_api/include/aclnn_decoder_kv_cache.h

@@ -50,7 +50,7 @@ aclnnStatus aclnnDecoderKvCache(
     void *workspace,
     uint64_t workspaceSize,
     aclOpExecutor *executor,
-    aclrtStream stream);
+    const aclrtStream stream);
 
 #ifdef __cplusplus
 }

mindspore/lib/plugin/ascend/custom_ascendc_ops/op_api/include/aclnn_prompt_kv_cache.h

@@ -50,7 +50,7 @@ aclnnStatus aclnnPromptKvCache(
     void *workspace,
     uint64_t workspaceSize,
     aclOpExecutor *executor,
-    aclrtStream stream);
+    const aclrtStream stream);
 
 #ifdef __cplusplus
 }