mindspore 2.2.0__cp37-cp37m-manylinux1_x86_64.whl → 2.2.11__cp37-cp37m-manylinux1_x86_64.whl

mindspore/dataset/vision/transforms.py

@@ -144,14 +144,14 @@ class AdjustBrightness(ImageTensorOperation, PyTensorOperation):
 
         Args:
             device_target (str, optional): The operator will be executed on this device. Currently supports
-                ``CPU`` and ``Ascend`` , where ``Ascend`` refers to Ascend910B device. Default: ``CPU`` .
+                ``CPU`` . Default: ``CPU`` .
 
         Raises:
             TypeError: If `device_target` is not of type str.
-            ValueError: If `device_target` is not within the valid set of ['CPU', 'Ascend'].
+            ValueError: If `device_target` is not ``CPU`` .
 
         Supported Platforms:
-            ``CPU`` ``Ascend``
+            ``CPU``
 
         Examples:
             >>> import mindspore.dataset as ds
@@ -227,14 +227,14 @@ class AdjustContrast(ImageTensorOperation, PyTensorOperation):
 
         Args:
             device_target (str, optional): The operator will be executed on this device. Currently supports
-                ``CPU`` and ``Ascend`` , where ``Ascend`` refers to Ascend910B device. Default: ``CPU`` .
+                ``CPU`` . Default: ``CPU`` .
 
         Raises:
             TypeError: If `device_target` is not of type str.
-            ValueError: If `device_target` is not within the valid set of ['CPU', 'Ascend'].
+            ValueError: If `device_target` is not ``CPU`` .
 
         Supported Platforms:
-            ``CPU`` ``Ascend``
+            ``CPU``
 
         Examples:
             >>> import mindspore.dataset as ds
@@ -373,14 +373,14 @@ class AdjustHue(ImageTensorOperation, PyTensorOperation):
 
         Args:
             device_target (str, optional): The operator will be executed on this device. Currently supports
-                ``CPU`` and ``Ascend`` , where ``Ascend`` refers to Ascend910B device. Default: ``CPU`` .
+                ``CPU`` . Default: ``CPU`` .
 
         Raises:
             TypeError: If `device_target` is not of type str.
-            ValueError: If `device_target` is not within the valid set of ['CPU', 'Ascend'].
+            ValueError: If `device_target` is not ``CPU`` .
 
         Supported Platforms:
-            ``CPU`` ``Ascend``
+            ``CPU``
 
         Examples:
             >>> import mindspore.dataset as ds
@@ -457,14 +457,14 @@ class AdjustSaturation(ImageTensorOperation, PyTensorOperation):
 
         Args:
             device_target (str, optional): The operator will be executed on this device. Currently supports
-                ``CPU`` and ``Ascend`` , where ``Ascend`` refers to Ascend910B device. Default: ``CPU`` .
+                ``CPU`` . Default: ``CPU`` .
 
         Raises:
             TypeError: If `device_target` is not of type str.
-            ValueError: If `device_target` is not within the valid set of ['CPU', 'Ascend'].
+            ValueError: If `device_target` is not ``CPU`` .
 
         Supported Platforms:
-            ``CPU`` ``Ascend``
+            ``CPU``
 
         Examples:
             >>> import mindspore.dataset as ds
@@ -1159,14 +1159,14 @@ class Decode(ImageTensorOperation, PyTensorOperation):
 
         Args:
             device_target (str, optional): The operator will be executed on this device. Currently supports
-                ``CPU`` and ``Ascend`` , where ``Ascend`` refers to Ascend910B device. Default: ``CPU`` .
+                ``CPU`` . Default: ``CPU`` .
 
         Raises:
             TypeError: If `device_target` is not of type str.
-            ValueError: If `device_target` is not within the valid set of ['CPU', 'Ascend'].
+            ValueError: If `device_target` is not ``CPU`` .
 
         Supported Platforms:
-            ``CPU`` ``Ascend``
+            ``CPU``
 
         Examples:
             >>> import mindspore.dataset as ds
@@ -1908,14 +1908,14 @@ class Normalize(ImageTensorOperation):
 
         Args:
             device_target (str, optional): The operator will be executed on this device. Currently supports
-                ``CPU`` and ``Ascend`` , where ``Ascend`` refers to Ascend910B device. Default: ``CPU`` .
+                ``CPU`` . Default: ``CPU`` .
 
         Raises:
             TypeError: If `device_target` is not of type str.
-            ValueError: If `device_target` is not within the valid set of ['CPU', 'Ascend'].
+            ValueError: If `device_target` is not ``CPU`` .
 
         Supported Platforms:
-            ``CPU`` ``Ascend``
+            ``CPU``
 
         Examples:
             >>> import mindspore.dataset as ds
@@ -4182,14 +4182,14 @@ class Resize(ImageTensorOperation, PyTensorOperation):
 
         Args:
             device_target (str, optional): The operator will be executed on this device. Currently supports
-                ``CPU`` and ``Ascend`` , where ``Ascend`` refers to Ascend910B device. Default: ``CPU`` .
+                ``CPU`` . Default: ``CPU`` .
 
         Raises:
             TypeError: If `device_target` is not of type str.
-            ValueError: If `device_target` is not within the valid set of ['CPU', 'Ascend'].
+            ValueError: If `device_target` is not ``CPU`` .
 
         Supported Platforms:
-            ``CPU`` ``Ascend``
+            ``CPU``
 
         Examples:
             >>> import mindspore.dataset as ds

mindspore/experimental/optim/adam.py

@@ -43,7 +43,7 @@ def _run_adam_with_amsgrad_opt(opt, beta1_power, beta2_power, lr, gradient, para
 
 class Adam(Optimizer):
     r"""
-    Implements Adam algorithm..
+    Implements Adam algorithm.
 
     The updating formulas are as follows:
 

mindspore/gen_ops.py

@@ -120,7 +120,7 @@ def generate_py_primitive(yaml_data):
                 assign_str += arg_name
             args_assign.append(assign_str)
 
-        args_assign = '\n'.join(assign for assign in args_assign)
+        args_assign = '\n'.join([assign for assign in args_assign])
         primitive_code = f"""
 class {class_name}(Primitive):
     def __init__(self, {', '.join(init_args_with_default)}):

mindspore/include/api/model.h

@@ -136,6 +136,13 @@ class MS_API Model {
   /// \return Status.
   Status UpdateWeights(const std::vector<MSTensor> &new_weights);
 
+  /// \brief Change the size and or content of weight tensors
+  ///
+  /// \param[in]  A vector where model constant are arranged in sequence
+  ///
+  /// \return Status.
+  Status UpdateWeights(const std::vector<std::vector<MSTensor>> &new_weights);
+
   /// \brief Inference model API. If use this API in train mode, it's equal to RunStep API.
   ///
   /// \param[in] inputs A vector where model inputs are arranged in sequence.
@@ -358,6 +365,13 @@ class MS_API Model {
 
   const std::shared_ptr<ModelImpl> impl() const { return impl_; }
 
+  /// \brief Get model info by key
+  ///
+  /// \param[in] key The key of model info key-value pair
+  ///
+  /// \return The value of the model info associated with the given key.
+  inline std::string GetModelInfo(const std::string &key);
+
  private:
   friend class Serialization;
   // api without std::string
@@ -374,6 +388,7 @@ class MS_API Model {
                const std::vector<char> &cropto_lib_path);
   Status Build(const std::vector<char> &model_path, ModelType model_type, const std::shared_ptr<Context> &model_context,
                const Key &dec_key, const std::vector<char> &dec_mode, const std::vector<char> &cropto_lib_path);
+  std::vector<char> GetModelInfo(const std::vector<char> &key);
   std::shared_ptr<ModelImpl> impl_;
 };
 
@@ -416,5 +431,7 @@ Status Model::Build(const std::string &model_path, ModelType model_type,
                     const std::shared_ptr<Context> &model_context) {
   return Build(StringToChar(model_path), model_type, model_context);
 }
+
+inline std::string Model::GetModelInfo(const std::string &key) { return CharToString(GetModelInfo(StringToChar(key))); }
 }  // namespace mindspore
 #endif  // MINDSPORE_INCLUDE_API_MODEL_H

mindspore/include/api/status.h

@@ -83,9 +83,14 @@ enum StatusCode : uint32_t {
   kLiteModelRebuild = kLite | (0x0FFFFFFF & -12),    /**< Model has been built. */
 
   // Executor error code, range: [-100,-200)
-  kLiteOutOfTensorRange = kLite | (0x0FFFFFFF & -100), /**< Failed to check range. */
-  kLiteInputTensorError = kLite | (0x0FFFFFFF & -101), /**< Failed to check input tensor. */
-  kLiteReentrantError = kLite | (0x0FFFFFFF & -102),   /**< Exist executor running. */
+  kLiteOutOfTensorRange = kLite | (0x0FFFFFFF & -100),           /**< Failed to check range. */
+  kLiteInputTensorError = kLite | (0x0FFFFFFF & -101),           /**< Failed to check input tensor. */
+  kLiteReentrantError = kLite | (0x0FFFFFFF & -102),             /**< Exist executor running. */
+  kLiteLLMWaitProcessTimeOut = kLite | (0x0FFFFFFF & -103),      /**< Wait to be processed time out. */
+  kLiteLLMKVCacheNotExist = kLite | (0x0FFFFFFF & -104),         /**< KV Cache not exist. */
+  kLiteLLMRepeatRequest = kLite | (0x0FFFFFFF & -105),           /**< repeat request. */
+  kLiteLLMRequestAlreadyCompleted = kLite | (0x0FFFFFFF & -106), /**< request already complete!. */
+  kLiteLLMEngineFinalized = kLite | (0x0FFFFFFF & -107),         /**< llm engine finalized. */
 
   // Graph error code, range: [-200,-300)
   kLiteGraphFileError = kLite | (0x0FFFFFFF & -200), /**< Failed to verify graph file. */

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

@@ -0,0 +1,123 @@
+{
+    "AddDSL":{
+        "input0":{
+            "dtype":"float16",
+            "format":"NCHW",
+            "name":"x1",
+            "paramType":"required"
+        },
+        "input1":{
+            "dtype":"float16",
+            "format":"NCHW",
+            "name":"x2",
+            "paramType":"required"
+        },
+        "opFile":{
+            "value":"add_dsl"
+        },
+        "opInterface":{
+            "value":"add_dsl"
+        },
+        "output0":{
+            "dtype":"float16",
+            "format":"NCHW",
+            "name":"y",
+            "paramType":"required"
+        }
+    },
+    "AddTik":{
+        "input0":{
+            "dtype":"float16",
+            "format":"ND",
+            "name":"x1",
+            "paramType":"required"
+        },
+        "input1":{
+            "dtype":"float16",
+            "format":"ND",
+            "name":"x2",
+            "paramType":"required"
+        },
+        "opFile":{
+            "value":"add_tik"
+        },
+        "opInterface":{
+            "value":"add_tik"
+        },
+        "output0":{
+            "dtype":"float16",
+            "format":"ND",
+            "name":"y",
+            "paramType":"required"
+        }
+    },
+    "FlashAttention":{
+        "input0":{
+            "dtype":"float16,float32,int32",
+            "format":"ND,ND,ND",
+            "name":"q",
+            "paramType":"required"
+        },
+        "input1":{
+            "dtype":"float16,float32,int32",
+            "format":"ND,ND,ND",
+            "name":"k",
+            "paramType":"required"
+        },
+        "input2":{
+            "dtype":"float16,float32,int32",
+            "format":"ND,ND,ND",
+            "name":"v",
+            "paramType":"required"
+        },
+        "input3":{
+            "dtype":"float16,float32,int32",
+            "format":"ND,ND,ND",
+            "name":"attention_mask",
+            "paramType":"required"
+        },
+        "opFile":{
+            "value":"flash_attention"
+        },
+        "opInterface":{
+            "value":"flash_attention"
+        },
+        "output0":{
+            "dtype":"float16,float32,int32",
+            "format":"ND,ND,ND",
+            "name":"y",
+            "paramType":"required"
+        }
+    },
+    "MatmulTik":{
+        "input0":{
+            "dtype":"int8,uint8,float16",
+            "format":"ND,ND,ND",
+            "name":"x1",
+            "needCompile":"false",
+            "paramType":"required",
+            "shape":"all"
+        },
+        "input1":{
+            "dtype":"int8,int8,float16",
+            "format":"ND,ND,ND",
+            "name":"x2",
+            "needCompile":"false",
+            "paramType":"required",
+            "shape":"all"
+        },
+        "opFile":{
+            "value":"matmul_tik"
+        },
+        "opInterface":{
+            "value":"matmul_tik"
+        },
+        "output0":{
+            "dtype":"int32,int32,float",
+            "format":"ND,ND,ND",
+            "name":"y",
+            "paramType":"required",
+            "shape":"all"
+        }
+    }
+}

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

@@ -0,0 +1,123 @@
+{
+    "AddDSL":{
+        "input0":{
+            "dtype":"float16",
+            "format":"NCHW",
+            "name":"x1",
+            "paramType":"required"
+        },
+        "input1":{
+            "dtype":"float16",
+            "format":"NCHW",
+            "name":"x2",
+            "paramType":"required"
+        },
+        "opFile":{
+            "value":"add_dsl"
+        },
+        "opInterface":{
+            "value":"add_dsl"
+        },
+        "output0":{
+            "dtype":"float16",
+            "format":"NCHW",
+            "name":"y",
+            "paramType":"required"
+        }
+    },
+    "AddTik":{
+        "input0":{
+            "dtype":"float16",
+            "format":"ND",
+            "name":"x1",
+            "paramType":"required"
+        },
+        "input1":{
+            "dtype":"float16",
+            "format":"ND",
+            "name":"x2",
+            "paramType":"required"
+        },
+        "opFile":{
+            "value":"add_tik"
+        },
+        "opInterface":{
+            "value":"add_tik"
+        },
+        "output0":{
+            "dtype":"float16",
+            "format":"ND",
+            "name":"y",
+            "paramType":"required"
+        }
+    },
+    "FlashAttention":{
+        "input0":{
+            "dtype":"float16,float32,int32",
+            "format":"ND,ND,ND",
+            "name":"q",
+            "paramType":"required"
+        },
+        "input1":{
+            "dtype":"float16,float32,int32",
+            "format":"ND,ND,ND",
+            "name":"k",
+            "paramType":"required"
+        },
+        "input2":{
+            "dtype":"float16,float32,int32",
+            "format":"ND,ND,ND",
+            "name":"v",
+            "paramType":"required"
+        },
+        "input3":{
+            "dtype":"float16,float32,int32",
+            "format":"ND,ND,ND",
+            "name":"attention_mask",
+            "paramType":"required"
+        },
+        "opFile":{
+            "value":"flash_attention"
+        },
+        "opInterface":{
+            "value":"flash_attention"
+        },
+        "output0":{
+            "dtype":"float16,float32,int32",
+            "format":"ND,ND,ND",
+            "name":"y",
+            "paramType":"required"
+        }
+    },
+    "MatmulTik":{
+        "input0":{
+            "dtype":"int8,uint8,float16",
+            "format":"ND,ND,ND",
+            "name":"x1",
+            "needCompile":"false",
+            "paramType":"required",
+            "shape":"all"
+        },
+        "input1":{
+            "dtype":"int8,int8,float16",
+            "format":"ND,ND,ND",
+            "name":"x2",
+            "needCompile":"false",
+            "paramType":"required",
+            "shape":"all"
+        },
+        "opFile":{
+            "value":"matmul_tik"
+        },
+        "opInterface":{
+            "value":"matmul_tik"
+        },
+        "output0":{
+            "dtype":"int32,int32,float",
+            "format":"ND,ND,ND",
+            "name":"y",
+            "paramType":"required",
+            "shape":"all"
+        }
+    }
+}

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

@@ -0,0 +1,158 @@
+{
+    "AddDSL":{
+        "input0":{
+            "dtype":"float16,float32,int32",
+            "format":"ND,ND,ND",
+            "name":"x1",
+            "paramType":"required"
+        },
+        "input1":{
+            "dtype":"float16,float32,int32",
+            "format":"ND,ND,ND",
+            "name":"x2",
+            "paramType":"required"
+        },
+        "opFile":{
+            "value":"add_dsl"
+        },
+        "opInterface":{
+            "value":"add_dsl"
+        },
+        "output0":{
+            "dtype":"float16,float32,int32",
+            "format":"ND,ND,ND",
+            "name":"y",
+            "paramType":"required"
+        }
+    },
+    "AddTik":{
+        "input0":{
+            "dtype":"float16,float32,int32",
+            "format":"ND,ND,ND",
+            "name":"x1",
+            "paramType":"required"
+        },
+        "input1":{
+            "dtype":"float16,float32,int32",
+            "format":"ND,ND,ND",
+            "name":"x2",
+            "paramType":"required"
+        },
+        "opFile":{
+            "value":"add_tik"
+        },
+        "opInterface":{
+            "value":"add_tik"
+        },
+        "output0":{
+            "dtype":"float16,float32,int32",
+            "format":"ND,ND,ND",
+            "name":"y",
+            "paramType":"required"
+        }
+    },
+    "FlashAttention":{
+        "input0":{
+            "dtype":"float16,float32,int32",
+            "format":"ND,ND,ND",
+            "name":"q",
+            "paramType":"required"
+        },
+        "input1":{
+            "dtype":"float16,float32,int32",
+            "format":"ND,ND,ND",
+            "name":"k",
+            "paramType":"required"
+        },
+        "input2":{
+            "dtype":"float16,float32,int32",
+            "format":"ND,ND,ND",
+            "name":"v",
+            "paramType":"required"
+        },
+        "input3":{
+            "dtype":"float16,float32,int32",
+            "format":"ND,ND,ND",
+            "name":"attention_mask",
+            "paramType":"required"
+        },
+        "opFile":{
+            "value":"flash_attention"
+        },
+        "opInterface":{
+            "value":"flash_attention"
+        },
+        "output0":{
+            "dtype":"float16,float32,int32",
+            "format":"ND,ND,ND",
+            "name":"y",
+            "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",
+            "format":"ND,ND,ND",
+            "name":"x1",
+            "needCompile":"false",
+            "paramType":"required",
+            "shape":"all"
+        },
+        "input1":{
+            "dtype":"int8,int8,float16",
+            "format":"ND,ND,ND",
+            "name":"x2",
+            "needCompile":"false",
+            "paramType":"required",
+            "shape":"all"
+        },
+        "opFile":{
+            "value":"matmul_tik"
+        },
+        "opInterface":{
+            "value":"matmul_tik"
+        },
+        "output0":{
+            "dtype":"int32,int32,float",
+            "format":"ND,ND,ND",
+            "name":"y",
+            "paramType":"required",
+            "shape":"all"
+        }
+    }
+}