do not transpose arrays that are wide but short for streams (#57)

* do not transpose arrays that are wide but short for streams * Fixed wrong width in transposed array tests * Fixed dlpack copy routine for F-style arrays.
datasig-ac-uk · Dec 13, 2023 · 53d28a5 · 53d28a5
1 parent 7ffb57a
commit 53d28a5
Show file tree

Hide file tree

Showing 3 changed files with 116 additions and 126 deletions.
diff --git a/roughpy/src/args/strided_copy.cpp b/roughpy/src/args/strided_copy.cpp
@@ -46,17 +46,21 @@ void rpy::python::stride_copy(
     const auto* sptr = static_cast<const char*>(src);
 
     if (ndim == 1) {
-        for (py::ssize_t i=0; i<shape_in[0]; ++i) {
-            std::memcpy(dptr + i*strides_out[0],
-                        sptr + i*strides_in[0],
-                        itemsize);
+        if (strides_in[0] == itemsize) {
+            std::memcpy(dptr, sptr, shape_in[0] * itemsize);
+        } else {
+            for (py::ssize_t i = 0; i < shape_in[0]; ++i) {
+                std::memcpy(dptr + i * strides_out[0],
+                            sptr + i * strides_in[0],
+                            itemsize);
+            }
         }
     } else if (transpose) {
-         for (py::ssize_t i=0; i<shape_in[0]; ++i) {
-            for (py::ssize_t j=0; j<shape_in[1]; ++j) {
+        for (py::ssize_t i = 0; i < shape_in[1]; ++i) {
+            for (py::ssize_t j = 0; j < shape_in[0]; ++j) {
                 std::memcpy(
                         dptr + j*strides_out[0] + i*strides_out[1],
-                        sptr + i*strides_in[0] + j*strides_in[1],
+                        sptr + i * strides_in[1] + j * strides_in[0],
                         itemsize
                         );
             }