use "SHARPY::is_contiguous" to check strided and simpliy wait code

Author: AllanZyne

src/idtr.cpp

@@ -504,43 +504,37 @@ WaitHandleBase *_idtr_copy_reshape(SHARPY::DTypeId sharpytype,
     }
   }
 
-  int64_t oStride = std::accumulate(oDataStridesPtr, oDataStridesPtr + oNDims,
-                                    1, std::multiplies<int64_t>());
-  void *rBuff = oDataPtr;
-  if (oStride != 1) {
-    rBuff = new char[sizeof_dtype(sharpytype) * myOSz];
-  }
+  bool isStrided =
+      !SHARPY::is_contiguous(oDataShapePtr, oDataStridesPtr, oNDims);
+  void *rBuff =
+      isStrided ? new char[sizeof_dtype(sharpytype) * myOSz] : oDataPtr;
 
   SHARPY::Buffer sendbuff(totSSz * sizeof_dtype(sharpytype), 2);
   bufferizeN(iNDims, iDataPtr, iDataShapePtr, iDataStridesPtr, sharpytype, N,
              lsOffs.data(), lsEnds.data(), sendbuff.data());
   auto hdl = tc->alltoall(sendbuff.data(), sszs.data(), soffs.data(),
                           sharpytype, rBuff, rszs.data(), roffs.data());
 
-  if (no_async) {
-    tc->wait(hdl);
-    if (oStride != 1) {
-      unpack1(rBuff, sharpytype, oDataShapePtr, oDataStridesPtr, oNDims,
-              oDataPtr);
-      delete[](char *) rBuff;
-    }
-    return nullptr;
-  }
-
-  auto wait = [tc, hdl, oStride, rBuff, sharpytype, oDataShapePtr,
+  auto wait = [tc, hdl, isStrided, rBuff, sharpytype, oDataShapePtr,
                oDataStridesPtr, oNDims, oDataPtr,
                sendbuff = std::move(sendbuff), sszs = std::move(sszs),
                soffs = std::move(soffs), rszs = std::move(rszs),
                roffs = std::move(roffs)]() {
     tc->wait(hdl);
-    if (oStride != 1) {
+    if (isStrided) {
       unpack1(rBuff, sharpytype, oDataShapePtr, oDataStridesPtr, oNDims,
               oDataPtr);
       delete[](char *) rBuff;
     }
   };
   assert(sendbuff.empty() && sszs.empty() && soffs.empty() && rszs.empty() &&
          roffs.empty());
+
+  if (no_async) {
+    wait();
+    return nullptr;
+  }
+
   return mkWaitHandle(std::move(wait));
 }
 

test/test_random.py

@@ -1,5 +1,6 @@
 import numpy as np
 import pytest
+from utils import device
 
 import sharpy as sp
 
@@ -16,7 +17,7 @@ def seed(request):
 
 def test_random_rand(shape, seed):
     sp.random.seed(seed)
-    sp_data = sp.random.rand(*shape)
+    sp_data = sp.random.rand(*shape, device=device)
 
     np.random.seed(seed)
     np_data = np.random.rand(*shape)
@@ -30,7 +31,7 @@ def test_random_rand(shape, seed):
 @pytest.mark.parametrize("low,high", [(0, 1), (4, 10), (-100, 100)])
 def test_random_uniform(low, high, shape, seed):
     sp.random.seed(seed)
-    sp_data = sp.random.uniform(low, high, shape)
+    sp_data = sp.random.uniform(low, high, shape, device=device)
 
     np.random.seed(seed)
     np_data = np.random.uniform(low, high, shape)