mindspore 2.3.0rc1__cp37-none-any.whl → 2.3.0rc2__cp37-none-any.whl

mindspore/lib/plugin/ascend/ms_kernels_internal/asdops/include/asdops/base/op_register.h

@@ -35,7 +35,7 @@ public:
         ASDOPS_CHECK(opName != nullptr, "opName is nullptr", return);
         auto &operationCreators = OperationCreators();
         operationCreators.push_back(func);
-        ASD_LOG(INFO) << "register operation " << opName;
+        ASD_LOG(DEBUG) << "register operation " << opName;
     }
 
     OperationRegister(const char *opName, const char *tacName, NewTacticFunc func) noexcept
@@ -44,7 +44,7 @@ public:
         ASDOPS_CHECK(tacName != nullptr, "tacName is nullptr", return);
         auto &tacticCreators = TacticCreators();
         tacticCreators[func] = opName;
-        ASD_LOG(INFO) << "register tactic " << tacName << " of operation " << opName;
+        ASD_LOG(DEBUG) << "register tactic " << tacName << " of operation " << opName;
     }
 
     static std::vector<NewOperationFunc> &OperationCreators()

mindspore/lib/plugin/ascend/ms_kernels_internal/asdops/include/asdops/params/mix.h

@@ -50,6 +50,10 @@ struct Mix {
         MIX_PAD = 15,
         MIX_UNPAD_GEN_ATTENTION_MASK = 16,
 
+        MIX_SAMPLING_START = 1500,
+        MIX_TOPP_SAMPLE = 1501,
+        MIX_SAMPLING_END = 1600,
+
         MIX_TRANSFORMER_ATTENTION_START = 2000,
         MIX_UNPAD_FLASH_ATTENTION_FP32_ND = 2001,
         MIX_PAGED_ATTENTION_MASK_ND = 2002,
@@ -128,6 +132,8 @@ struct Mix {
     int32_t nextTokens = 1;
     // UNPAD_WITH_HIDDEN_STATE & PAD_WITH_HIDDEN_STATE
     uint32_t maxSeqLen = 0;
+    // MIX_TOPP_SAMPLE
+    uint32_t randSeed = 0;
 
     bool operator==(const Mix &other) const
     {
@@ -144,7 +150,8 @@ struct Mix {
             this->maskType == other.maskType && Utils::Compare<float>::IsEqual(this->scale, other.scale) &&
             this->ioLayout == other.ioLayout && Utils::Compare<float>::IsEqual(this->keepProb, other.keepProb) &&
             this->preTokens == other.preTokens && this->nextTokens == other.nextTokens &&
-            this->maxSeqLen == other.maxSeqLen && this->identityM == other.identityM;
+            this->maxSeqLen == other.maxSeqLen && this->identityM == other.identityM &&
+            (this->randSeed == other.randSeed && this->randSeed != 0xffffffff && other.randSeed != 0xffffffff);
     }
 };
 } // namespace OpParam

mindspore/lib/plugin/ascend/ms_kernels_internal/asdops/include/asdops/params/norm.h

@@ -35,9 +35,11 @@ struct Norm {
     size_t opsMode = 0;
     float epsilon = 0.1f;
     float zoomScaleValue = 1.0f;
-    float inputScale = 1.0f; // NORM_POSTLAYERNORMQUANT
-    int inputOffset = 0;     // NORM_POSTLAYERNORMQUANT
-    float inputAlpha = 1.0f; // NORM_POSTLAYERNORMQUANT
+    float inputScale = 1.0f; // NORM_POSTLAYERNORMQUANT, [DEPRECATED] RmsNormQuantTactic,
+                             // [DEPRECATED] LayerNormQuantTactic
+    int inputOffset = 0;     // NORM_POSTLAYERNORMQUANT , [DEPRECATED] RmsNormQuantTactic,
+                             //  [DEPRECATED] LayerNormQuantTactic
+    float inputAlpha = 1.0f; // NORM_POSTLAYERNORMQUANT, [DEPRECATED] LayerNormQuantTactic
     bool inGamma = false; // LayernormF16Tactic, LayernormBF16Tactic, LayernormF32Tactic, PostLayernormF16Tactic,
                           // LayernormF16QuantTactic, PostLayernormF16QuantTactic, RmsPreNormQuantTactic, RmsNormTactic,
                           // RmsNormQuantTactic

mindspore/lib/plugin/ascend/ms_kernels_internal/asdops/include/asdops/params/reduce.h

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 #ifndef ASDOPS_PARAMS_REDUCE_H
-#define ASDOPS_PARAMS_RECUDE_H
+#define ASDOPS_PARAMS_REDUCE_H
 
 #include <string>
 #include <sstream>
@@ -40,4 +40,4 @@ struct Reduce {
 } // namespace OpParam
 } // namespace AsdOps
 
-#endif // ASDOPS_PARAMS_RECUDE_H
+#endif // ASDOPS_PARAMS_REDUCE_H

mindspore/lib/plugin/ascend/ms_kernels_internal/asdops/include/asdops/utils/rt/backend/backend.h

@@ -59,12 +59,12 @@ public:
     virtual int ModuleCreateFromFile(const char *moduleFilePath, AsdRtModuleType type, int version,
                                      AsdRtModule *module) = 0;
     virtual int ModuleDestory(AsdRtModule *module) = 0;
-    virtual int ModuleBindFunction(AsdRtModule module, const char *funcName, AsdRtFunction func) = 0;
+    virtual int ModuleBindFunction(AsdRtModule module, const char *funcName, void *func) = 0;
     virtual int RegisterAllFunction(AsdRtModuleInfo *moduleInfo, void **handle) = 0;
-    virtual int FunctionLaunch(const AsdRtFunction func, const AsdRtKernelParam *param, AsdRtStream stream) = 0;
+    virtual int FunctionLaunch(const void *func, const AsdRtKernelParam *param, AsdRtStream stream) = 0;
     virtual int FunctionLaunchWithHandle(void *handle, const AsdRtKernelParam *param, AsdRtStream stream,
                                          const RtTaskCfgInfoT *cfgInfo) = 0;
-    virtual int FunctionLaunchWithFlag(const AsdRtFunction func, const AsdRtKernelParam *param, AsdRtStream stream,
+    virtual int FunctionLaunchWithFlag(const void *func, const AsdRtKernelParam *param, AsdRtStream stream,
                                        const RtTaskCfgInfoT *cfgInfo) = 0;
 
 public:

mindspore/lib/plugin/ascend/ms_kernels_internal/asdops/include/asdops/utils/rt/backend/rtbackend.h

@@ -122,12 +122,12 @@ public:
     int ModuleCreateFromFile(const char *moduleFilePath, AsdRtModuleType type, int version,
                              AsdRtModule *module) override;
     int ModuleDestory(AsdRtModule *module) override;
-    int ModuleBindFunction(AsdRtModule module, const char *funcName, AsdRtFunction func) override;
+    int ModuleBindFunction(AsdRtModule module, const char *funcName, void *func) override;
     int RegisterAllFunction(AsdRtModuleInfo *moduleInfo, void **handle) override;
-    int FunctionLaunch(const AsdRtFunction func, const AsdRtKernelParam *param, AsdRtStream stream) override;
+    int FunctionLaunch(const void *func, const AsdRtKernelParam *param, AsdRtStream stream) override;
     int FunctionLaunchWithHandle(void *handle, const AsdRtKernelParam *param, AsdRtStream stream,
                                  const RtTaskCfgInfoT *cfgInfo) override;
-    int FunctionLaunchWithFlag(const AsdRtFunction func, const AsdRtKernelParam *param, AsdRtStream stream,
+    int FunctionLaunchWithFlag(const void *func, const AsdRtKernelParam *param, AsdRtStream stream,
                                const RtTaskCfgInfoT *cfgInfo) override;
 
 public:

mindspore/lib/plugin/ascend/ms_kernels_internal/asdops/include/asdops/utils/rt/base/types.h

@@ -65,7 +65,6 @@ typedef enum {
 } AsdRtMemType;
 
 typedef void *AsdRtModule;
-typedef void *AsdRtFunction;
 
 typedef enum {
     ASDRT_MODULE_OBJECT = 0, // 原始object文件

mindspore/lib/plugin/ascend/ms_kernels_internal/asdops/include/asdops/utils/rt/module/module.h

@@ -25,12 +25,12 @@ namespace AsdOps {
 int AsdRtModuleCreate(AsdRtModuleInfo *moduleInfo, AsdRtModule *module);
 int AsdRtModuleCreateFromFile(const char *moduleFilePath, AsdRtModuleType type, int version, AsdRtModule *module);
 int AsdRtModuleDestory(AsdRtModule *module);
-int AsdRtModuleBindFunction(AsdRtModule module, const char *funcName, AsdRtFunction func);
+int AsdRtModuleBindFunction(AsdRtModule module, const char *funcName, void *func);
 int AstRtRegisterAllFunction(AsdRtModuleInfo *moduleInfo, void **handle);
-int AsdRtFunctionLaunch(const AsdRtFunction func, const AsdRtKernelParam *launchParam, AsdRtStream stream);
+int AsdRtFunctionLaunch(const void *func, const AsdRtKernelParam *launchParam, AsdRtStream stream);
 int AsdRtFunctionLaunchWithHandle(void *handle, const AsdRtKernelParam *launchParam, AsdRtStream stream,
     const RtTaskCfgInfoT *cfgInfo);
-int AsdRtFunctionLaunchWithFlag(const AsdRtFunction func, const AsdRtKernelParam *launchParam, AsdRtStream stream,
+int AsdRtFunctionLaunchWithFlag(const void *func, const AsdRtKernelParam *launchParam, AsdRtStream stream,
     const RtTaskCfgInfoT *cfgInfo);
 }
 #ifdef __cplusplus

mindspore/lib/plugin/ascend/ms_kernels_internal/asdops/include/asdops/utils/svector/svector.h

@@ -24,7 +24,8 @@
 #include "asdops/utils/compare/compare.h"
 
 namespace AsdOps {
-constexpr size_t MAX_SVECTOR_SIZE = 48;
+constexpr size_t MAX_SVECTOR_SIZE = 256;
+constexpr size_t DEFAULT_SVECTOR_SIZE = 48;
 constexpr bool CHECK_BOUND = true;
 
 struct MaxSizeExceeded : public std::exception {};
@@ -48,7 +49,7 @@ typename std::enable_if<!std::is_trivially_destructible<T>::value>::type Constru
     new (ptr) T(std::forward<Args>(args)...);
 }
 
-template <class T, std::size_t MAX_SIZE = MAX_SVECTOR_SIZE> class SVector {
+template <class T, std::size_t MAX_SIZE = DEFAULT_SVECTOR_SIZE> class SVector {
 public:
     constexpr SVector() : size_(0)
     {

mindspore/lib/plugin/ascend/ms_kernels_internal/internal_kernel/include/add/tiling/add_tiling.h

@@ -29,15 +29,15 @@ struct AddTilingData {
 };
 
 static std::ostream &operator<<(std::ostream &os, const AddTilingData &dt) {
-  os << "blockDims:" << dt.blockDims << std::endl;
-  os << "totalLength:" << dt.totalLength << std::endl;
-  os << "blockLength:" << dt.blockLength << std::endl;
-  os << "tileLength:" << dt.tileLength << std::endl;
-  os << "tileNum:" << dt.tileNum << std::endl;
-  os << "tailBlockTileNum:" << dt.tailBlockTileNum << std::endl;
-  os << "tilingKey:" << dt.tilingKey << std::endl;
-  os << "axisDim:" << dt.axisDim << std::endl;
-  os << "splitNum:" << dt.splitNum << std::endl;
+  os << "blockDims:" << dt.blockDims;
+  os << ", totalLength:" << dt.totalLength;
+  os << ", blockLength:" << dt.blockLength;
+  os << ", tileLength:" << dt.tileLength;
+  os << ", tileNum:" << dt.tileNum;
+  os << ", tailBlockTileNum:" << dt.tailBlockTileNum;
+  os << ", tilingKey:" << dt.tilingKey;
+  os << ", axisDim:" << dt.axisDim;
+  os << ", splitNum:" << dt.splitNum;
   return os;
 }
 #endif  // MS_KERNELS_INTERNAL_ASCENDC_ADD_TILING_H

mindspore/lib/plugin/ascend/ms_kernels_internal/internal_kernel/include/apply_rotary_pos_emb/apply_rotary_pos_emb_impl.h

@@ -13,8 +13,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#ifndef MS_KERNELS_INTERNAL_KERNEL_APPLY_ROTARY_POS_EMB_H_
-#define MS_KERNELS_INTERNAL_KERNEL_APPLY_ROTARY_POS_EMB_H_
+#ifndef MS_KERNELS_INTERNAL_KERNEL_ROPE_H_
+#define MS_KERNELS_INTERNAL_KERNEL_ROPE_H_
 
 #include "include/internal_kernel.h"
 #include <vector>
@@ -36,12 +36,8 @@ class ApplyRotaryPosEmbImpl : public InternelKernelImpl {
   int InferShape(const std::vector<DIMS> &input_shapes, std::vector<DIMS> &output_shapes) override;
 
  private:
-  void RopeNdProcess();
-  void RopeTiling();
-
   DeviceRawBuf tiling_buf_;
   DeviceRawBuf workSpace_buf_;
-  ApplyRotaryPosEmbTilingData tiling_{};
   std::string soc_{"Ascend910B2"};
 };
 }  // namespace internal

mindspore/lib/plugin/ascend/ms_kernels_internal/internal_kernel/include/apply_rotary_pos_emb/kernel/apply_rotary_pos_emb.h

@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef MS_KERNELS_INTERNAL_KERNEL_ASCENDC_APPLY_ROTARY_POS_EMB_H_
-#define MS_KERNELS_INTERNAL_KERNEL_ASCENDC_APPLY_ROTARY_POS_EMB_H_
+#ifndef MS_KERNELS_INTERNAL_KERNEL_ASCENDC_ROPE_H_
+#define MS_KERNELS_INTERNAL_KERNEL_ASCENDC_ROPE_H_
 
 void apply_rotary_pos_emb_do(uint32_t blockDim, void *l2ctrl, void *stream, uint8_t *query, uint8_t *key, uint8_t *cos,
                              uint8_t *sin, uint8_t *position_id, uint8_t *query_embed, uint8_t *key_embed,