multipers 2.3.3b5__cp312-cp312-win_amd64.whl → 2.3.3b6__cp312-cp312-win_amd64.whl

multipers/array_api/numpy.py

@@ -18,6 +18,11 @@ min = _np.min
 max = _np.max
 repeat_interleave = _np.repeat
 cdist = cdist  # type: ignore[no-redef]
+unique = _np.unique
+
+
+def quantile_closest(x, q, axis=None):
+    return _np.quantile(x, q, axis=axis, interpolation="closest_observation")
 
 
 def minvalues(x: _np.ndarray, **kwargs):

multipers/array_api/torch.py

@@ -1,3 +1,4 @@
+import numpy as _np
 import torch as _t
 
 backend = _t
@@ -16,6 +17,27 @@ max = _t.max
 repeat_interleave = _t.repeat_interleave
 
 
+# in our context, this allows to get a correct gradient.
+def unique(x, assume_sorted=False, _mean=True):
+    if not x.requires_grad:
+        return x.unique(sorted=assume_sorted)
+    if x.ndim != 1:
+        raise ValueError(f"Got ndim!=1. {x=}")
+    if not assume_sorted:
+        x = x.sort().values
+    _, c = _t.unique(x, sorted=True, return_counts=True)
+    if _mean:
+        x = _t.segment_reduce(data=x, reduce="mean", lengths=c, unsafe=True, axis=0)
+        return x
+
+    c = _np.concatenate([[0], _np.cumsum(c[:-1])])
+    return x[c]
+
+
+def quantile_closest(x, q, axis=None):
+    return _t.quantile(x, q, dim=axis, interpolation="nearest")
+
+
 def minvalues(x: _t.Tensor, **kwargs):
     return _t.min(x, **kwargs).values
 

multipers/filtrations/filtrations.py

@@ -17,7 +17,6 @@ try:
 
     from multipers.filtrations.density import KDE
 except ImportError:
-
     from sklearn.neighbors import KernelDensity
 
     warn("pykeops not found. Falling back to sklearn.")
@@ -67,7 +66,9 @@ def RipsLowerstar(
         function = function[:, None]
     if function.ndim != 2:
         raise ValueError(
-            f"`function.ndim` should be 0 or 1 . Got {function.ndim=}.{function=}"
+            f"""
+            `function.ndim` should be 0 or 1 . Got {function.ndim=}.{function=}
+            """
         )
     num_parameters = function.shape[1] + 1
     st = SimplexTreeMulti(st, num_parameters=num_parameters)
@@ -154,6 +155,9 @@ def DelaunayLowerstar(
         verbose=verbose,
         clear=clear,
     )
+    if reduce_degree >= 0:
+        # Force resolution to avoid confusion with hilbert.
+        slicer = slicer.minpres(degree=reduce_degree, force=True)
     if flagify:
         from multipers.slicer import to_simplextree
 
@@ -192,7 +196,7 @@ def DelaunayCodensity(
     ), "Density estimation is either via kernels or dtm."
     if bandwidth is not None:
         kde = KDE(bandwidth=bandwidth, kernel=kernel, return_log=return_log)
-        f = kde.fit(points).score_samples(points)
+        f = -kde.fit(points).score_samples(points)
     elif dtm_mass is not None:
         f = DTM(masses=[dtm_mass]).fit(points).score_samples(points)[0]
     else:
@@ -287,11 +291,17 @@ def CoreDelaunay(
         "safe",
         "exact",
         "fast",
-    ], f"The parameter precision must be one of ['safe', 'exact', 'fast'], got {precision}."
+    ], f"""
+    The parameter precision must be one of ['safe', 'exact', 'fast'],
+    got {precision}.
+    """
 
     if verbose:
         print(
-            f"Computing the Delaunay Core Bifiltration of {len(points)} points in dimension {points.shape[1]} with parameters:"
+            f"""Computing the Delaunay Core Bifiltration
+            of {len(points)} points in dimension {points.shape[1]}
+            with parameters:
+            """
         )
         print(f"\tbeta = {beta}")
         print(f"\tks = {ks}")
@@ -333,7 +343,10 @@ def CoreDelaunay(
         num_simplices = len(vertex_array)
         if verbose:
             print(
-                f"Inserting {num_simplices} simplices of dimension {dim} ({num_simplices * len(ks)} birth values)..."
+                f"""
+                Inserting {num_simplices} simplices of dimension {dim}
+                ({num_simplices * len(ks)} birth values)...
+                """
             )
         max_knn_distances = np.max(knn_distances[vertex_array], axis=1)
         critical_radii = np.maximum(alphas[:, None], beta * max_knn_distances)

multipers/plots.py

@@ -15,9 +15,9 @@ _custom_colors = [
     "#00b4d8",
     "#90e0ef",
 ]
-_cmap = ListedColormap(_custom_colors)
-_continuous_cmap = mcolors.LinearSegmentedColormap.from_list(
-    "continuous_cmap", _cmap.colors, N=256
+_cmap_ = ListedColormap(_custom_colors)
+_cmap = mcolors.LinearSegmentedColormap.from_list(
+    "continuous_cmap", _cmap_.colors, N=256
 )
 
 
@@ -180,8 +180,9 @@ def plot_surface(
     fig=None,
     ax=None,
     cmap: Optional[str] = None,
-    discrete_surface=False,
-    has_negative_values=False,
+    discrete_surface: bool = False,
+    has_negative_values: bool = False,
+    contour: bool = True,
     **plt_args,
 ):
     import matplotlib
@@ -213,7 +214,12 @@ def plot_surface(
         )
         cbar.set_ticks(ticks=bounds, labels=bounds)
         return im
-    im = ax.contourf(grid[0], grid[1], hf.T, cmap=cmap, **plt_args)
+
+    if contour:
+        levels = plt_args.pop("levels", 20)
+        im = ax.contourf(grid[0], grid[1], hf.T, cmap=cmap, levels=levels, **plt_args)
+    else:
+        im = ax.pcolormesh(grid[0], grid[1], hf.T, cmap=cmap, **plt_args)
     return im
 
 

multipers/simplex_tree_multi.pyx

@@ -883,6 +883,8 @@ cdef class SimplexTreeMulti_KFi32:
             bool coordinate_values=True,
             bool force=False,
             str strategy:_available_strategies = "exact",
+            resolution:Optional[int|list[int]] = None,
+            bool coordinates = False,
             grid_strategy=None,
             bool inplace=False,
             **filtration_grid_kwargs
@@ -910,7 +912,7 @@ cdef class SimplexTreeMulti_KFi32:
 
         #TODO : multi-critical
         if filtration_grid is None:  
-            filtration_grid = self.get_filtration_grid(grid_strategy=strategy, **filtration_grid_kwargs)
+            filtration_grid = self.get_filtration_grid(grid_strategy=strategy, resolution=resolution, **filtration_grid_kwargs)
         else:
             filtration_grid = sanitize_grid(filtration_grid)
             if len(filtration_grid) != self.num_parameters:
@@ -2322,6 +2324,8 @@ cdef class SimplexTreeMulti_Fi32:
             bool coordinate_values=True,
             bool force=False,
             str strategy:_available_strategies = "exact",
+            resolution:Optional[int|list[int]] = None,
+            bool coordinates = False,
             grid_strategy=None,
             bool inplace=False,
             **filtration_grid_kwargs
@@ -2349,7 +2353,7 @@ cdef class SimplexTreeMulti_Fi32:
 
         #TODO : multi-critical
         if filtration_grid is None:  
-            filtration_grid = self.get_filtration_grid(grid_strategy=strategy, **filtration_grid_kwargs)
+            filtration_grid = self.get_filtration_grid(grid_strategy=strategy, resolution=resolution, **filtration_grid_kwargs)
         else:
             filtration_grid = sanitize_grid(filtration_grid)
             if len(filtration_grid) != self.num_parameters:
@@ -3471,6 +3475,8 @@ cdef class SimplexTreeMulti_KFi64:
             bool coordinate_values=True,
             bool force=False,
             str strategy:_available_strategies = "exact",
+            resolution:Optional[int|list[int]] = None,
+            bool coordinates = False,
             grid_strategy=None,
             bool inplace=False,
             **filtration_grid_kwargs
@@ -3498,7 +3504,7 @@ cdef class SimplexTreeMulti_KFi64:
 
         #TODO : multi-critical
         if filtration_grid is None:  
-            filtration_grid = self.get_filtration_grid(grid_strategy=strategy, **filtration_grid_kwargs)
+            filtration_grid = self.get_filtration_grid(grid_strategy=strategy, resolution=resolution, **filtration_grid_kwargs)
         else:
             filtration_grid = sanitize_grid(filtration_grid)
             if len(filtration_grid) != self.num_parameters:
@@ -4910,6 +4916,8 @@ cdef class SimplexTreeMulti_Fi64:
             bool coordinate_values=True,
             bool force=False,
             str strategy:_available_strategies = "exact",
+            resolution:Optional[int|list[int]] = None,
+            bool coordinates = False,
             grid_strategy=None,
             bool inplace=False,
             **filtration_grid_kwargs
@@ -4937,7 +4945,7 @@ cdef class SimplexTreeMulti_Fi64:
 
         #TODO : multi-critical
         if filtration_grid is None:  
-            filtration_grid = self.get_filtration_grid(grid_strategy=strategy, **filtration_grid_kwargs)
+            filtration_grid = self.get_filtration_grid(grid_strategy=strategy, resolution=resolution, **filtration_grid_kwargs)
         else:
             filtration_grid = sanitize_grid(filtration_grid)
             if len(filtration_grid) != self.num_parameters:
@@ -6059,6 +6067,8 @@ cdef class SimplexTreeMulti_KFf32:
             bool coordinate_values=True,
             bool force=False,
             str strategy:_available_strategies = "exact",
+            resolution:Optional[int|list[int]] = None,
+            bool coordinates = False,
             grid_strategy=None,
             bool inplace=False,
             **filtration_grid_kwargs
@@ -6086,7 +6096,7 @@ cdef class SimplexTreeMulti_KFf32:
 
         #TODO : multi-critical
         if filtration_grid is None:  
-            filtration_grid = self.get_filtration_grid(grid_strategy=strategy, **filtration_grid_kwargs)
+            filtration_grid = self.get_filtration_grid(grid_strategy=strategy, resolution=resolution, **filtration_grid_kwargs)
         else:
             filtration_grid = sanitize_grid(filtration_grid)
             if len(filtration_grid) != self.num_parameters:
@@ -7498,6 +7508,8 @@ cdef class SimplexTreeMulti_Ff32:
             bool coordinate_values=True,
             bool force=False,
             str strategy:_available_strategies = "exact",
+            resolution:Optional[int|list[int]] = None,
+            bool coordinates = False,
             grid_strategy=None,
             bool inplace=False,
             **filtration_grid_kwargs
@@ -7525,7 +7537,7 @@ cdef class SimplexTreeMulti_Ff32:
 
         #TODO : multi-critical
         if filtration_grid is None:  
-            filtration_grid = self.get_filtration_grid(grid_strategy=strategy, **filtration_grid_kwargs)
+            filtration_grid = self.get_filtration_grid(grid_strategy=strategy, resolution=resolution, **filtration_grid_kwargs)
         else:
             filtration_grid = sanitize_grid(filtration_grid)
             if len(filtration_grid) != self.num_parameters:
@@ -8647,6 +8659,8 @@ cdef class SimplexTreeMulti_KFf64:
             bool coordinate_values=True,
             bool force=False,
             str strategy:_available_strategies = "exact",
+            resolution:Optional[int|list[int]] = None,
+            bool coordinates = False,
             grid_strategy=None,
             bool inplace=False,
             **filtration_grid_kwargs
@@ -8674,7 +8688,7 @@ cdef class SimplexTreeMulti_KFf64:
 
         #TODO : multi-critical
         if filtration_grid is None:  
-            filtration_grid = self.get_filtration_grid(grid_strategy=strategy, **filtration_grid_kwargs)
+            filtration_grid = self.get_filtration_grid(grid_strategy=strategy, resolution=resolution, **filtration_grid_kwargs)
         else:
             filtration_grid = sanitize_grid(filtration_grid)
             if len(filtration_grid) != self.num_parameters:
@@ -10086,6 +10100,8 @@ cdef class SimplexTreeMulti_Ff64:
             bool coordinate_values=True,
             bool force=False,
             str strategy:_available_strategies = "exact",
+            resolution:Optional[int|list[int]] = None,
+            bool coordinates = False,
             grid_strategy=None,
             bool inplace=False,
             **filtration_grid_kwargs
@@ -10113,7 +10129,7 @@ cdef class SimplexTreeMulti_Ff64:
 
         #TODO : multi-critical
         if filtration_grid is None:  
-            filtration_grid = self.get_filtration_grid(grid_strategy=strategy, **filtration_grid_kwargs)
+            filtration_grid = self.get_filtration_grid(grid_strategy=strategy, resolution=resolution, **filtration_grid_kwargs)
         else:
             filtration_grid = sanitize_grid(filtration_grid)
             if len(filtration_grid) != self.num_parameters:

multipers/simplex_tree_multi.pyx.tp

@@ -1330,6 +1330,8 @@ cdef class SimplexTreeMulti_{{FSHORT}}:
             bool coordinate_values=True,
             bool force=False,
             str strategy:_available_strategies = "exact",
+            resolution:Optional[int|list[int]] = None,
+            bool coordinates = False,
             grid_strategy=None,
             bool inplace=False,
             **filtration_grid_kwargs
@@ -1357,7 +1359,7 @@ cdef class SimplexTreeMulti_{{FSHORT}}:
 
         #TODO : multi-critical
         if filtration_grid is None:  
-            filtration_grid = self.get_filtration_grid(grid_strategy=strategy, **filtration_grid_kwargs)
+            filtration_grid = self.get_filtration_grid(grid_strategy=strategy, resolution=resolution, **filtration_grid_kwargs)
         else:
             filtration_grid = sanitize_grid(filtration_grid)
             if len(filtration_grid) != self.num_parameters:

multipers/slicer.pxd

@@ -2013,51 +2013,51 @@ cdef extern from "multiparameter_module_approximation/approximation.h" namespace
 
 import multipers.slicer as mps
 from cython.operator cimport dereference
-cdef inline Module[double] _multiparameter_module_approximation_f64(object slicer, One_critical_filtration[double] direction, double max_error, Box[double] box, bool threshold, bool complete, bool verbose):
+cdef inline Module[float] _multiparameter_module_approximation_f32(object slicer, One_critical_filtration[float] direction, float max_error, Box[float] box, bool threshold, bool complete, bool verbose):
   import multipers.slicer as mps
   cdef intptr_t slicer_ptr = <intptr_t>(slicer.get_ptr())
-  cdef Module[double] mod
+  cdef Module[float] mod
   if False:
     pass
-  elif isinstance(slicer, mps._KSlicer_Matrix0_vine_f64):
+  elif isinstance(slicer, mps._KSlicer_Matrix0_vine_f32):
     with nogil:
-      mod = multiparameter_module_approximation(dereference(<C_KSlicer_Matrix0_vine_f64*>(slicer_ptr)), direction, max_error, box, threshold, complete, verbose)
+      mod = multiparameter_module_approximation(dereference(<C_KSlicer_Matrix0_vine_f32*>(slicer_ptr)), direction, max_error, box, threshold, complete, verbose)
     return mod
-  elif isinstance(slicer, mps._KSlicer_Matrix1_vine_f64):
+  elif isinstance(slicer, mps._KSlicer_Matrix1_vine_f32):
     with nogil:
-      mod = multiparameter_module_approximation(dereference(<C_KSlicer_Matrix1_vine_f64*>(slicer_ptr)), direction, max_error, box, threshold, complete, verbose)
+      mod = multiparameter_module_approximation(dereference(<C_KSlicer_Matrix1_vine_f32*>(slicer_ptr)), direction, max_error, box, threshold, complete, verbose)
     return mod
-  elif isinstance(slicer, mps._Slicer_Matrix0_vine_f64):
+  elif isinstance(slicer, mps._Slicer_Matrix0_vine_f32):
     with nogil:
-      mod = multiparameter_module_approximation(dereference(<C_Slicer_Matrix0_vine_f64*>(slicer_ptr)), direction, max_error, box, threshold, complete, verbose)
+      mod = multiparameter_module_approximation(dereference(<C_Slicer_Matrix0_vine_f32*>(slicer_ptr)), direction, max_error, box, threshold, complete, verbose)
     return mod
-  elif isinstance(slicer, mps._Slicer_Matrix1_vine_f64):
+  elif isinstance(slicer, mps._Slicer_Matrix1_vine_f32):
     with nogil:
-      mod = multiparameter_module_approximation(dereference(<C_Slicer_Matrix1_vine_f64*>(slicer_ptr)), direction, max_error, box, threshold, complete, verbose)
+      mod = multiparameter_module_approximation(dereference(<C_Slicer_Matrix1_vine_f32*>(slicer_ptr)), direction, max_error, box, threshold, complete, verbose)
     return mod
   else:
     raise ValueError(f"Unsupported slicer type {type(slicer)}")
-cdef inline Module[float] _multiparameter_module_approximation_f32(object slicer, One_critical_filtration[float] direction, float max_error, Box[float] box, bool threshold, bool complete, bool verbose):
+cdef inline Module[double] _multiparameter_module_approximation_f64(object slicer, One_critical_filtration[double] direction, double max_error, Box[double] box, bool threshold, bool complete, bool verbose):
   import multipers.slicer as mps
   cdef intptr_t slicer_ptr = <intptr_t>(slicer.get_ptr())
-  cdef Module[float] mod
+  cdef Module[double] mod
   if False:
     pass
-  elif isinstance(slicer, mps._KSlicer_Matrix0_vine_f32):
+  elif isinstance(slicer, mps._KSlicer_Matrix0_vine_f64):
     with nogil:
-      mod = multiparameter_module_approximation(dereference(<C_KSlicer_Matrix0_vine_f32*>(slicer_ptr)), direction, max_error, box, threshold, complete, verbose)
+      mod = multiparameter_module_approximation(dereference(<C_KSlicer_Matrix0_vine_f64*>(slicer_ptr)), direction, max_error, box, threshold, complete, verbose)
     return mod
-  elif isinstance(slicer, mps._KSlicer_Matrix1_vine_f32):
+  elif isinstance(slicer, mps._KSlicer_Matrix1_vine_f64):
     with nogil:
-      mod = multiparameter_module_approximation(dereference(<C_KSlicer_Matrix1_vine_f32*>(slicer_ptr)), direction, max_error, box, threshold, complete, verbose)
+      mod = multiparameter_module_approximation(dereference(<C_KSlicer_Matrix1_vine_f64*>(slicer_ptr)), direction, max_error, box, threshold, complete, verbose)
     return mod
-  elif isinstance(slicer, mps._Slicer_Matrix0_vine_f32):
+  elif isinstance(slicer, mps._Slicer_Matrix0_vine_f64):
     with nogil:
-      mod = multiparameter_module_approximation(dereference(<C_Slicer_Matrix0_vine_f32*>(slicer_ptr)), direction, max_error, box, threshold, complete, verbose)
+      mod = multiparameter_module_approximation(dereference(<C_Slicer_Matrix0_vine_f64*>(slicer_ptr)), direction, max_error, box, threshold, complete, verbose)
     return mod
-  elif isinstance(slicer, mps._Slicer_Matrix1_vine_f32):
+  elif isinstance(slicer, mps._Slicer_Matrix1_vine_f64):
     with nogil:
-      mod = multiparameter_module_approximation(dereference(<C_Slicer_Matrix1_vine_f32*>(slicer_ptr)), direction, max_error, box, threshold, complete, verbose)
+      mod = multiparameter_module_approximation(dereference(<C_Slicer_Matrix1_vine_f64*>(slicer_ptr)), direction, max_error, box, threshold, complete, verbose)
     return mod
   else:
     raise ValueError(f"Unsupported slicer type {type(slicer)}")

multipers/slicer.pyx

@@ -549,7 +549,7 @@ cdef class _KSlicer_Matrix0_vine_i32:
       filtration_array = np.asarray(filtration_array, dtype= np.int32)
       cdef int32_t[:,:] arr_view = filtration_array
       cdef int size = arr_view.shape[0]
-      if arr_view.shape[1] != self.truc.num_generators():
+      if <int>arr_view.shape[1] != <int>self.truc.num_generators():
           raise ValueError(f"Got filtration array of shape {filtration_array.shape=} / {arr_view.shape=}. Was expecting (-1, {len(self)=})")
 
       return tuple(tuple(np.array(bc_idx_degree, dtype=int) for bc_idx_degree in bc_idx) for bc_idx in self.truc.custom_persistences(&arr_view[0,0], size, ignore_inf))
@@ -1040,7 +1040,7 @@ cdef class _KSlicer_Matrix1_vine_i32:
       filtration_array = np.asarray(filtration_array, dtype= np.int32)
       cdef int32_t[:,:] arr_view = filtration_array
       cdef int size = arr_view.shape[0]
-      if arr_view.shape[1] != self.truc.num_generators():
+      if <int>arr_view.shape[1] != <int>self.truc.num_generators():
           raise ValueError(f"Got filtration array of shape {filtration_array.shape=} / {arr_view.shape=}. Was expecting (-1, {len(self)=})")
 
       return tuple(tuple(np.array(bc_idx_degree, dtype=int) for bc_idx_degree in bc_idx) for bc_idx in self.truc.custom_persistences(&arr_view[0,0], size, ignore_inf))
@@ -1531,7 +1531,7 @@ cdef class _KSlicer_Matrix0_vine_i64:
       filtration_array = np.asarray(filtration_array, dtype= np.int64)
       cdef int64_t[:,:] arr_view = filtration_array
       cdef int size = arr_view.shape[0]
-      if arr_view.shape[1] != self.truc.num_generators():
+      if <int>arr_view.shape[1] != <int>self.truc.num_generators():
           raise ValueError(f"Got filtration array of shape {filtration_array.shape=} / {arr_view.shape=}. Was expecting (-1, {len(self)=})")
 
       return tuple(tuple(np.array(bc_idx_degree, dtype=int) for bc_idx_degree in bc_idx) for bc_idx in self.truc.custom_persistences(&arr_view[0,0], size, ignore_inf))
@@ -2022,7 +2022,7 @@ cdef class _KSlicer_Matrix1_vine_i64:
       filtration_array = np.asarray(filtration_array, dtype= np.int64)
       cdef int64_t[:,:] arr_view = filtration_array
       cdef int size = arr_view.shape[0]
-      if arr_view.shape[1] != self.truc.num_generators():
+      if <int>arr_view.shape[1] != <int>self.truc.num_generators():
           raise ValueError(f"Got filtration array of shape {filtration_array.shape=} / {arr_view.shape=}. Was expecting (-1, {len(self)=})")
 
       return tuple(tuple(np.array(bc_idx_degree, dtype=int) for bc_idx_degree in bc_idx) for bc_idx in self.truc.custom_persistences(&arr_view[0,0], size, ignore_inf))
@@ -2514,7 +2514,7 @@ cdef class _KSlicer_Matrix0_vine_f32:
       filtration_array = np.asarray(filtration_array, dtype= np.float32)
       cdef float[:,:] arr_view = filtration_array
       cdef int size = arr_view.shape[0]
-      if arr_view.shape[1] != self.truc.num_generators():
+      if <int>arr_view.shape[1] != <int>self.truc.num_generators():
           raise ValueError(f"Got filtration array of shape {filtration_array.shape=} / {arr_view.shape=}. Was expecting (-1, {len(self)=})")
 
       return tuple(tuple(np.array(bc_idx_degree, dtype=int) for bc_idx_degree in bc_idx) for bc_idx in self.truc.custom_persistences(&arr_view[0,0], size, ignore_inf))
@@ -3006,7 +3006,7 @@ cdef class _KSlicer_Matrix1_vine_f32:
       filtration_array = np.asarray(filtration_array, dtype= np.float32)
       cdef float[:,:] arr_view = filtration_array
       cdef int size = arr_view.shape[0]
-      if arr_view.shape[1] != self.truc.num_generators():
+      if <int>arr_view.shape[1] != <int>self.truc.num_generators():
           raise ValueError(f"Got filtration array of shape {filtration_array.shape=} / {arr_view.shape=}. Was expecting (-1, {len(self)=})")
 
       return tuple(tuple(np.array(bc_idx_degree, dtype=int) for bc_idx_degree in bc_idx) for bc_idx in self.truc.custom_persistences(&arr_view[0,0], size, ignore_inf))
@@ -3498,7 +3498,7 @@ cdef class _KSlicer_Matrix0_vine_f64:
       filtration_array = np.asarray(filtration_array, dtype= np.float64)
       cdef double[:,:] arr_view = filtration_array
       cdef int size = arr_view.shape[0]
-      if arr_view.shape[1] != self.truc.num_generators():
+      if <int>arr_view.shape[1] != <int>self.truc.num_generators():
           raise ValueError(f"Got filtration array of shape {filtration_array.shape=} / {arr_view.shape=}. Was expecting (-1, {len(self)=})")
 
       return tuple(tuple(np.array(bc_idx_degree, dtype=int) for bc_idx_degree in bc_idx) for bc_idx in self.truc.custom_persistences(&arr_view[0,0], size, ignore_inf))
@@ -3990,7 +3990,7 @@ cdef class _KSlicer_Matrix1_vine_f64:
       filtration_array = np.asarray(filtration_array, dtype= np.float64)
       cdef double[:,:] arr_view = filtration_array
       cdef int size = arr_view.shape[0]
-      if arr_view.shape[1] != self.truc.num_generators():
+      if <int>arr_view.shape[1] != <int>self.truc.num_generators():
           raise ValueError(f"Got filtration array of shape {filtration_array.shape=} / {arr_view.shape=}. Was expecting (-1, {len(self)=})")
 
       return tuple(tuple(np.array(bc_idx_degree, dtype=int) for bc_idx_degree in bc_idx) for bc_idx in self.truc.custom_persistences(&arr_view[0,0], size, ignore_inf))
@@ -4472,7 +4472,7 @@ cdef class _Slicer_Matrix0_vine_i32:
       filtration_array = np.asarray(filtration_array, dtype= np.int32)
       cdef int32_t[:,:] arr_view = filtration_array
       cdef int size = arr_view.shape[0]
-      if arr_view.shape[1] != self.truc.num_generators():
+      if <int>arr_view.shape[1] != <int>self.truc.num_generators():
           raise ValueError(f"Got filtration array of shape {filtration_array.shape=} / {arr_view.shape=}. Was expecting (-1, {len(self)=})")
 
       return tuple(tuple(np.array(bc_idx_degree, dtype=int) for bc_idx_degree in bc_idx) for bc_idx in self.truc.custom_persistences(&arr_view[0,0], size, ignore_inf))
@@ -4976,7 +4976,7 @@ cdef class _Slicer_Matrix1_vine_i32:
       filtration_array = np.asarray(filtration_array, dtype= np.int32)
       cdef int32_t[:,:] arr_view = filtration_array
       cdef int size = arr_view.shape[0]
-      if arr_view.shape[1] != self.truc.num_generators():
+      if <int>arr_view.shape[1] != <int>self.truc.num_generators():
           raise ValueError(f"Got filtration array of shape {filtration_array.shape=} / {arr_view.shape=}. Was expecting (-1, {len(self)=})")
 
       return tuple(tuple(np.array(bc_idx_degree, dtype=int) for bc_idx_degree in bc_idx) for bc_idx in self.truc.custom_persistences(&arr_view[0,0], size, ignore_inf))
@@ -5480,7 +5480,7 @@ cdef class _Slicer_Matrix0_vine_i64:
       filtration_array = np.asarray(filtration_array, dtype= np.int64)
       cdef int64_t[:,:] arr_view = filtration_array
       cdef int size = arr_view.shape[0]
-      if arr_view.shape[1] != self.truc.num_generators():
+      if <int>arr_view.shape[1] != <int>self.truc.num_generators():
           raise ValueError(f"Got filtration array of shape {filtration_array.shape=} / {arr_view.shape=}. Was expecting (-1, {len(self)=})")
 
       return tuple(tuple(np.array(bc_idx_degree, dtype=int) for bc_idx_degree in bc_idx) for bc_idx in self.truc.custom_persistences(&arr_view[0,0], size, ignore_inf))
@@ -5984,7 +5984,7 @@ cdef class _Slicer_Matrix1_vine_i64:
       filtration_array = np.asarray(filtration_array, dtype= np.int64)
       cdef int64_t[:,:] arr_view = filtration_array
       cdef int size = arr_view.shape[0]
-      if arr_view.shape[1] != self.truc.num_generators():
+      if <int>arr_view.shape[1] != <int>self.truc.num_generators():
           raise ValueError(f"Got filtration array of shape {filtration_array.shape=} / {arr_view.shape=}. Was expecting (-1, {len(self)=})")
 
       return tuple(tuple(np.array(bc_idx_degree, dtype=int) for bc_idx_degree in bc_idx) for bc_idx in self.truc.custom_persistences(&arr_view[0,0], size, ignore_inf))
@@ -6489,7 +6489,7 @@ cdef class _Slicer_Matrix0_vine_f32:
       filtration_array = np.asarray(filtration_array, dtype= np.float32)
       cdef float[:,:] arr_view = filtration_array
       cdef int size = arr_view.shape[0]
-      if arr_view.shape[1] != self.truc.num_generators():
+      if <int>arr_view.shape[1] != <int>self.truc.num_generators():
           raise ValueError(f"Got filtration array of shape {filtration_array.shape=} / {arr_view.shape=}. Was expecting (-1, {len(self)=})")
 
       return tuple(tuple(np.array(bc_idx_degree, dtype=int) for bc_idx_degree in bc_idx) for bc_idx in self.truc.custom_persistences(&arr_view[0,0], size, ignore_inf))
@@ -6994,7 +6994,7 @@ cdef class _Slicer_Matrix1_vine_f32:
       filtration_array = np.asarray(filtration_array, dtype= np.float32)
       cdef float[:,:] arr_view = filtration_array
       cdef int size = arr_view.shape[0]
-      if arr_view.shape[1] != self.truc.num_generators():
+      if <int>arr_view.shape[1] != <int>self.truc.num_generators():
           raise ValueError(f"Got filtration array of shape {filtration_array.shape=} / {arr_view.shape=}. Was expecting (-1, {len(self)=})")
 
       return tuple(tuple(np.array(bc_idx_degree, dtype=int) for bc_idx_degree in bc_idx) for bc_idx in self.truc.custom_persistences(&arr_view[0,0], size, ignore_inf))
@@ -7499,7 +7499,7 @@ cdef class _Slicer_Matrix0_vine_f64:
       filtration_array = np.asarray(filtration_array, dtype= np.float64)
       cdef double[:,:] arr_view = filtration_array
       cdef int size = arr_view.shape[0]
-      if arr_view.shape[1] != self.truc.num_generators():
+      if <int>arr_view.shape[1] != <int>self.truc.num_generators():
           raise ValueError(f"Got filtration array of shape {filtration_array.shape=} / {arr_view.shape=}. Was expecting (-1, {len(self)=})")
 
       return tuple(tuple(np.array(bc_idx_degree, dtype=int) for bc_idx_degree in bc_idx) for bc_idx in self.truc.custom_persistences(&arr_view[0,0], size, ignore_inf))
@@ -8004,7 +8004,7 @@ cdef class _Slicer_Matrix1_vine_f64:
       filtration_array = np.asarray(filtration_array, dtype= np.float64)
       cdef double[:,:] arr_view = filtration_array
       cdef int size = arr_view.shape[0]
-      if arr_view.shape[1] != self.truc.num_generators():
+      if <int>arr_view.shape[1] != <int>self.truc.num_generators():
           raise ValueError(f"Got filtration array of shape {filtration_array.shape=} / {arr_view.shape=}. Was expecting (-1, {len(self)=})")
 
       return tuple(tuple(np.array(bc_idx_degree, dtype=int) for bc_idx_degree in bc_idx) for bc_idx in self.truc.custom_persistences(&arr_view[0,0], size, ignore_inf))
@@ -8517,7 +8517,7 @@ cdef class _KSlicer_Matrix0_i32:
       filtration_array = np.asarray(filtration_array, dtype= np.int32)
       cdef int32_t[:,:] arr_view = filtration_array
       cdef int size = arr_view.shape[0]
-      if arr_view.shape[1] != self.truc.num_generators():
+      if <int>arr_view.shape[1] != <int>self.truc.num_generators():
           raise ValueError(f"Got filtration array of shape {filtration_array.shape=} / {arr_view.shape=}. Was expecting (-1, {len(self)=})")
 
       return tuple(tuple(np.array(bc_idx_degree, dtype=int) for bc_idx_degree in bc_idx) for bc_idx in self.truc.custom_persistences(&arr_view[0,0], size, ignore_inf))
@@ -8990,7 +8990,7 @@ cdef class _KSlicer_Matrix1_i32:
       filtration_array = np.asarray(filtration_array, dtype= np.int32)
       cdef int32_t[:,:] arr_view = filtration_array
       cdef int size = arr_view.shape[0]
-      if arr_view.shape[1] != self.truc.num_generators():
+      if <int>arr_view.shape[1] != <int>self.truc.num_generators():
           raise ValueError(f"Got filtration array of shape {filtration_array.shape=} / {arr_view.shape=}. Was expecting (-1, {len(self)=})")
 
       return tuple(tuple(np.array(bc_idx_degree, dtype=int) for bc_idx_degree in bc_idx) for bc_idx in self.truc.custom_persistences(&arr_view[0,0], size, ignore_inf))
@@ -9463,7 +9463,7 @@ cdef class _KSlicer_Matrix0_i64:
       filtration_array = np.asarray(filtration_array, dtype= np.int64)
       cdef int64_t[:,:] arr_view = filtration_array
       cdef int size = arr_view.shape[0]
-      if arr_view.shape[1] != self.truc.num_generators():
+      if <int>arr_view.shape[1] != <int>self.truc.num_generators():
           raise ValueError(f"Got filtration array of shape {filtration_array.shape=} / {arr_view.shape=}. Was expecting (-1, {len(self)=})")
 
       return tuple(tuple(np.array(bc_idx_degree, dtype=int) for bc_idx_degree in bc_idx) for bc_idx in self.truc.custom_persistences(&arr_view[0,0], size, ignore_inf))
@@ -9936,7 +9936,7 @@ cdef class _KSlicer_Matrix1_i64:
       filtration_array = np.asarray(filtration_array, dtype= np.int64)
       cdef int64_t[:,:] arr_view = filtration_array
       cdef int size = arr_view.shape[0]
-      if arr_view.shape[1] != self.truc.num_generators():
+      if <int>arr_view.shape[1] != <int>self.truc.num_generators():
           raise ValueError(f"Got filtration array of shape {filtration_array.shape=} / {arr_view.shape=}. Was expecting (-1, {len(self)=})")
 
       return tuple(tuple(np.array(bc_idx_degree, dtype=int) for bc_idx_degree in bc_idx) for bc_idx in self.truc.custom_persistences(&arr_view[0,0], size, ignore_inf))
@@ -10410,7 +10410,7 @@ cdef class _KSlicer_Matrix0_f32:
       filtration_array = np.asarray(filtration_array, dtype= np.float32)
       cdef float[:,:] arr_view = filtration_array
       cdef int size = arr_view.shape[0]
-      if arr_view.shape[1] != self.truc.num_generators():
+      if <int>arr_view.shape[1] != <int>self.truc.num_generators():
           raise ValueError(f"Got filtration array of shape {filtration_array.shape=} / {arr_view.shape=}. Was expecting (-1, {len(self)=})")
 
       return tuple(tuple(np.array(bc_idx_degree, dtype=int) for bc_idx_degree in bc_idx) for bc_idx in self.truc.custom_persistences(&arr_view[0,0], size, ignore_inf))
@@ -10884,7 +10884,7 @@ cdef class _KSlicer_Matrix1_f32:
       filtration_array = np.asarray(filtration_array, dtype= np.float32)
       cdef float[:,:] arr_view = filtration_array
       cdef int size = arr_view.shape[0]
-      if arr_view.shape[1] != self.truc.num_generators():
+      if <int>arr_view.shape[1] != <int>self.truc.num_generators():
           raise ValueError(f"Got filtration array of shape {filtration_array.shape=} / {arr_view.shape=}. Was expecting (-1, {len(self)=})")
 
       return tuple(tuple(np.array(bc_idx_degree, dtype=int) for bc_idx_degree in bc_idx) for bc_idx in self.truc.custom_persistences(&arr_view[0,0], size, ignore_inf))
@@ -11358,7 +11358,7 @@ cdef class _KSlicer_Matrix0_f64:
       filtration_array = np.asarray(filtration_array, dtype= np.float64)
       cdef double[:,:] arr_view = filtration_array
       cdef int size = arr_view.shape[0]
-      if arr_view.shape[1] != self.truc.num_generators():
+      if <int>arr_view.shape[1] != <int>self.truc.num_generators():
           raise ValueError(f"Got filtration array of shape {filtration_array.shape=} / {arr_view.shape=}. Was expecting (-1, {len(self)=})")
 
       return tuple(tuple(np.array(bc_idx_degree, dtype=int) for bc_idx_degree in bc_idx) for bc_idx in self.truc.custom_persistences(&arr_view[0,0], size, ignore_inf))
@@ -11832,7 +11832,7 @@ cdef class _KSlicer_Matrix1_f64:
       filtration_array = np.asarray(filtration_array, dtype= np.float64)
       cdef double[:,:] arr_view = filtration_array
       cdef int size = arr_view.shape[0]
-      if arr_view.shape[1] != self.truc.num_generators():
+      if <int>arr_view.shape[1] != <int>self.truc.num_generators():
           raise ValueError(f"Got filtration array of shape {filtration_array.shape=} / {arr_view.shape=}. Was expecting (-1, {len(self)=})")
 
       return tuple(tuple(np.array(bc_idx_degree, dtype=int) for bc_idx_degree in bc_idx) for bc_idx in self.truc.custom_persistences(&arr_view[0,0], size, ignore_inf))
@@ -12296,7 +12296,7 @@ cdef class _Slicer_Matrix0_i32:
       filtration_array = np.asarray(filtration_array, dtype= np.int32)
       cdef int32_t[:,:] arr_view = filtration_array
       cdef int size = arr_view.shape[0]
-      if arr_view.shape[1] != self.truc.num_generators():
+      if <int>arr_view.shape[1] != <int>self.truc.num_generators():
           raise ValueError(f"Got filtration array of shape {filtration_array.shape=} / {arr_view.shape=}. Was expecting (-1, {len(self)=})")
 
       return tuple(tuple(np.array(bc_idx_degree, dtype=int) for bc_idx_degree in bc_idx) for bc_idx in self.truc.custom_persistences(&arr_view[0,0], size, ignore_inf))
@@ -12782,7 +12782,7 @@ cdef class _Slicer_Matrix1_i32:
       filtration_array = np.asarray(filtration_array, dtype= np.int32)
       cdef int32_t[:,:] arr_view = filtration_array
       cdef int size = arr_view.shape[0]
-      if arr_view.shape[1] != self.truc.num_generators():
+      if <int>arr_view.shape[1] != <int>self.truc.num_generators():
           raise ValueError(f"Got filtration array of shape {filtration_array.shape=} / {arr_view.shape=}. Was expecting (-1, {len(self)=})")
 
       return tuple(tuple(np.array(bc_idx_degree, dtype=int) for bc_idx_degree in bc_idx) for bc_idx in self.truc.custom_persistences(&arr_view[0,0], size, ignore_inf))
@@ -13268,7 +13268,7 @@ cdef class _Slicer_Matrix0_i64:
       filtration_array = np.asarray(filtration_array, dtype= np.int64)
       cdef int64_t[:,:] arr_view = filtration_array
       cdef int size = arr_view.shape[0]
-      if arr_view.shape[1] != self.truc.num_generators():
+      if <int>arr_view.shape[1] != <int>self.truc.num_generators():
           raise ValueError(f"Got filtration array of shape {filtration_array.shape=} / {arr_view.shape=}. Was expecting (-1, {len(self)=})")
 
       return tuple(tuple(np.array(bc_idx_degree, dtype=int) for bc_idx_degree in bc_idx) for bc_idx in self.truc.custom_persistences(&arr_view[0,0], size, ignore_inf))
@@ -13754,7 +13754,7 @@ cdef class _Slicer_Matrix1_i64:
       filtration_array = np.asarray(filtration_array, dtype= np.int64)
       cdef int64_t[:,:] arr_view = filtration_array
       cdef int size = arr_view.shape[0]
-      if arr_view.shape[1] != self.truc.num_generators():
+      if <int>arr_view.shape[1] != <int>self.truc.num_generators():
           raise ValueError(f"Got filtration array of shape {filtration_array.shape=} / {arr_view.shape=}. Was expecting (-1, {len(self)=})")
 
       return tuple(tuple(np.array(bc_idx_degree, dtype=int) for bc_idx_degree in bc_idx) for bc_idx in self.truc.custom_persistences(&arr_view[0,0], size, ignore_inf))
@@ -14241,7 +14241,7 @@ cdef class _Slicer_Matrix0_f32:
       filtration_array = np.asarray(filtration_array, dtype= np.float32)
       cdef float[:,:] arr_view = filtration_array
       cdef int size = arr_view.shape[0]
-      if arr_view.shape[1] != self.truc.num_generators():
+      if <int>arr_view.shape[1] != <int>self.truc.num_generators():
           raise ValueError(f"Got filtration array of shape {filtration_array.shape=} / {arr_view.shape=}. Was expecting (-1, {len(self)=})")
 
       return tuple(tuple(np.array(bc_idx_degree, dtype=int) for bc_idx_degree in bc_idx) for bc_idx in self.truc.custom_persistences(&arr_view[0,0], size, ignore_inf))
@@ -14728,7 +14728,7 @@ cdef class _Slicer_Matrix1_f32:
       filtration_array = np.asarray(filtration_array, dtype= np.float32)
       cdef float[:,:] arr_view = filtration_array
       cdef int size = arr_view.shape[0]
-      if arr_view.shape[1] != self.truc.num_generators():
+      if <int>arr_view.shape[1] != <int>self.truc.num_generators():
           raise ValueError(f"Got filtration array of shape {filtration_array.shape=} / {arr_view.shape=}. Was expecting (-1, {len(self)=})")
 
       return tuple(tuple(np.array(bc_idx_degree, dtype=int) for bc_idx_degree in bc_idx) for bc_idx in self.truc.custom_persistences(&arr_view[0,0], size, ignore_inf))
@@ -15215,7 +15215,7 @@ cdef class _Slicer_Matrix0_f64:
       filtration_array = np.asarray(filtration_array, dtype= np.float64)
       cdef double[:,:] arr_view = filtration_array
       cdef int size = arr_view.shape[0]
-      if arr_view.shape[1] != self.truc.num_generators():
+      if <int>arr_view.shape[1] != <int>self.truc.num_generators():
           raise ValueError(f"Got filtration array of shape {filtration_array.shape=} / {arr_view.shape=}. Was expecting (-1, {len(self)=})")
 
       return tuple(tuple(np.array(bc_idx_degree, dtype=int) for bc_idx_degree in bc_idx) for bc_idx in self.truc.custom_persistences(&arr_view[0,0], size, ignore_inf))
@@ -15702,7 +15702,7 @@ cdef class _Slicer_Matrix1_f64:
       filtration_array = np.asarray(filtration_array, dtype= np.float64)
       cdef double[:,:] arr_view = filtration_array
       cdef int size = arr_view.shape[0]
-      if arr_view.shape[1] != self.truc.num_generators():
+      if <int>arr_view.shape[1] != <int>self.truc.num_generators():
           raise ValueError(f"Got filtration array of shape {filtration_array.shape=} / {arr_view.shape=}. Was expecting (-1, {len(self)=})")
 
       return tuple(tuple(np.array(bc_idx_degree, dtype=int) for bc_idx_degree in bc_idx) for bc_idx in self.truc.custom_persistences(&arr_view[0,0], size, ignore_inf))
@@ -16197,7 +16197,7 @@ cdef class _KSlicer_GudhiCohomology0_i32:
       filtration_array = np.asarray(filtration_array, dtype= np.int32)
       cdef int32_t[:,:] arr_view = filtration_array
       cdef int size = arr_view.shape[0]
-      if arr_view.shape[1] != self.truc.num_generators():
+      if <int>arr_view.shape[1] != <int>self.truc.num_generators():
           raise ValueError(f"Got filtration array of shape {filtration_array.shape=} / {arr_view.shape=}. Was expecting (-1, {len(self)=})")
 
       return tuple(tuple(np.array(bc_idx_degree, dtype=int) for bc_idx_degree in bc_idx) for bc_idx in self.truc.custom_persistences(&arr_view[0,0], size, ignore_inf))
@@ -16670,7 +16670,7 @@ cdef class _KSlicer_GudhiCohomology0_i64:
       filtration_array = np.asarray(filtration_array, dtype= np.int64)
       cdef int64_t[:,:] arr_view = filtration_array
       cdef int size = arr_view.shape[0]
-      if arr_view.shape[1] != self.truc.num_generators():
+      if <int>arr_view.shape[1] != <int>self.truc.num_generators():
           raise ValueError(f"Got filtration array of shape {filtration_array.shape=} / {arr_view.shape=}. Was expecting (-1, {len(self)=})")
 
       return tuple(tuple(np.array(bc_idx_degree, dtype=int) for bc_idx_degree in bc_idx) for bc_idx in self.truc.custom_persistences(&arr_view[0,0], size, ignore_inf))
@@ -17144,7 +17144,7 @@ cdef class _KSlicer_GudhiCohomology0_f32:
       filtration_array = np.asarray(filtration_array, dtype= np.float32)
       cdef float[:,:] arr_view = filtration_array
       cdef int size = arr_view.shape[0]
-      if arr_view.shape[1] != self.truc.num_generators():
+      if <int>arr_view.shape[1] != <int>self.truc.num_generators():
           raise ValueError(f"Got filtration array of shape {filtration_array.shape=} / {arr_view.shape=}. Was expecting (-1, {len(self)=})")
 
       return tuple(tuple(np.array(bc_idx_degree, dtype=int) for bc_idx_degree in bc_idx) for bc_idx in self.truc.custom_persistences(&arr_view[0,0], size, ignore_inf))
@@ -17618,7 +17618,7 @@ cdef class _KSlicer_GudhiCohomology0_f64:
       filtration_array = np.asarray(filtration_array, dtype= np.float64)
       cdef double[:,:] arr_view = filtration_array
       cdef int size = arr_view.shape[0]
-      if arr_view.shape[1] != self.truc.num_generators():
+      if <int>arr_view.shape[1] != <int>self.truc.num_generators():
           raise ValueError(f"Got filtration array of shape {filtration_array.shape=} / {arr_view.shape=}. Was expecting (-1, {len(self)=})")
 
       return tuple(tuple(np.array(bc_idx_degree, dtype=int) for bc_idx_degree in bc_idx) for bc_idx in self.truc.custom_persistences(&arr_view[0,0], size, ignore_inf))
@@ -18082,7 +18082,7 @@ cdef class _Slicer_GudhiCohomology0_i32:
       filtration_array = np.asarray(filtration_array, dtype= np.int32)
       cdef int32_t[:,:] arr_view = filtration_array
       cdef int size = arr_view.shape[0]
-      if arr_view.shape[1] != self.truc.num_generators():
+      if <int>arr_view.shape[1] != <int>self.truc.num_generators():
           raise ValueError(f"Got filtration array of shape {filtration_array.shape=} / {arr_view.shape=}. Was expecting (-1, {len(self)=})")
 
       return tuple(tuple(np.array(bc_idx_degree, dtype=int) for bc_idx_degree in bc_idx) for bc_idx in self.truc.custom_persistences(&arr_view[0,0], size, ignore_inf))
@@ -18568,7 +18568,7 @@ cdef class _Slicer_GudhiCohomology0_i64:
       filtration_array = np.asarray(filtration_array, dtype= np.int64)
       cdef int64_t[:,:] arr_view = filtration_array
       cdef int size = arr_view.shape[0]
-      if arr_view.shape[1] != self.truc.num_generators():
+      if <int>arr_view.shape[1] != <int>self.truc.num_generators():
           raise ValueError(f"Got filtration array of shape {filtration_array.shape=} / {arr_view.shape=}. Was expecting (-1, {len(self)=})")
 
       return tuple(tuple(np.array(bc_idx_degree, dtype=int) for bc_idx_degree in bc_idx) for bc_idx in self.truc.custom_persistences(&arr_view[0,0], size, ignore_inf))
@@ -19055,7 +19055,7 @@ cdef class _Slicer_GudhiCohomology0_f32:
       filtration_array = np.asarray(filtration_array, dtype= np.float32)
       cdef float[:,:] arr_view = filtration_array
       cdef int size = arr_view.shape[0]
-      if arr_view.shape[1] != self.truc.num_generators():
+      if <int>arr_view.shape[1] != <int>self.truc.num_generators():
           raise ValueError(f"Got filtration array of shape {filtration_array.shape=} / {arr_view.shape=}. Was expecting (-1, {len(self)=})")
 
       return tuple(tuple(np.array(bc_idx_degree, dtype=int) for bc_idx_degree in bc_idx) for bc_idx in self.truc.custom_persistences(&arr_view[0,0], size, ignore_inf))
@@ -19542,7 +19542,7 @@ cdef class _Slicer_GudhiCohomology0_f64:
       filtration_array = np.asarray(filtration_array, dtype= np.float64)
       cdef double[:,:] arr_view = filtration_array
       cdef int size = arr_view.shape[0]
-      if arr_view.shape[1] != self.truc.num_generators():
+      if <int>arr_view.shape[1] != <int>self.truc.num_generators():
           raise ValueError(f"Got filtration array of shape {filtration_array.shape=} / {arr_view.shape=}. Was expecting (-1, {len(self)=})")
 
       return tuple(tuple(np.array(bc_idx_degree, dtype=int) for bc_idx_degree in bc_idx) for bc_idx in self.truc.custom_persistences(&arr_view[0,0], size, ignore_inf))
@@ -19876,7 +19876,7 @@ cdef extern from "gudhi/cubical_to_boundary.h" namespace "":
   void _to_boundary(const vector[unsigned int]&, vector[vector[unsigned int]]&, vector[int]&) except + nogil
   void get_vertices(unsigned int, cset[unsigned int]&, const vector[vector[unsigned int]]&) nogil
 
-def _from_bitmapi64(image, **slicer_kwargs):
+def _from_bitmapf64(image, **slicer_kwargs):
     from multipers import Slicer
     dtype = slicer_kwargs.get("dtype", image.dtype)
     slicer_kwargs["dtype"] = dtype
@@ -19894,9 +19894,9 @@ def _from_bitmapi64(image, **slicer_kwargs):
     cdef cset[unsigned int] vertices
 
     cdef unsigned int num_gens = gen_dims.size()
-    filtration_values = np.zeros(shape=(num_gens, num_parameters), dtype = np.int64) - _Slicer._inf_value()
-    cdef int64_t[:,:] F = filtration_values
-    cdef int64_t[:,:] c_img = image.reshape(-1,num_parameters)
+    filtration_values = np.zeros(shape=(num_gens, num_parameters), dtype = np.float64) - _Slicer._inf_value()
+    cdef double[:,:] F = filtration_values
+    cdef double[:,:] c_img = image.reshape(-1,num_parameters)
     with nogil:
         for i in range(num_gens):
             # with gil:
@@ -19914,7 +19914,7 @@ def _from_bitmapi64(image, **slicer_kwargs):
             #     print(f"F = {np.asarray(F[i])}")
     slicer = _Slicer(gen_maps, gen_dims, filtration_values)
     return slicer
-def _from_bitmapf64(image, **slicer_kwargs):
+def _from_bitmapi32(image, **slicer_kwargs):
     from multipers import Slicer
     dtype = slicer_kwargs.get("dtype", image.dtype)
     slicer_kwargs["dtype"] = dtype
@@ -19932,9 +19932,9 @@ def _from_bitmapf64(image, **slicer_kwargs):
     cdef cset[unsigned int] vertices
 
     cdef unsigned int num_gens = gen_dims.size()
-    filtration_values = np.zeros(shape=(num_gens, num_parameters), dtype = np.float64) - _Slicer._inf_value()
-    cdef double[:,:] F = filtration_values
-    cdef double[:,:] c_img = image.reshape(-1,num_parameters)
+    filtration_values = np.zeros(shape=(num_gens, num_parameters), dtype = np.int32) - _Slicer._inf_value()
+    cdef int32_t[:,:] F = filtration_values
+    cdef int32_t[:,:] c_img = image.reshape(-1,num_parameters)
     with nogil:
         for i in range(num_gens):
             # with gil:
@@ -19952,7 +19952,7 @@ def _from_bitmapf64(image, **slicer_kwargs):
             #     print(f"F = {np.asarray(F[i])}")
     slicer = _Slicer(gen_maps, gen_dims, filtration_values)
     return slicer
-def _from_bitmapi32(image, **slicer_kwargs):
+def _from_bitmapf32(image, **slicer_kwargs):
     from multipers import Slicer
     dtype = slicer_kwargs.get("dtype", image.dtype)
     slicer_kwargs["dtype"] = dtype
@@ -19970,9 +19970,9 @@ def _from_bitmapi32(image, **slicer_kwargs):
     cdef cset[unsigned int] vertices
 
     cdef unsigned int num_gens = gen_dims.size()
-    filtration_values = np.zeros(shape=(num_gens, num_parameters), dtype = np.int32) - _Slicer._inf_value()
-    cdef int32_t[:,:] F = filtration_values
-    cdef int32_t[:,:] c_img = image.reshape(-1,num_parameters)
+    filtration_values = np.zeros(shape=(num_gens, num_parameters), dtype = np.float32) - _Slicer._inf_value()
+    cdef float[:,:] F = filtration_values
+    cdef float[:,:] c_img = image.reshape(-1,num_parameters)
     with nogil:
         for i in range(num_gens):
             # with gil:
@@ -19990,7 +19990,7 @@ def _from_bitmapi32(image, **slicer_kwargs):
             #     print(f"F = {np.asarray(F[i])}")
     slicer = _Slicer(gen_maps, gen_dims, filtration_values)
     return slicer
-def _from_bitmapf32(image, **slicer_kwargs):
+def _from_bitmapi64(image, **slicer_kwargs):
     from multipers import Slicer
     dtype = slicer_kwargs.get("dtype", image.dtype)
     slicer_kwargs["dtype"] = dtype
@@ -20008,9 +20008,9 @@ def _from_bitmapf32(image, **slicer_kwargs):
     cdef cset[unsigned int] vertices
 
     cdef unsigned int num_gens = gen_dims.size()
-    filtration_values = np.zeros(shape=(num_gens, num_parameters), dtype = np.float32) - _Slicer._inf_value()
-    cdef float[:,:] F = filtration_values
-    cdef float[:,:] c_img = image.reshape(-1,num_parameters)
+    filtration_values = np.zeros(shape=(num_gens, num_parameters), dtype = np.int64) - _Slicer._inf_value()
+    cdef int64_t[:,:] F = filtration_values
+    cdef int64_t[:,:] c_img = image.reshape(-1,num_parameters)
     with nogil:
         for i in range(num_gens):
             # with gil:
@@ -20031,14 +20031,14 @@ def _from_bitmapf32(image, **slicer_kwargs):
 
 def from_bitmap(img, **kwargs):
     img = np.asarray(img)
-    if img.dtype == np.int64:
-        return _from_bitmapi64(img, **kwargs)
     if img.dtype == np.float64:
         return _from_bitmapf64(img, **kwargs)
     if img.dtype == np.int32:
         return _from_bitmapi32(img, **kwargs)
     if img.dtype == np.float32:
         return _from_bitmapf32(img, **kwargs)
+    if img.dtype == np.int64:
+        return _from_bitmapi64(img, **kwargs)
     raise ValueError(f"Invalid dtype. Got {img.dtype=}, was expecting {available_dtype=}.")
 
 def from_function_delaunay(
@@ -20067,6 +20067,7 @@ def from_function_delaunay(
     function_delaunay_presentation_to_slicer(s, points, grades, degree=degree, verbose=verbose,clear=clear)
     if degree >= 0:
         s.minpres_degree = degree
+        # s = s.minpres(degree=degree, force=True)
     return s
 
 def slicer2blocks(slicer, int degree = -1, bool reverse=True):

multipers/slicer.pyx.tp

@@ -342,7 +342,7 @@ cdef class {{D['PYTHON_TYPE']}}:
       filtration_array = np.asarray(filtration_array, dtype= {{D['PY_VALUE_TYPE']}})
       cdef {{D['C_VALUE_TYPE']}}[:,:] arr_view = filtration_array
       cdef int size = arr_view.shape[0]
-      if arr_view.shape[1] != self.truc.num_generators():
+      if <int>arr_view.shape[1] != <int>self.truc.num_generators():
           raise ValueError(f"Got filtration array of shape {filtration_array.shape=} / {arr_view.shape=}. Was expecting (-1, {len(self)=})")
 
       return tuple(tuple(np.array(bc_idx_degree, dtype=int) for bc_idx_degree in bc_idx) for bc_idx in self.truc.custom_persistences(&arr_view[0,0], size, ignore_inf))
@@ -785,6 +785,7 @@ def from_function_delaunay(
     function_delaunay_presentation_to_slicer(s, points, grades, degree=degree, verbose=verbose,clear=clear)
     if degree >= 0:
         s.minpres_degree = degree
+        # s = s.minpres(degree=degree, force=True)
     return s
 
 def slicer2blocks(slicer, int degree = -1, bool reverse=True):

{multipers-2.3.3b5.dist-info → multipers-2.3.3b6.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: multipers
-Version: 2.3.3b5
+Version: 2.3.3b6
 Summary: Multiparameter Topological Persistence for Machine Learning
 Author-email: David Loiseaux <david.lapous@proton.me>, Hannah Schreiber <hannah.schreiber@inria.fr>
 Maintainer-email: David Loiseaux <david.lapous@proton.me>

{multipers-2.3.3b5.dist-info → multipers-2.3.3b6.dist-info}/RECORD

@@ -5,41 +5,41 @@ multipers/distances.py,sha256=uAZj2GtUQp50OxN2qU7sl2JqsmJ74IG9j5tZapLO2Us,6220
 multipers/filtration_conversions.pxd,sha256=Je7a3F4zS1PQn6Ul1YCXgA6p39X2FouStru-XtN-aOw,10800
 multipers/filtration_conversions.pxd.tp,sha256=_9tUvZVUA7J_RUM3q7BxY48fYgDHCUA7Xhy4nBfLLs0,3309
 multipers/filtrations.pxd,sha256=08ONkZNCjs8Nme8lcD9myPz-K662sA-EDpSwzgC2_ts,9461
-multipers/function_rips.cp312-win_amd64.pyd,sha256=nLo8kHD0VMWSCkvDXuHXf3nLfy3FG3zAYi9d-XjdaCk,332800
+multipers/function_rips.cp312-win_amd64.pyd,sha256=d90RfJW4rfCEUGMY6oD1j4WajQX3G-ipDWgd0xZQ7vQ,332800
 multipers/function_rips.pyx,sha256=j5NjbK3YrAv_2s8YHB1JB0k6m9NC7RQCSFlJe-w_kgE,5252
-multipers/grids.cp312-win_amd64.pyd,sha256=XSeKcjLjfn8Ky0FKJFGpT78Ko0WFinumpJzlfwTsyhI,479232
+multipers/grids.cp312-win_amd64.pyd,sha256=_oHRmoTHZEsZyRVCi8opNS5R-7s62YHAu6pHk2OiuT0,478720
 multipers/grids.pyx,sha256=ONN_RKkuxqwb9IaS9gd42FUGaiBLc8QWcd3L-ubZjKE,16575
-multipers/io.cp312-win_amd64.pyd,sha256=Q9ZTQ2KvdpPq_jEPnW0FDRDmhpAYAHdoCGrfq8MwLPI,220160
+multipers/io.cp312-win_amd64.pyd,sha256=RQPPdpL6AAS25mU-Pe6C5fWfZTuIb2OOZEKYcOpKuJo,220160
 multipers/io.pyx,sha256=pQBH_rSqaCZqDSxTLnhlyECP3fLbX2tR_RKJHydHm_0,22210
-multipers/mma_structures.cp312-win_amd64.pyd,sha256=dqIAoI1KSxTCBIbH3ibd6cXYIAC5r2W0JuVerpAz-hw,1279488
+multipers/mma_structures.cp312-win_amd64.pyd,sha256=hFc7wAWJD9nlE7W30SlkQygmLCl5gTHh3YvR9s5MAUw,1279488
 multipers/mma_structures.pxd,sha256=jh1QnQRidt_VK0CK7losQi6rAl_1qG5DNuR23J42pUA,6595
 multipers/mma_structures.pyx,sha256=4zNC6ePfFKMvx0MrH-FqJVouyTMciRc49oevKDnsJhI,109530
 multipers/mma_structures.pyx.tp,sha256=hWuuk9USDFa8CbQVRHNjWSAdGgpkWKvSCNjTtVuSzwM,42299
 multipers/multiparameter_edge_collapse.py,sha256=MFt0eKQQSv2354omeIqOmzASYTKIMsYdxZHFZauQr8g,1229
-multipers/multiparameter_module_approximation.cp312-win_amd64.pyd,sha256=ytPEsM-A353YhpBWmyEKufLB6ZHv11wckNByj-ZpFzo,451584
+multipers/multiparameter_module_approximation.cp312-win_amd64.pyd,sha256=AlTB_VS67KWt7Hry8_kbG3jIfHjhf0hw5QF-in2zvmM,451584
 multipers/multiparameter_module_approximation.pyx,sha256=wp7la7Z9wBngnfw6WOVddf93mPyXf4HfNT6dKW2Z0r0,9030
 multipers/pickle.py,sha256=YYVt4iHiD16E1x5Yn_4mX6P5P8rKi56pNGjJo5IzPhc,2579
-multipers/plots.py,sha256=zkJww-QCU7Ru22KhIa5xIi9zztWm-_tYjO0enP8ahBs,14721
-multipers/point_measure.cp312-win_amd64.pyd,sha256=3SrXPU85xJcMeo_VIuHO_kTaBlWZZSLPn4GtZeR7GwQ,588800
+multipers/plots.py,sha256=-yOaufE_flzrZDQIgwhchvJIo0MBJMrUJKuo_sKG6IM,14918
+multipers/point_measure.cp312-win_amd64.pyd,sha256=ojsfA6tG4q7sho4cA6iljqxKio773MGo8xCXPGUniGA,588800
 multipers/point_measure.pyx,sha256=ovpyvjMdOPBOK_0TT0VoK4b2t8m5InFdKmRBB6biTts,14077
-multipers/simplex_tree_multi.cp312-win_amd64.pyd,sha256=OCe6TKAsZpyjMrwACymP1nf8HqnLVBlI0Zw15yg_mgk,3616256
+multipers/simplex_tree_multi.cp312-win_amd64.pyd,sha256=p2iQvJBrVNEVSboCCdY0u7JpxkzpgMnP-jJjm1pkaqU,3617280
 multipers/simplex_tree_multi.pxd,sha256=KpyDEQNPoMC2sOU9-d4LtrGXx_UVCJGxMJ1kk1AzHgU,6631
-multipers/simplex_tree_multi.pyx,sha256=reHyva5AR1lOQyiCs2_jQ2XfwHtktcQ1nmY_BNmyxhk,498156
-multipers/simplex_tree_multi.pyx.tp,sha256=fUTuIscfDlNjsImWU1YALVZ1Mf9OEkdl-IFKcRQqalI,89202
-multipers/slicer.cp312-win_amd64.pyd,sha256=u-3tT2AYH3Z6Q0YCP8O-5VLMY7Bgh3HDh9zdGmcuuGo,11682816
-multipers/slicer.pxd,sha256=fzA-lL_QWyUMf9rRSpcKG35QNS9UXEmVC9r7kR0geho,185230
+multipers/simplex_tree_multi.pyx,sha256=13x2WFMExcukd_2CrLOJa3Edex3WNqaSSrGBmPhYoDM,499100
+multipers/simplex_tree_multi.pyx.tp,sha256=YFzVUJPWNOOpRiyOgaYlFR_DJ_57rAQLsOp2W0l71_s,89318
+multipers/slicer.cp312-win_amd64.pyd,sha256=08YwrCbKlBm4D95OMyRqtVpk3lRHPg9pSa6jhtBGsAg,11681280
+multipers/slicer.pxd,sha256=bHcV5COzDcjhaVcL3bWSHivUYtdkSx4bdj24fVOe_DU,185230
 multipers/slicer.pxd.tp,sha256=fLOUPtPGqiY9o1fPDyc_whBrgKLh_6HVfvl7OtE-34Y,10243
-multipers/slicer.pyx,sha256=6FCwvSRymGxZb60rX7yzwMKVwYXmS_Eg0a_nA3HBrAM,894041
-multipers/slicer.pyx.tp,sha256=jZOdsHKMpq0nclmvlzkZUDzdjffT3_mFDVY_mnsl9Es,44523
-multipers/tbb12.dll,sha256=6AsPR4GauU53hj2xqJNM0SfLkCKCDskjy-uKeS01tCk,338944
-multipers/tbbbind_2_5.dll,sha256=8TtH7JJZlCEKF0UwfyJoiyrFt9utOI_x5AFOxpP-pGw,23040
-multipers/tbbmalloc.dll,sha256=1MRBYYNzNcooog8__yuLq40l7kSgZ4lkNZhDFfTWM8A,112640
-multipers/tbbmalloc_proxy.dll,sha256=fcM6szEVHayvxKW8sPUTWoqEZx1_4FbWni81hbOcbi4,31232
+multipers/slicer.pyx,sha256=xG8TQzAikIzSWuJ0ZjfNMqmWj3X6rv2Oze7Ju7Fc-yA,894493
+multipers/slicer.pyx.tp,sha256=GCL7xUZccfmnIoY4bk05L5ODkSNzEzXgodp0VkH-xT8,44584
+multipers/tbb12.dll,sha256=flSoIAkNVECA5vNkh5jLn1jcZNxTw3yb2tuTtxn6oEE,344576
+multipers/tbbbind_2_5.dll,sha256=4JWlgl4aJJ3m5NIE85AgQi46REU3UkIJwNsKnh9aK_c,23552
+multipers/tbbmalloc.dll,sha256=r9y_3nR6Rpc68g1F7Oci8EpunjWIJQU-zjLIVXc9SDY,113664
+multipers/tbbmalloc_proxy.dll,sha256=5vcuiOpM9KTAY7daWxCsAc2MU_l8K3TWpw0kz-Xh0sk,30720
 multipers/tensor.pxd,sha256=MSmaMU0sOP9CHLmg4dym7nOGaI1S4cOdM01TQ9flI54,417
 multipers/test.pyx,sha256=-g7WU-jKrZK8H0c-6eAPsfrApjvTKrUoswVYFu8LoV4,1798
 multipers/array_api/__init__.py,sha256=072Lk60jfw3re6iCY3EorteHEoQ7vbUgpMpuGCpfh04,1109
-multipers/array_api/numpy.py,sha256=hhCyMH_jNZhCJeY35RX498AWgHSryZ8DCCgfnzZ1cek,677
-multipers/array_api/torch.py,sha256=J-OjqM4rDLvjSjY2uriBdUcOOb75p-IF17C5stdJHVg,589
+multipers/array_api/numpy.py,sha256=1l9zL3jP8xhKYpXRjGzhHw4DP_tGdMQ3WRS8Tcmf3xc,816
+multipers/array_api/torch.py,sha256=o8ekBau6G46LHd8-b_cWu_vPWIBiTfE4Dz5UL0xWwxY,1257
 multipers/data/MOL2.py,sha256=nLZHy2OSFN9Z2uJKsbqWOEG2R7G-uH6dCLHG48UjvR4,15428
 multipers/data/UCR.py,sha256=PuT8l3i26y0goBzIESwdgJAe6YFCyDiWSoxECcP5rhs,798
 multipers/data/__init__.py,sha256=w7uUe4LOHbdbKU4R8MNs7em65wZJN0v5ukoG1otFanQ,24
@@ -51,7 +51,7 @@ multipers/data/shape3d.py,sha256=AE-vvjKrhKxOwMo-lurUsFqqLjIg5obo-RTbRZF_5Mk,389
 multipers/data/synthetic.py,sha256=RvLWIBE5j99kJSt-D7cnPGI3c7skD4p8_qofJbMIXM0,3078
 multipers/filtrations/__init__.py,sha256=Lg0EHe2cxT32UQAg0kr_Vpua-xPBZxGol8VIfz8UwWk,319
 multipers/filtrations/density.py,sha256=z_QwAi_5EdUoKXc6s7N-qWM7n6r5hWHiHeJkLPWhE-w,19818
-multipers/filtrations/filtrations.py,sha256=kkaUJOznzMmgQAW__lC2q6BOuiGj85_VIRP9C3TPMJk,13037
+multipers/filtrations/filtrations.py,sha256=r3WS4GMBvcJ0ryIMbNHFgep0FCtl3h404V_SbMM8hN0,13333
 multipers/gudhi/Persistence_slices_interface.h,sha256=QnUeCCKi9K8CfqI3W5i3Ra1Jy2Z1IIivr3MIpnBsnYU,6562
 multipers/gudhi/Simplex_tree_interface.h,sha256=kkq8pE3jKGLY1dK7sYpb_uERHaWGurrRXfaw_ygs-mY,10217
 multipers/gudhi/Simplex_tree_multi_interface.h,sha256=7D9EqyO9dgi-VMTf-O8SR2UMQL95q_TL9ApmmN4ggFw,25484
@@ -178,8 +178,8 @@ multipers/tests/__init__.py,sha256=-7Fj-zFAfBJv18trg0CPglQTmYu_ehySZGqtJzPlN8U,1
 multipers/torch/__init__.py,sha256=OLxIiZ389uCqehpUxBPUI_x1SYu531onc4tiTscAuIw,27
 multipers/torch/diff_grids.py,sha256=2YK-c351tBpj8sfzjf26fbE1l0xlWse7oVVfDHD3zwM,7492
 multipers/torch/rips_density.py,sha256=H-kmSzY8hXhmVn15Oltc71DHs1IUHg5oPRgNyWW8L4Q,11706
-multipers-2.3.3b5.dist-info/licenses/LICENSE,sha256=UsQRnvlo_9wpQS9DNt52GEraERHwK2GIRwuqr2Yv5JI,1071
-multipers-2.3.3b5.dist-info/METADATA,sha256=bsID4OmdjPhV5Hi8YB2y1x9Sr5SWsjTmQ5XN-Oeysjg,9817
-multipers-2.3.3b5.dist-info/WHEEL,sha256=8UP9x9puWI0P1V_d7K2oMTBqfeLNm21CTzZ_Ptr0NXU,101
-multipers-2.3.3b5.dist-info/top_level.txt,sha256=L9e0AGmhRzrNw9FpuUx-zlqi5NcBOmrI9wYY8kYWr8A,10
-multipers-2.3.3b5.dist-info/RECORD,,
+multipers-2.3.3b6.dist-info/licenses/LICENSE,sha256=UsQRnvlo_9wpQS9DNt52GEraERHwK2GIRwuqr2Yv5JI,1071
+multipers-2.3.3b6.dist-info/METADATA,sha256=0zSGxpVm4912cviaU4-M6i-GMYDdQtoDLr25L35Xq6I,9817
+multipers-2.3.3b6.dist-info/WHEEL,sha256=8UP9x9puWI0P1V_d7K2oMTBqfeLNm21CTzZ_Ptr0NXU,101
+multipers-2.3.3b6.dist-info/top_level.txt,sha256=L9e0AGmhRzrNw9FpuUx-zlqi5NcBOmrI9wYY8kYWr8A,10
+multipers-2.3.3b6.dist-info/RECORD,,