mindspore 2.1.0__cp37-none-any.whl → 2.2.11__cp37-none-any.whl

mindspore/include/dataset/vision_lite.h

@@ -1,5 +1,5 @@
 /**
- * Copyright 2020-2022 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.
@@ -67,7 +67,7 @@ class DATASET_API Affine final : public TensorTransform {
                   const std::vector<uint8_t> &fill_value = {0, 0, 0});
 
   /// \brief Destructor.
-  ~Affine() = default;
+  ~Affine() override = default;
 
   /// \brief The function to convert a TensorTransform object into a TensorOperation object.
   /// \return Shared pointer to TensorOperation object.
@@ -98,7 +98,7 @@ class DATASET_API CenterCrop final : public TensorTransform {
   explicit CenterCrop(const std::vector<int32_t> &size);
 
   /// \brief Destructor.
-  ~CenterCrop() = default;
+  ~CenterCrop() override = default;
 
  protected:
   /// \brief The function to convert a TensorTransform object into a TensorOperation object.
@@ -133,7 +133,7 @@ class DATASET_API Crop final : public TensorTransform {
   Crop(const std::vector<int32_t> &coordinates, const std::vector<int32_t> &size);
 
   /// \brief Destructor.
-  ~Crop() = default;
+  ~Crop() override = default;
 
  protected:
   /// \brief The function to convert a TensorTransform object into a TensorOperation object.
@@ -162,7 +162,7 @@ class DATASET_API Decode final : public TensorTransform {
   explicit Decode(bool rgb = true);
 
   /// \brief Destructor.
-  ~Decode() = default;
+  ~Decode() override = default;
 
  protected:
   /// \brief The function to convert a TensorTransform object into a TensorOperation object.
@@ -196,7 +196,7 @@ class DATASET_API GaussianBlur final : public TensorTransform {
   explicit GaussianBlur(const std::vector<int32_t> &kernel_size, const std::vector<float> &sigma = {0., 0.});
 
   /// \brief Destructor.
-  ~GaussianBlur() = default;
+  ~GaussianBlur() override = default;
 
  protected:
   /// \brief The function to convert a TensorTransform object into a TensorOperation object.
@@ -222,7 +222,7 @@ class DATASET_API HWC2CHW final : public TensorTransform {
   HWC2CHW();
 
   /// \brief Destructor.
-  ~HWC2CHW() = default;
+  ~HWC2CHW() override = default;
 
  protected:
   /// \brief The function to convert a TensorTransform object into a TensorOperation object.
@@ -254,7 +254,7 @@ class DATASET_API Normalize final : public TensorTransform {
   Normalize(const std::vector<float> &mean, const std::vector<float> &std, bool is_hwc = true);
 
   /// \brief Destructor.
-  ~Normalize() = default;
+  ~Normalize() override = default;
 
  protected:
   /// \brief The function to convert a TensorTransform object into a TensorOperation object.
@@ -302,7 +302,7 @@ class DATASET_API Pad final : public TensorTransform {
                BorderType padding_mode = BorderType::kConstant);
 
   /// \brief Destructor.
-  ~Pad() = default;
+  ~Pad() override = default;
 
  protected:
   /// \brief The function to convert a TensorTransform object into a TensorOperation object.
@@ -354,7 +354,7 @@ class DATASET_API RandomAffine final : public TensorTransform {
                         const std::vector<uint8_t> &fill_value = {0, 0, 0});
 
   /// \brief Destructor.
-  ~RandomAffine() = default;
+  ~RandomAffine() override = default;
 
   /// \brief The function to convert a TensorTransform object into a TensorOperation object.
   /// \return Shared pointer to TensorOperation object.
@@ -384,7 +384,7 @@ class DATASET_API Rescale final : public TensorTransform {
   Rescale(float rescale, float shift);
 
   /// \brief Destructor.
-  ~Rescale() = default;
+  ~Rescale() override = default;
 
  protected:
   /// \brief The function to convert a TensorTransform object into a TensorOperation object.
@@ -422,7 +422,7 @@ class DATASET_API Resize final : public TensorTransform {
   explicit Resize(const std::vector<int32_t> &size, InterpolationMode interpolation = InterpolationMode::kLinear);
 
   /// \brief Destructor.
-  ~Resize() = default;
+  ~Resize() override = default;
 
  protected:
   /// \brief The function to convert a TensorTransform object into a TensorOperation object.
@@ -464,7 +464,7 @@ class DATASET_API ResizePreserveAR final : public TensorTransform {
   ResizePreserveAR(int32_t height, int32_t width, int32_t img_orientation = 0);
 
   /// \brief Destructor.
-  ~ResizePreserveAR() = default;
+  ~ResizePreserveAR() override = default;
 
  protected:
   /// \brief The function to convert a TensorTransform object into a TensorOperation object.
@@ -494,7 +494,7 @@ class DATASET_API RGB2BGR final : public TensorTransform {
   RGB2BGR() = default;
 
   /// \brief Destructor.
-  ~RGB2BGR() = default;
+  ~RGB2BGR() override = default;
 
  protected:
   /// \brief The function to convert a TensorTransform object into a TensorOperation object.
@@ -521,7 +521,7 @@ class DATASET_API RGB2GRAY final : public TensorTransform {
   RGB2GRAY() = default;
 
   /// \brief Destructor.
-  ~RGB2GRAY() = default;
+  ~RGB2GRAY() override = default;
 
  protected:
   /// \brief The function to convert a TensorTransform object into a TensorOperation object.
@@ -582,7 +582,7 @@ class DATASET_API Rotate final : public TensorTransform {
                   const std::vector<float> &center = {}, const std::vector<uint8_t> &fill_value = {0, 0, 0});
 
   /// \brief Destructor.
-  ~Rotate() = default;
+  ~Rotate() override = default;
 
  protected:
   /// \brief The function to convert a TensorTransform object into a TensorOperation object.
@@ -612,7 +612,7 @@ class DATASET_API SwapRedBlue final : public TensorTransform {
   SwapRedBlue();
 
   /// \brief Destructor.
-  ~SwapRedBlue() = default;
+  ~SwapRedBlue() override = default;
 
  protected:
   /// \brief The function to convert a TensorTransform object into a TensorOperation object.

mindspore/include/mindapi/base/type_id.h

@@ -77,6 +77,7 @@ enum TypeId : int {
   kNumberTypeFloat16,
   kNumberTypeFloat32,
   kNumberTypeFloat64,
+  kNumberTypeBFloat16,
   kNumberTypeDouble,
   kNumberTypeComplex,
   kNumberTypeComplex64,

mindspore/include/mindapi/base/types.h

@@ -32,6 +32,7 @@ enum class ResizeMethod : int64_t {
   LINEAR = 0,
   NEAREST = 1,
   CUBIC = 2,
+  AREA = 3,
 };
 
 enum class NearestMode : int64_t {

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"
+        }
+    }
+}

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

@@ -0,0 +1,37 @@
+{
+    "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"
+        }
+    }
+}