zcx/fix format and use ascend npu (DeepLink-org#787)

fix format and use ascend npu

Author: zhaochaoxing

impl/ascend/common/format_helper.cpp

@@ -60,6 +60,7 @@ aclFormat FormatHelper::getAclFormat(diopiMemoryFormat_t memoryFormat) {
         case diopiMemoryFormat_t::Undefined:
             return aclFormat::ACL_FORMAT_UNDEFINED;
         case diopiMemoryFormat_t::Contiguous:
+        case diopiMemoryFormat_t::ND:
             return aclFormat::ACL_FORMAT_ND;
         case diopiMemoryFormat_t::NCHW:
             return aclFormat::ACL_FORMAT_NCHW;

impl/ascend/functions/format_cast.cpp

@@ -12,60 +12,60 @@
 namespace impl {
 namespace ascend {
 void formatCastInsideGroup(diopiContextHandle_t ctx, diopiTensorHandle_t out, diopiTensorHandle_t in) {
-    AscendTensor tensor_in(in);
-    AscendTensor tensor_out(out);
-    AclOpRunner<1, 1>("Identity", ctx).addInput(tensor_in).addOutput(tensor_out).run();
+    AscendTensor tensorIn(in);
+    AscendTensor tensorOut(out);
+    AclOpRunner<1, 1>("Identity", ctx).addInput(tensorIn).addOutput(tensorOut).run();
 }
 void formatCastBetweenGroup(diopiContextHandle_t ctx, diopiTensorHandle_t out, diopiTensorHandle_t in) {
-    diopiStorageDesc_t desc_in;
-    diopiGetTensorStorageDesc(in, &desc_in);
-    diopiStorageDesc_t desc_out;
-    diopiGetTensorStorageDesc(out, &desc_out);
-    bool isInputBaseFormat = FormatHelper::isBaseFormat(desc_in.format);
-    bool isOutputBaseFormat = FormatHelper::isBaseFormat(desc_out.format);
+    diopiStorageDesc_t descIn;
+    diopiGetTensorStorageDesc(in, &descIn);
+    diopiStorageDesc_t descOut;
+    diopiGetTensorStorageDesc(out, &descOut);
+    bool isInputBaseFormat = FormatHelper::isBaseFormat(descIn.format);
+    bool isOutputBaseFormat = FormatHelper::isBaseFormat(descOut.format);
     if (isInputBaseFormat && !isOutputBaseFormat) {
-        diopiMemoryFormat_t input_format_tmp = desc_in.format;
-        desc_in.format = FormatHelper::getDiopiBaseFormat(desc_out.format);
-        diopiSetTensorStorageDesc(in, desc_in);
+        diopiMemoryFormat_t inputFormatTmp = descIn.format;
+        descIn.format = FormatHelper::getDiopiBaseFormat(descOut.format);
+        diopiSetTensorStorageDesc(in, descIn);
         formatCastInsideGroup(ctx, out, in);
-        desc_in.format = input_format_tmp;
-        diopiSetTensorStorageDesc(in, desc_in);
+        descIn.format = inputFormatTmp;
+        diopiSetTensorStorageDesc(in, descIn);
     } else if (!isInputBaseFormat && isOutputBaseFormat) {
-        diopiMemoryFormat_t out_format_tmp = desc_out.format;
-        desc_out.format = FormatHelper::getDiopiBaseFormat(desc_in.format);
-        diopiSetTensorStorageDesc(out, desc_out);
+        diopiMemoryFormat_t outFormatTmp = descOut.format;
+        descOut.format = FormatHelper::getDiopiBaseFormat(descIn.format);
+        diopiSetTensorStorageDesc(out, descOut);
         formatCastInsideGroup(ctx, out, in);
-        desc_out.format = out_format_tmp;
-        diopiSetTensorStorageDesc(out, desc_out);
+        descOut.format = outFormatTmp;
+        diopiSetTensorStorageDesc(out, descOut);
     } else {
         ASCEND_CHECK_ABORT(false, "format cast not support");
     }
 }
 
-diopiError_t diopiFormatCast(diopiContextHandle_t ctx, diopiTensorHandle_t* out, diopiTensorHandle_t in, diopiMemoryFormat_t target_format) {
-    AscendTensor tensor_in(in);
-    if (tensor_in.storageFormat() == target_format) {
+diopiError_t diopiFormatCast(diopiContextHandle_t ctx, diopiTensorHandle_t* out, diopiTensorHandle_t in, diopiMemoryFormat_t targetFormat) {
+    AscendTensor tensorIn(in);
+    if (tensorIn.storageFormat() == targetFormat) {
         *out = in;
         return diopiSuccess;
     }
-    if (FormatHelper::isBaseFormat(tensor_in.storageFormat()) && FormatHelper::isBaseFormat(target_format)) {
+    if (FormatHelper::isBaseFormat(tensorIn.storageFormat()) && FormatHelper::isBaseFormat(targetFormat)) {
         diopiStorageDesc_t desc;
         diopiGetTensorStorageDesc(in, &desc);
-        desc.format = target_format;
+        desc.format = targetFormat;
         *out = in;
         diopiSetTensorStorageDesc(*out, desc);
         return diopiSuccess;
     }
-    std::vector<int64_t> storage_sizes_out = FormatHelper::getStorageSizes(target_format, tensor_in.shape());
-    diopiStorageDesc_t desc_out;
-    desc_out.sizes.data = storage_sizes_out.data();
-    desc_out.sizes.len = storage_sizes_out.size();
-    desc_out.format = target_format;
-    diopiRequireTensor(ctx, out, &desc_out.sizes, nullptr, tensor_in.dtype(), tensor_in.device());
-    diopiSetTensorStorageDesc(*out, desc_out);
+    std::vector<int64_t> storageSizesOut = FormatHelper::getStorageSizes(targetFormat, tensorIn.shape());
+    diopiStorageDesc_t descOut;
+    descOut.sizes.data = storageSizesOut.data();
+    descOut.sizes.len = storageSizesOut.size();
+    descOut.format = targetFormat;
+    diopiRequireTensor(ctx, out, &descOut.sizes, nullptr, tensorIn.dtype(), tensorIn.device());
+    diopiSetTensorStorageDesc(*out, descOut);
     // set tensor metadata
     diopiCopyTensorMetaData(*out, in);
-    if (FormatHelper::getDiopiBaseFormat(target_format) != FormatHelper::getDiopiBaseFormat(tensor_in.storageFormat())) {
+    if (FormatHelper::getDiopiBaseFormat(targetFormat) != FormatHelper::getDiopiBaseFormat(tensorIn.storageFormat())) {
         formatCastBetweenGroup(ctx, *out, in);
     } else {
         formatCastInsideGroup(ctx, *out, in);

impl/ascend_npu/CMakeLists.txt

@@ -648,6 +648,7 @@ set(OLD_IMPL_SRC
     ${OLD_IMPL_DIR}/functions/linspace.cpp
     ${OLD_IMPL_DIR}/functions/apply_penalty.cpp
     ${OLD_IMPL_DIR}/functions/split.cpp
+    ${OLD_IMPL_DIR}/functions/format_cast.cpp
     ${OLD_IMPL_DIR}/functions_ext/rms_norm.cpp
     #${OLD_IMPL_DIR}/test/export_functions.cpp
     #${OLD_IMPL_DIR}/test/conform_test.cpp

impl/ascend_npu/ascend_config.yaml

@@ -203,6 +203,7 @@ ascend:
 - diopiScatterScalar
 - diopiScatterInpScalar
 - diopiApplyPenalty
+- diopiFormatCast
 ascend_npu:
 - diopiRemainderTensor
 - diopiRemainderScalar