mindspore 2.4.0__cp310-cp310-manylinux1_x86_64.whl → 2.4.10__cp310-cp310-manylinux1_x86_64.whl

mindspore/lib/plugin/ascend/custom_ascendc_910b/version.info

@@ -0,0 +1 @@
+custom_opp_compiler_version=7.6.T8.0.B059

mindspore/lib/plugin/ascend/custom_compiler/setup.py

@@ -274,7 +274,7 @@ class CustomOOC():
         else:
             with open('build.log', 'r') as file:
                 for line in file:
-                    logger.debug(line.strip())
+                    logger.error(line.strip())
             raise RuntimeError("Compile failed! Please see build.log in current directory for detail info.")
 
     def compile(self):

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

@@ -77,16 +77,16 @@ typedef struct {
 } AsdRtModuleInfo;
 
 typedef struct {
-    uint16_t addrOffset{0};
-    uint16_t dataOffset{0};
+    uint32_t addrOffset{0};
+    uint32_t dataOffset{0};
 } RtHostInputInfoT;
 
 typedef struct {
     void *args{nullptr};
     RtHostInputInfoT *hostInputInfoPtr{nullptr};
     uint32_t argsSize{0};
-    uint16_t tilingAddrOffset{0};
-    uint16_t tilingDataOffset{0};
+    uint32_t tilingAddrOffset{0};
+    uint32_t tilingDataOffset{0};
     uint16_t hostInputInfoNum{0};
     uint8_t hasTiling{0};
     uint8_t isNoNeedH2DCopy{0};
@@ -111,4 +111,4 @@ typedef struct {
 #ifdef __cplusplus
 }
 #endif
-#endif
+#endif

mindspore/lib/plugin/ascend/ms_kernels_internal/internal_kernel/include/acme/include/acme_op.h

@@ -34,6 +34,7 @@ class AcmeOp {
   AcmeStatus Init();
 
   virtual AcmeStatus UpdateShape(const ShapeInfoList &inputs_shape, const ShapeInfoList &outputs_shape);
+  virtual AcmeStatus UpdateParam(const void *) { return kAcmeOk; }
 
   size_t GetTilingSize() const;
   virtual std::vector<size_t> GetWorkspaceSize() const;

mindspore/lib/plugin/ascend/ms_kernels_internal/internal_kernel/include/acme/src/ops/host_src/flash_attention_score_op.h

@@ -59,6 +59,7 @@ class FlashAttentionScoreOp : public MultiImplsOp {
   AcmeStatus UpdateShape(const ShapeInfoList &inputs_shape, const ShapeInfoList &outputs_shape) override;
   const std::string &TargetKernelName() const override { return target_kernel_name_; }
   ShapeInfoList InferShape(const ShapeInfoList &inputs_shape) const override;
+  AcmeStatus UpdateParam(const void *) override;
 
  protected:
   AcmeStatus InitImpl() override;
@@ -69,7 +70,7 @@ class FlashAttentionScoreOp : public MultiImplsOp {
   std::string DumpTilingAcme(const RawHostAddr host_ptr) const override;
   uint32_t GetLaunchCoreNumAcme() const override;
   AcmeStatus CreateAsdTensor();
-  AcmeStatus UpdateAsdTensor(ShapeInfoList *asd_input_shape, ShapeInfoList *asd_output_shape);
+  AcmeStatus UpdateAsdTensor();
   AcmeStatus UpdateAsdParam();
   AcmeStatus CheckAsdopSupport() const;
 
@@ -78,6 +79,10 @@ class FlashAttentionScoreOp : public MultiImplsOp {
   FlashAttentionScoreParam param_;
   InputsDescList asd_inputs_;
   OutputsDescList asd_outputs_;
+  InputsImmutableInfoList asd_inputs_ii_;
+  InputsImmutableInfoList asd_outputs_ii_;
+  ShapeInfoList asd_input_shape_;
+  ShapeInfoList asd_output_shape_;
   uint64_t tiling_key_{0};
   bool has_attn_mask_{false};
   bool has_alibi_mask_{false};

mindspore/lib/plugin/ascend/ms_kernels_internal/internal_kernel/include/acme/src/ops/host_src/paged_attention_op.h

@@ -51,6 +51,7 @@ class PagedAttentionOp : public MultiImplsOp {
 
   AsdOps::Any BuildAsdParam() override;
   AcmeStatus UpdateShape(const ShapeInfoList &inputs_shape, const ShapeInfoList &outputs_shape) override;
+  AcmeStatus UpdateParam(const void *) override;
   const std::string &TargetKernelName() const override { return target_kernel_name_; }
   ShapeInfoList InferShape(const ShapeInfoList &inputs_shape) const override;
 
@@ -66,7 +67,7 @@ class PagedAttentionOp : public MultiImplsOp {
   uint32_t GetLaunchCoreNumAcme() const override;
   AcmeStatus CreateAsdTensor();
   AcmeStatus UpdateAsdParam();
-  AcmeStatus UpdateAsdTensor(ShapeInfoList *asd_input_shape, ShapeInfoList *asd_output_shape);
+  AcmeStatus UpdateAsdTensor();
   AcmeStatus CheckAsdopSupport() const;
 
  private:
@@ -74,6 +75,10 @@ class PagedAttentionOp : public MultiImplsOp {
   PagedAttentionParam param_;
   InputsDescList asd_inputs_;
   OutputsDescList asd_outputs_;
+  InputsImmutableInfoList asd_inputs_ii_;
+  InputsImmutableInfoList asd_outputs_ii_;
+  ShapeInfoList asd_input_shape_;
+  ShapeInfoList asd_output_shape_;
   uint64_t tiling_key_{0};
   bool is_custom_quant_{false};
   bool has_mask_{false};

mindspore/lib/plugin/ascend/ms_kernels_internal/internal_kernel/include/acme/src/ops/host_src/rms_norm_op.h

@@ -35,7 +35,7 @@ namespace acme {
 class RmsNormOp : public MultiImplsOp {
  public:
   RmsNormOp(const InputsImmutableInfoList &inputs_ii, const OutputsImmutableInfoList &outputs_ii,
-           const NormParam &param, const std::string &op_name);
+            const NormParam &param, const std::string &op_name);
   ~RmsNormOp() = default;
 
   AcmeStatus InitImpl() override;
@@ -43,8 +43,8 @@ class RmsNormOp : public MultiImplsOp {
   const std::string &TargetKernelName() const override { return target_kernel_name; }
   ShapeInfoList InferShape(const ShapeInfoList &inputs_shape) const override;
 
-protected:
-  bool UseAsdopImpl() override { return false; }
+ protected:
+  bool UseAsdopImpl() override;
   AcmeStatus TilingImplAcme(RawHostAddr host_ptr, HostRunInfoPtr *run_info_ptr) override;
   AcmeStatus LaunchImplAcme(const InputsAddrList &input_ptrs, const OutputsAddrList &output_ptrs,
                             const WsAddrList &ws_ptrs, void *stream) override;
@@ -53,6 +53,7 @@ protected:
 
  private:
   NormParam param_;
+  bool is_ascend_310p_{false};
   const std::string target_kernel_name{"NormOperation"};
 };