gridpoints 1.0.0__tar.gz → 1.0.2__tar.gz

{gridpoints-1.0.0 → gridpoints-1.0.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: gridpoints
-Version: 1.0.0
+Version: 1.0.2
 Summary: fast multidimensional sorting tool for point clouds using the monotonic lagrangian grid 
 Author: Armand de Cacqueray
 License: MIT
@@ -36,7 +36,7 @@ NaNs and Infs are supported in a consistent manner:
 This allow to deal with prime or variable N, as long as one is ready to 
 deal with void/special grid cells.
 
-Expected runtime for sorting 1 million points: CPU → < 10s, GPU → < 100 ms
+Expected runtime for sorting 1 million points: CPU → < 10s, GPU → < 500 ms
 
 ---
 

{gridpoints-1.0.0 → gridpoints-1.0.2}/README.md

@@ -20,7 +20,7 @@ NaNs and Infs are supported in a consistent manner:
 This allow to deal with prime or variable N, as long as one is ready to 
 deal with void/special grid cells.
 
-Expected runtime for sorting 1 million points: CPU → < 10s, GPU → < 100 ms
+Expected runtime for sorting 1 million points: CPU → < 10s, GPU → < 500 ms
 
 ---
 

{gridpoints-1.0.0 → gridpoints-1.0.2}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "gridpoints"
-version = "1.0.0"
+version = "1.0.2"
 description = "fast multidimensional sorting tool for point clouds using the monotonic lagrangian grid "
 readme = "README.md"
 requires-python = ">=3.9"

{gridpoints-1.0.0 → gridpoints-1.0.2}/src/griddemo/__init__.py

@@ -7,4 +7,4 @@ __all__ = (
     print_zoom,
 )
 
-__version__ = "1.0.0"
+__version__ = "1.0.2"

{gridpoints-1.0.0 → gridpoints-1.0.2}/src/griddemo/quick_demo.py

@@ -61,7 +61,10 @@ def show_result(X, animate=False):
         print("Missing dependencies for the demo. pip install gridsort[demo]")
     from squarenet import SquareNet
     import numpy as np
-    X = np.asarray(X)
+    try:
+        X = np.asarray(X)
+    except:
+        print("Array still on GPU, move it back to gpu first befor showing e.g. show_result(X.cpu())")
     sn = SquareNet(gridshape = X.shape[:-1])
     sn.pointsmaped = X
     sn.plot(style = "mesh", animate = animate, save = animate)
@@ -83,7 +86,10 @@ def print_zoom(Ygrid, center, side=1):
         Number of cells shown on each side of the center.
     """
     import numpy as np
-    Ygrid = np.asarray(Ygrid)
+    try:
+        Ygrid = np.asarray(Ygrid)
+    except:
+        print("Array still on GPU, move it back to gpu first befor showing e.g. print_zoom(X.cpu())")
     ndim = Ygrid.ndim - 1
     if ndim not in (2, 3):
         raise ValueError("printzoom only for 2D/3D grids")

{gridpoints-1.0.0 → gridpoints-1.0.2}/src/gridpoints/__init__.py

@@ -8,4 +8,4 @@ __all__ = (
     "invert_permutation",
 )
 
-__version__ = "1.0.0"
+__version__ = "1.0.2"

{gridpoints-1.0.0 → gridpoints-1.0.2}/src/gridpoints/array_libs.py

@@ -43,9 +43,12 @@ def astype(X, dtype_str, reference_array=None):
 
 
 def inplace_sort(X, axis):
-    _, backend_name = get_backend(X)
+    xp, backend_name = get_backend(X)
     if backend_name == 'torch':
         X.copy_(X.sort(dim=axis)[0])
+    if backend_name == "cupy":
+        X[...] = xp.ascontiguousarray(X)
+        X.sort(axis=axis)
     else:
         X.sort(axis=axis)
 

{gridpoints-1.0.0 → gridpoints-1.0.2}/src/gridpoints/mlg_sort.py

@@ -183,6 +183,7 @@ def _sort_along_direction(X, direction):
 
     elif level == 2:
         ax0, ax1 = xp.where(direction != 0)[0]
+        ax0, ax1 = int(ax0), int(ax1)
         Y = xp.moveaxis(X, [ax0, ax1], [-2, -1])
         flipaxes = []
         for ax, _ax in zip([ax0, ax1], [-2, -1]):
@@ -195,6 +196,7 @@ def _sort_along_direction(X, direction):
 
     elif level == 3:
         ax0, ax1, ax2 = xp.where(direction != 0)[0]
+        ax0, ax1, ax2 = int(ax0), int(ax1), int(ax2)
         Y = xp.moveaxis(X, [ax0, ax1, ax2], [-3, -2, -1])
         flipaxes = []
         for ax, _ax in zip([ax0, ax1, ax2], [-3, -2, -1]):

{gridpoints-1.0.0 → gridpoints-1.0.2}/src/gridpoints.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: gridpoints
-Version: 1.0.0
+Version: 1.0.2
 Summary: fast multidimensional sorting tool for point clouds using the monotonic lagrangian grid 
 Author: Armand de Cacqueray
 License: MIT
@@ -36,7 +36,7 @@ NaNs and Infs are supported in a consistent manner:
 This allow to deal with prime or variable N, as long as one is ready to 
 deal with void/special grid cells.
 
-Expected runtime for sorting 1 million points: CPU → < 10s, GPU → < 100 ms
+Expected runtime for sorting 1 million points: CPU → < 10s, GPU → < 500 ms
 
 ---