Merge pull request #104 from PanZezhong1725/fix-rearrange

fix: CpuRearrangeDescriptor

Author: PanZezhong1725

src/ops/rearrange/cpu/rearrange_cpu.cc

@@ -1,5 +1,6 @@
 #include "rearrange_cpu.h"
 #include "../../utils.h"
+#include <cstdint>
 #include <cstring>
 #include <numeric>
 
@@ -13,11 +14,16 @@ infiniopStatus_t cpuCreateRearrangeDescriptor(infiniopHandle_t,
     if (dst->ndim != src->ndim || dst->ndim < 2) {
         return STATUS_BAD_TENSOR_SHAPE;
     }
+    std::vector<uint64_t> shape;
+    std::vector<int64_t> strides_dst, strides_src;
     auto ndim = dst->ndim;
     for (int i = 0; i < ndim; ++i) {
         if (dst->shape[i] != src->shape[i]) {
             return STATUS_BAD_TENSOR_SHAPE;
         }
+        shape.push_back(dst->shape[i]);
+        strides_dst.push_back(dst->strides[i]);
+        strides_src.push_back(src->strides[i]);
     }
     if (dst->strides[ndim - 1] != 1 || src->strides[ndim - 1] != 1) {
         return STATUS_BAD_TENSOR_STRIDES;
@@ -40,8 +46,10 @@ infiniopStatus_t cpuCreateRearrangeDescriptor(infiniopHandle_t,
         dst->dt,
         r,
         ndim,
-        dst->shape, src->shape,
-        dst->strides, src->strides};
+        shape,
+        strides_dst,
+        strides_src,
+    };
     return STATUS_SUCCESS;
 }
 
@@ -50,7 +58,7 @@ infiniopStatus_t cpuDestroyRearrangeDescriptor(RearrangeCpuDescriptor_t desc) {
     return STATUS_SUCCESS;
 }
 
-inline int indices(uint64_t i, uint64_t ndim, int64_t *strides, uint64_t *shape) {
+inline int indices(uint64_t i, uint64_t ndim, std::vector<int64_t> strides, std::vector<uint64_t> shape) {
     uint64_t ans = 0;
     for (int j = ndim - 2; j >= 0; --j) {
         ans += (i % shape[j]) * strides[j];
@@ -62,11 +70,11 @@ inline int indices(uint64_t i, uint64_t ndim, int64_t *strides, uint64_t *shape)
 void reform_cpu(RearrangeCpuDescriptor_t desc, void *dst, void const *src) {
     auto dst_ptr = reinterpret_cast<uint8_t *>(dst);
     auto src_ptr = reinterpret_cast<const uint8_t *>(src);
-    int bytes_size = desc->shape_dst[desc->ndim - 1] * desc->dt.size;
+    int bytes_size = desc->shape[desc->ndim - 1] * desc->dt.size;
 #pragma omp parallel for
     for (uint64_t i = 0; i < desc->r; ++i) {
-        auto dst_offset = indices(i, desc->ndim, desc->strides_dst, desc->shape_dst);
-        auto src_offset = indices(i, desc->ndim, desc->strides_src, desc->shape_src);
+        auto dst_offset = indices(i, desc->ndim, desc->strides_dst, desc->shape);
+        auto src_offset = indices(i, desc->ndim, desc->strides_src, desc->shape);
         std::memcpy(dst_ptr + dst_offset * desc->dt.size, src_ptr + src_offset * desc->dt.size, bytes_size);
     }
 }

src/ops/rearrange/cpu/rearrange_cpu.h

@@ -2,13 +2,15 @@
 #define __CPU_REARRANGE_H__
 
 #include "operators.h"
+#include <vector>
 struct RearrangeCpuDescriptor {
     Device device;
     DataLayout dt;
     uint64_t r;
     uint64_t ndim;
-    uint64_t *shape_dst, *shape_src;
-    int64_t *strides_dst, *strides_src;
+    std::vector<uint64_t> shape;
+    std::vector<int64_t> strides_dst;
+    std::vector<int64_t> strides_src;
 };
 
 typedef struct RearrangeCpuDescriptor *RearrangeCpuDescriptor_t;