improve pyopencl interoperability + added test

clEsperanto · May 7, 2022 · 6d4c65d · 6d4c65d
1 parent 87fd2d1
commit 6d4c65d
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 1 deletion.
diff --git a/pyclesperanto_prototype/_tier0/_create.py b/pyclesperanto_prototype/_tier0/_create.py
@@ -29,6 +29,8 @@ def create_like(*args):
         dimensions = dimensions.shape
     elif isinstance(dimensions, np.ndarray):
         dimensions = dimensions.shape[::-1]
+    elif hasattr(dimensions, "shape"):
+        dimensions = dimensions.shape
     return create(dimensions)
 
 def create_binary_like(*args):
@@ -37,6 +39,8 @@ def create_binary_like(*args):
         dimensions = dimensions.shape
     elif isinstance(dimensions, np.ndarray):
         dimensions = dimensions.shape[::-1]
+    elif hasattr(dimensions, "shape"):
+        dimensions = dimensions.shape
     return create(dimensions, np.uint8)
 
 def create_labels_like(*args):
@@ -45,6 +49,8 @@ def create_labels_like(*args):
         dimensions = dimensions.shape
     elif isinstance(dimensions, np.ndarray):
         dimensions = dimensions.shape[::-1]
+    elif hasattr(dimensions, "shape"):
+        dimensions = dimensions.shape
     return create(dimensions, np.uint32)
 
 def create_same_type_like(*args):
@@ -53,6 +59,8 @@ def create_same_type_like(*args):
         dimensions = dimensions.shape
     elif isinstance(dimensions, np.ndarray):
         dimensions = dimensions.shape[::-1]
+    elif hasattr(dimensions, "shape"):
+        dimensions = dimensions.shape
     return create(dimensions, dimensions.dtype)
 
 def create_pointlist_from_labelmap(source, *args):

diff --git a/tests/test_pyopencl_compatibility.py b/tests/test_pyopencl_compatibility.py
@@ -15,4 +15,21 @@ def test_pyopencl_compatibility():
     cl_c = cl_a + cl_b
 
     import pyclesperanto_prototype as cle
-    cl_c = cl_a + cl_b
+    cl_c = cl_a + cl_b
+
+def test_semi_push():
+    import numpy as np
+    img = np.asarray([[1,2],[3,4], [5,6]])
+
+    import pyclesperanto_prototype as cle
+    device = cle.get_device()
+
+    import pyopencl.array as cla
+    pushed = cla.to_device(device.queue, img)
+
+    print(type(pushed))
+    print(pushed.shape)
+    blurred = cle.gaussian_blur(pushed, sigma_x=10, sigma_y=10, sigma_z=10)
+
+    assert np.array_equal(blurred.shape, pushed.shape)
+