[Ascend] fuj/fix-AscendTensor-storage-offset (#1259)

Author: jingguo-st

impl/ascend/aclnn/adaptor.hpp

@@ -56,19 +56,42 @@ inline void* getOpApiFuncAddr(const char* apiName) {
     return getOpApiFuncAddrInLib(opApiHandler, kOpApiLibName, apiName);
 }
 
+inline aclFormat storageFormatByDimNum(int64_t dimNum) {
+    aclFormat format = ACL_FORMAT_ND;
+    switch (dimNum) {
+        case 3:
+            format = ACL_FORMAT_NCL;
+            break;
+        case 4:
+            format = ACL_FORMAT_NCHW;
+            break;
+        case 5:
+            format = ACL_FORMAT_NCDHW;
+            break;
+        default:
+            format = ACL_FORMAT_ND;
+    }
+    return format;
+}
+
 inline aclTensor* createAclTensorFromAscendTensor(const AscendTensor& input) {
     const auto& shape = input.shape();
     const auto& stride = input.stride();
     const auto storageSize = static_cast<int64_t>(input.storageNbytes() / input.elemsize());
+
+    void* storagePtr = nullptr;
+    diopiGetTensorStoragePtr(input.tensorHandle(), &storagePtr);
+    auto format = storageFormatByDimNum(input.dim());
+
     return ::aclCreateTensor(shape.data(),
                              shape.size(),
                              input.getAclDataType(),
                              stride.data(),
                              input.storageOffset(),
-                             input.getAclDataFormat(),  // TODO(lljbash): op_plugin assume non-channel-last, why?
+                             format,  // input.getAclDataFormat(),  // TODO(lljbash): op_plugin assume non-channel-last, why?
                              &storageSize,
                              /*storageDimsNum=*/1,
-                             const_cast<void*>(input.data()));
+                             const_cast<void*>(storagePtr));
 }
 
 inline aclTensor* createAclTensorFromDiopiTensor(diopiConstTensorHandle_t tensor) {
@@ -90,20 +113,15 @@ inline aclTensor* createAclTensorFromDiopiTensor(diopiConstTensorHandle_t tensor
     diopiGetTensorStorageOffset(tensor, &storageOffset);
     std::size_t storageNbytes{};
     diopiGetTensorStorageNbytes(tensor, &storageNbytes);
-    const void* tensorData = nullptr;
-    diopiGetTensorDataConst(tensor, &tensorData);
+
+    void* storagePtr = nullptr;
+    diopiGetTensorStoragePtr(tensor, &storagePtr);
+
     auto type = diopiDtypeToAclDataType(dtype);
-    auto format = inferAclDataFormat(shape.len, shape.data, stride.data);
+    auto format = storageFormatByDimNum(shape.len);
     auto storageSize = static_cast<int64_t>(storageNbytes / elemsize);
-    return ::aclCreateTensor(shape.data,
-                             shape.len,
-                             type,
-                             stride.data,
-                             storageOffset,
-                             format,
-                             &storageSize,
-                             /*storageDimsNum=*/1,
-                             const_cast<void*>(tensorData));
+
+    return ::aclCreateTensor(shape.data, shape.len, type, stride.data, storageOffset, format, &storageSize, 1, const_cast<void*>(storagePtr));
 }
 
 inline aclScalar* createAclScalarFromDiopiScalar(const diopiScalar_t* scalar) {

impl/ascend/convert_config.yaml

@@ -33,9 +33,11 @@
 
 - diopiConvolution2d:
     dtype: (float64)->float32
+    layout: ND
 
 - diopiConvolution2dBackward:
     dtype: (float64)->float32
+    layout: ND
 
 - diopiAdaptiveAvgPool2d:
     dtype: (float64)->float32