multipers 2.3.3b7__tar.gz → 2.3.4__tar.gz

{multipers-2.3.3b7/multipers.egg-info → multipers-2.3.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: multipers
-Version: 2.3.3b7
+Version: 2.3.4
 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>
@@ -44,7 +44,7 @@ This library aims to provide easy to use and performant strategies for applied m
 ## Compiled packages
 | Source | Version | Downloads | Platforms | 
 | --- | --- | --- | --- | 
-| [![Conda Recipe](https://img.shields.io/badge/conda-recipe-green.svg)](https://anaconda.org/conda-forge/multipers)| [![Conda Version](https://img.shields.io/conda/vn/conda-forge/multipers.svg)](https://anaconda.org/conda-forge/multipers) |  [![Conda Downloads](https://img.shields.io/conda/dn/conda-forge/multipers.svg)](https://anaconda.org/conda-forge/multipers) |[![Conda Platforms](https://img.shields.io/conda/pn/conda-forge/multipers.svg)](https://anaconda.org/conda-forge/multipers) | 
+| [![Conda Recipe](https://img.shields.io/badge/conda-recipe-green.svg)](https://github.com/conda-forge/multipers-feedstock)| [![Conda Version](https://img.shields.io/conda/vn/conda-forge/multipers.svg)](https://anaconda.org/conda-forge/multipers) |  [![Conda Downloads](https://img.shields.io/conda/dn/conda-forge/multipers.svg)](https://anaconda.org/conda-forge/multipers) |[![Conda Platforms](https://img.shields.io/conda/pn/conda-forge/multipers.svg)](https://anaconda.org/conda-forge/multipers) | 
 | [![pip Recipe](https://img.shields.io/badge/pip-package-green.svg)](https:///pypi.org/project/multipers) | [![PyPI](https://img.shields.io/pypi/v/multipers?color=green)](https://pypi.org/project/multipers) | [![ pip downloads](https://static.pepy.tech/badge/multipers)](https://pepy.tech/project/multipers) | | 
 
 

{multipers-2.3.3b7 → multipers-2.3.4}/README.md

@@ -8,7 +8,7 @@ This library aims to provide easy to use and performant strategies for applied m
 ## Compiled packages
 | Source | Version | Downloads | Platforms | 
 | --- | --- | --- | --- | 
-| [![Conda Recipe](https://img.shields.io/badge/conda-recipe-green.svg)](https://anaconda.org/conda-forge/multipers)| [![Conda Version](https://img.shields.io/conda/vn/conda-forge/multipers.svg)](https://anaconda.org/conda-forge/multipers) |  [![Conda Downloads](https://img.shields.io/conda/dn/conda-forge/multipers.svg)](https://anaconda.org/conda-forge/multipers) |[![Conda Platforms](https://img.shields.io/conda/pn/conda-forge/multipers.svg)](https://anaconda.org/conda-forge/multipers) | 
+| [![Conda Recipe](https://img.shields.io/badge/conda-recipe-green.svg)](https://github.com/conda-forge/multipers-feedstock)| [![Conda Version](https://img.shields.io/conda/vn/conda-forge/multipers.svg)](https://anaconda.org/conda-forge/multipers) |  [![Conda Downloads](https://img.shields.io/conda/dn/conda-forge/multipers.svg)](https://anaconda.org/conda-forge/multipers) |[![Conda Platforms](https://img.shields.io/conda/pn/conda-forge/multipers.svg)](https://anaconda.org/conda-forge/multipers) | 
 | [![pip Recipe](https://img.shields.io/badge/pip-package-green.svg)](https:///pypi.org/project/multipers) | [![PyPI](https://img.shields.io/pypi/v/multipers?color=green)](https://pypi.org/project/multipers) | [![ pip downloads](https://static.pepy.tech/badge/multipers)](https://pepy.tech/project/multipers) | | 
 
 

{multipers-2.3.3b7 → multipers-2.3.4}/multipers/array_api/numpy.py

@@ -31,17 +31,19 @@ def check_keops():
     global _is_keops_available, LazyTensor
     if _is_keops_available is not None:
         return _is_keops_available
-    import pykeops.numpy as pknp
-    from pykeops.numpy import LazyTensor as LT
-
-    formula = "SqNorm2(x - y)"
-    var = ["x = Vi(3)", "y = Vj(3)"]
-    expected_res = _np.array([63.0, 90.0])
-    x = _np.arange(1, 10).reshape(-1, 3).astype("float32")
-    y = _np.arange(3, 9).reshape(-1, 3).astype("float32")
-
-    my_conv = pknp.Genred(formula, var)
     try:
+        if _is_keops_available is not None:
+            return _is_keops_available
+        import pykeops.numpy as pknp
+        from pykeops.numpy import LazyTensor as LT
+
+        formula = "SqNorm2(x - y)"
+        var = ["x = Vi(3)", "y = Vj(3)"]
+        expected_res = _np.array([63.0, 90.0])
+        x = _np.arange(1, 10).reshape(-1, 3).astype("float32")
+        y = _np.arange(3, 9).reshape(-1, 3).astype("float32")
+
+        my_conv = pknp.Genred(formula, var)
         _is_keops_available = _np.allclose(my_conv(x, y).flatten(), expected_res)
         LazyTensor = LT
     except:

{multipers-2.3.3b7 → multipers-2.3.4}/multipers/array_api/torch.py

@@ -41,7 +41,7 @@ def check_keops():
 
         my_conv = pknp.Genred(formula, var)
         _is_keops_available = _t.allclose(
-            my_conv(x, y).view(-1), _t.tensor(expected_res).type(_t.float32)
+            my_conv(x, y).view(-1), expected_res.type(_t.float32)
         )
         LazyTensor = LT
 
@@ -53,6 +53,7 @@ def check_keops():
         _is_keops_available = False
 
     return _is_keops_available
+check_keops()
 
 
 def from_numpy(x):

{multipers-2.3.3b7 → multipers-2.3.4}/multipers/filtrations/filtrations.py

@@ -76,8 +76,8 @@ def RipsLowerstar(
         st.fill_lowerstar(api.asnumpy(function[:, i]), parameter=1 + i)
     if api.has_grad(D) or api.has_grad(function):
         from multipers.grids import compute_grid
-
-        grid = compute_grid([D.ravel(), *[f for f in function.T]])
+        filtration_values = [D.ravel(), *[f for f in function.T]]
+        grid = compute_grid(filtration_values)
         st = st.grid_squeeze(grid)
     return st
 

{multipers-2.3.3b7 → multipers-2.3.4}/multipers/grids.pyx

@@ -124,8 +124,7 @@ def compute_grid(
     except TypeError:
         pass
 
-    if api is npapi:
-        return _compute_grid_numpy(
+    grid = _compute_grid_numpy(
         initial_grid,
         resolution=resolution, 
         strategy = strategy, 
@@ -133,9 +132,9 @@ def compute_grid(
         _q_factor=_q_factor, 
         drop_quantiles=drop_quantiles,
         dense = dense,
-        )
-    from multipers.torch.diff_grids import get_grid
-    grid = get_grid(strategy)(initial_grid,resolution)
+    )
+    # from multipers.torch.diff_grids import get_grid
+    # grid = get_grid(strategy)(initial_grid,resolution)
     if dense:
         grid = todense(grid)
     return grid
@@ -169,7 +168,7 @@ def _compute_grid_numpy(
     Iterable[array[float, ndim=1]] : the 1d-grid for each parameter.
     """
     num_parameters = len(filtrations_values)
-    api = api_from_tensors(filtrations_values)
+    api = api_from_tensors(*filtrations_values)
     try:
         a,b=drop_quantiles
     except:
@@ -189,7 +188,7 @@ def _compute_grid_numpy(
     elif strategy == "quantile":
         F = tuple(api.unique(f) for f in filtrations_values)
         max_resolution = [min(len(f),r) for f,r in zip(F,resolution)]
-        F = tuple( api.quantile_closest(f, q=np.linspace(0,1,num=int(r*_q_factor)), axis=0) for f,r in zip(F, resolution) )
+        F = tuple( api.quantile_closest(f, q=api.linspace(0,1,int(r*_q_factor)), axis=0) for f,r in zip(F, resolution) )
         if unique:
             F = tuple(api.unique(f) for f in F)
             if np.all(np.asarray(max_resolution) > np.asarray([len(f) for f in F])):
@@ -203,7 +202,7 @@ def _compute_grid_numpy(
     # elif strategy == "torch_regular_closest":
     #     F = tuple(_torch_regular_closest(f,r, unique) for f,r in zip(filtrations_values, resolution))
     elif strategy == "partition":
-        F = tuple(_todo_partition(f,r, unique) for f,r in zip(filtrations_values, resolution))
+        F = tuple(_todo_partition(f,r, unique, api) for f,r in zip(filtrations_values, resolution))
     elif strategy == "precomputed":
         F=filtrations_values
     else:
@@ -215,7 +214,7 @@ def _compute_grid_numpy(
 def todense(grid, bool product_order=False):
     if len(grid) == 0:
         return np.empty(0)
-    api = api_from_tensors(grid)
+    api = api_from_tensors(*grid)
     # if product_order:
     #     if not api.backend ==np:
     #         raise NotImplementedError("only numpy here.")
@@ -235,8 +234,10 @@ def todense(grid, bool product_order=False):
 
 
 
-## TODO : optimize. Pykeops ?
 def _todo_regular(f, int r, api):
+    if api.has_grad(f):
+        from warnings import warn
+        warn("`strategy=regular` is not differentiable. Removing grad.")
     with api.no_grad():
         return api.linspace(api.min(f), api.max(f), r)
 
@@ -284,8 +285,14 @@ def _todo_regular_left_old(some_float[:] f, int r, bool unique):
     if unique: f_regular_closest = np.unique(f_regular_closest)
     return f_regular_closest
 
+def _todo_partition(x, int resolution, bool unique, api):
+    if api.has_grad(x):
+        from warnings import warn
+        warn("`strategy=partition` is not differentiable. Removing grad.")
+    out = _todo_partition_(api.asnumpy(x), resolution, unique)
+    return api.from_numpy(out)
 
-def _todo_partition(some_float[:] data,int resolution, bool unique):
+def _todo_partition_(some_float[:] data,int resolution, bool unique):
     if data.shape[0] < resolution: resolution=data.shape[0]
     k = data.shape[0] // resolution
     partitions = np.partition(data, k)

{multipers-2.3.3b7 → multipers-2.3.4}/multipers/gudhi/gudhi/Multi_critical_filtration.h

@@ -805,7 +805,7 @@ class Multi_critical_filtration {
         res.add_generator(nf);
       }
     }
-    swap(f1, res);
+    std::swap(f1, res);
 
     return f1 != res;
   }

{multipers-2.3.3b7 → multipers-2.3.4}/multipers/plots.py

@@ -81,7 +81,8 @@ def _plot_signed_measure_4(
     **plt_kwargs,  # ignored ftm
 ):
     # compute the maximal rectangle area
-    pts = np.clip(pts, a_min=-np.inf, a_max=np.array((*threshold, *threshold))[None, :])
+    pts = np.clip(pts, a_min=-np.inf,
+                  a_max=np.array((*threshold, *threshold))[None, :])
     alpha_rescaling = 0
     for rectangle, weight in zip(pts, weights):
         if rectangle[2] >= x_smoothing * rectangle[0]:
@@ -170,7 +171,8 @@ def plot_signed_measures(signed_measures, threshold=None, size=4):
             nrows=1, ncols=num_degrees, figsize=(num_degrees * size, size)
         )
     for ax, signed_measure in zip(axes, signed_measures):
-        plot_signed_measure(signed_measure=signed_measure, ax=ax, threshold=threshold)
+        plot_signed_measure(signed_measure=signed_measure,
+                            ax=ax, threshold=threshold)
     plt.tight_layout()
 
 
@@ -200,13 +202,17 @@ def plot_surface(
             cmap = matplotlib.colormaps["gray_r"]
         else:
             cmap = _cmap
+    if discrete_surface or not contour:
+        # for shading="flat"
+        grid = [np.concatenate([g, [g[-1]*1.1 - .1*g[0]]]) for g in grid]
     if discrete_surface:
         if has_negative_values:
             bounds = np.arange(-5, 6, 1, dtype=int)
         else:
             bounds = np.arange(0, 11, 1, dtype=int)
         norm = matplotlib.colors.BoundaryNorm(bounds, cmap.N, extend="max")
-        im = ax.pcolormesh(grid[0], grid[1], hf.T, cmap=cmap, norm=norm, **plt_args)
+        im = ax.pcolormesh(grid[0], grid[1], hf.T, cmap=cmap,
+                           norm=norm, shading="flat", **plt_args)
         cbar = fig.colorbar(
             matplotlib.cm.ScalarMappable(cmap=cmap, norm=norm),
             spacing="proportional",
@@ -217,9 +223,11 @@ def plot_surface(
 
     if contour:
         levels = plt_args.pop("levels", 50)
-        im = ax.contourf(grid[0], grid[1], hf.T, cmap=cmap, levels=levels, **plt_args)
+        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)
+        im = ax.pcolormesh(grid[0], grid[1], hf.T,
+                           cmap=cmap,  shading="flat", **plt_args)
     return im
 
 
@@ -314,25 +322,30 @@ def plot2d_PyModule(
                         trivial_summand = False
                     if shapely:
                         list_of_rect.append(
-                            _rectangle_box(birth[0], birth[1], death[0], death[1])
+                            _rectangle_box(
+                                birth[0], birth[1], death[0], death[1])
                         )
                     else:
                         list_of_rect.append(
-                            _rectangle(birth, death, cmap(i / n_summands), alpha)
+                            _rectangle(birth, death, cmap(
+                                i / n_summands), alpha)
                         )
         if not (trivial_summand):
             if separated:
                 fig, ax = plt.subplots()
-                ax.set(xlim=[box[0][0], box[1][0]], ylim=[box[0][1], box[1][1]])
+                ax.set(xlim=[box[0][0], box[1][0]],
+                       ylim=[box[0][1], box[1][1]])
             if shapely:
                 summand_shape = union_all(list_of_rect)
                 if type(summand_shape) is _Polygon:
                     xs, ys = summand_shape.exterior.xy
-                    ax.fill(xs, ys, alpha=alpha, fc=cmap(i / n_summands), ec="None")
+                    ax.fill(xs, ys, alpha=alpha, fc=cmap(
+                        i / n_summands), ec="None")
                 else:
                     for polygon in summand_shape.geoms:
                         xs, ys = polygon.exterior.xy
-                        ax.fill(xs, ys, alpha=alpha, fc=cmap(i / n_summands), ec="None")
+                        ax.fill(xs, ys, alpha=alpha, fc=cmap(
+                            i / n_summands), ec="None")
             else:
                 for rectangle in list_of_rect:
                     ax.add_patch(rectangle)
@@ -396,7 +409,8 @@ def plot_simplicial_complex(
         if len(s) == 2:  # simplexe = segment
             xx = np.array([pts[a, 0] for a in s])
             yy = np.array([pts[a, 1] for a in s])
-            plt.plot(xx, yy, c=color(density), alpha=1, zorder=10 * density, lw=1.5)
+            plt.plot(xx, yy, c=color(density), alpha=1,
+                     zorder=10 * density, lw=1.5)
         if len(s) == 3:  # simplexe = triangle
             xx = np.array([pts[a, 0] for a in s])
             yy = np.array([pts[a, 1] for a in s])

{multipers-2.3.3b7 → multipers-2.3.4}/multipers/simplex_tree_multi.pxd

@@ -117,8 +117,8 @@ cdef extern from "Simplex_tree_multi_interface.h" namespace "Gudhi::multiparamet
     void to_std(intptr_t, Line[double],int ) nogil 
     void to_std_linear_projection(intptr_t, vector[double]) nogil
     void squeeze_filtration_inplace(vector[vector[double]] &, bool) nogil
-    void squeeze_filtration(intptr_t, vector[vector[double]] &) nogil
-    void unsqueeze_filtration(intptr_t, vector[vector[double]] &) nogil
+    void squeeze_filtration(intptr_t, vector[vector[double]] &) except + nogil
+    void unsqueeze_filtration(intptr_t, vector[vector[double]] &) except + nogil
     vector[vector[vector[value_type]]] get_filtration_values(const vector[int]&) nogil
 
 

{multipers-2.3.3b7 → multipers-2.3.4}/multipers/simplex_tree_multi.pyx

@@ -625,6 +625,41 @@ cdef class SimplexTreeMulti_KFi32:
         """
         return self.get_ptr().prune_above_dimension(dimension)
 
+    def expansion(self, int max_dim)->SimplexTreeMulti_KFi32:
+        """Expands the simplex tree containing only its one skeleton
+        until dimension max_dim.
+
+        The expanded simplicial complex until dimension :math:`d`
+        attached to a graph :math:`G` is the maximal simplicial complex of
+        dimension at most :math:`d` admitting the graph :math:`G` as
+        :math:`1`-skeleton.
+        The filtration value assigned to a simplex is the maximal filtration
+        value of one of its edges.
+
+        The simplex tree must contain no simplex of dimension bigger than
+        1 when calling the method.
+
+        :param max_dim: The maximal dimension.
+        :type max_dim: int
+        """
+        with nogil:
+            self.get_ptr().expansion(max_dim)
+            # This is a fix for multipersistence. FIXME expansion in c++
+            self.get_ptr().make_filtration_non_decreasing()
+        return self
+
+    def make_filtration_non_decreasing(self)->bool: 
+        """This function ensures that each simplex has a higher filtration
+        value than its faces by increasing the filtration values.
+
+        :returns: True if any filtration value was modified,
+            False if the filtration was already non-decreasing.
+        :rtype: bool
+        """
+        cdef bool out
+        with nogil:
+            out = self.get_ptr().make_filtration_non_decreasing()
+        return out
 
     def reset_filtration(self, filtration, min_dim = 0)->SimplexTreeMulti_KFi32:
         """This function resets the filtration value of all the simplices of dimension at least min_dim. Resets all the
@@ -3217,6 +3252,41 @@ cdef class SimplexTreeMulti_KFi64:
         """
         return self.get_ptr().prune_above_dimension(dimension)
 
+    def expansion(self, int max_dim)->SimplexTreeMulti_KFi64:
+        """Expands the simplex tree containing only its one skeleton
+        until dimension max_dim.
+
+        The expanded simplicial complex until dimension :math:`d`
+        attached to a graph :math:`G` is the maximal simplicial complex of
+        dimension at most :math:`d` admitting the graph :math:`G` as
+        :math:`1`-skeleton.
+        The filtration value assigned to a simplex is the maximal filtration
+        value of one of its edges.
+
+        The simplex tree must contain no simplex of dimension bigger than
+        1 when calling the method.
+
+        :param max_dim: The maximal dimension.
+        :type max_dim: int
+        """
+        with nogil:
+            self.get_ptr().expansion(max_dim)
+            # This is a fix for multipersistence. FIXME expansion in c++
+            self.get_ptr().make_filtration_non_decreasing()
+        return self
+
+    def make_filtration_non_decreasing(self)->bool: 
+        """This function ensures that each simplex has a higher filtration
+        value than its faces by increasing the filtration values.
+
+        :returns: True if any filtration value was modified,
+            False if the filtration was already non-decreasing.
+        :rtype: bool
+        """
+        cdef bool out
+        with nogil:
+            out = self.get_ptr().make_filtration_non_decreasing()
+        return out
 
     def reset_filtration(self, filtration, min_dim = 0)->SimplexTreeMulti_KFi64:
         """This function resets the filtration value of all the simplices of dimension at least min_dim. Resets all the
@@ -5809,6 +5879,41 @@ cdef class SimplexTreeMulti_KFf32:
         """
         return self.get_ptr().prune_above_dimension(dimension)
 
+    def expansion(self, int max_dim)->SimplexTreeMulti_KFf32:
+        """Expands the simplex tree containing only its one skeleton
+        until dimension max_dim.
+
+        The expanded simplicial complex until dimension :math:`d`
+        attached to a graph :math:`G` is the maximal simplicial complex of
+        dimension at most :math:`d` admitting the graph :math:`G` as
+        :math:`1`-skeleton.
+        The filtration value assigned to a simplex is the maximal filtration
+        value of one of its edges.
+
+        The simplex tree must contain no simplex of dimension bigger than
+        1 when calling the method.
+
+        :param max_dim: The maximal dimension.
+        :type max_dim: int
+        """
+        with nogil:
+            self.get_ptr().expansion(max_dim)
+            # This is a fix for multipersistence. FIXME expansion in c++
+            self.get_ptr().make_filtration_non_decreasing()
+        return self
+
+    def make_filtration_non_decreasing(self)->bool: 
+        """This function ensures that each simplex has a higher filtration
+        value than its faces by increasing the filtration values.
+
+        :returns: True if any filtration value was modified,
+            False if the filtration was already non-decreasing.
+        :rtype: bool
+        """
+        cdef bool out
+        with nogil:
+            out = self.get_ptr().make_filtration_non_decreasing()
+        return out
 
     def reset_filtration(self, filtration, min_dim = 0)->SimplexTreeMulti_KFf32:
         """This function resets the filtration value of all the simplices of dimension at least min_dim. Resets all the
@@ -8401,6 +8506,41 @@ cdef class SimplexTreeMulti_KFf64:
         """
         return self.get_ptr().prune_above_dimension(dimension)
 
+    def expansion(self, int max_dim)->SimplexTreeMulti_KFf64:
+        """Expands the simplex tree containing only its one skeleton
+        until dimension max_dim.
+
+        The expanded simplicial complex until dimension :math:`d`
+        attached to a graph :math:`G` is the maximal simplicial complex of
+        dimension at most :math:`d` admitting the graph :math:`G` as
+        :math:`1`-skeleton.
+        The filtration value assigned to a simplex is the maximal filtration
+        value of one of its edges.
+
+        The simplex tree must contain no simplex of dimension bigger than
+        1 when calling the method.
+
+        :param max_dim: The maximal dimension.
+        :type max_dim: int
+        """
+        with nogil:
+            self.get_ptr().expansion(max_dim)
+            # This is a fix for multipersistence. FIXME expansion in c++
+            self.get_ptr().make_filtration_non_decreasing()
+        return self
+
+    def make_filtration_non_decreasing(self)->bool: 
+        """This function ensures that each simplex has a higher filtration
+        value than its faces by increasing the filtration values.
+
+        :returns: True if any filtration value was modified,
+            False if the filtration was already non-decreasing.
+        :rtype: bool
+        """
+        cdef bool out
+        with nogil:
+            out = self.get_ptr().make_filtration_non_decreasing()
+        return out
 
     def reset_filtration(self, filtration, min_dim = 0)->SimplexTreeMulti_KFf64:
         """This function resets the filtration value of all the simplices of dimension at least min_dim. Resets all the

{multipers-2.3.3b7 → multipers-2.3.4}/multipers/simplex_tree_multi.pyx.tp

@@ -869,7 +869,6 @@ cdef class SimplexTreeMulti_{{FSHORT}}:
         """
         return self.get_ptr().prune_above_dimension(dimension)
 
-    {{if not is_kcritical}}
     def expansion(self, int max_dim)->SimplexTreeMulti_{{FSHORT}}:
         """Expands the simplex tree containing only its one skeleton
         until dimension max_dim.
@@ -905,7 +904,6 @@ cdef class SimplexTreeMulti_{{FSHORT}}:
         with nogil:
             out = self.get_ptr().make_filtration_non_decreasing()
         return out
-    {{endif}}
 
     def reset_filtration(self, filtration, min_dim = 0)->SimplexTreeMulti_{{FSHORT}}:
         """This function resets the filtration value of all the simplices of dimension at least min_dim. Resets all the

{multipers-2.3.3b7 → multipers-2.3.4/multipers.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: multipers
-Version: 2.3.3b7
+Version: 2.3.4
 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>
@@ -44,7 +44,7 @@ This library aims to provide easy to use and performant strategies for applied m
 ## Compiled packages
 | Source | Version | Downloads | Platforms | 
 | --- | --- | --- | --- | 
-| [![Conda Recipe](https://img.shields.io/badge/conda-recipe-green.svg)](https://anaconda.org/conda-forge/multipers)| [![Conda Version](https://img.shields.io/conda/vn/conda-forge/multipers.svg)](https://anaconda.org/conda-forge/multipers) |  [![Conda Downloads](https://img.shields.io/conda/dn/conda-forge/multipers.svg)](https://anaconda.org/conda-forge/multipers) |[![Conda Platforms](https://img.shields.io/conda/pn/conda-forge/multipers.svg)](https://anaconda.org/conda-forge/multipers) | 
+| [![Conda Recipe](https://img.shields.io/badge/conda-recipe-green.svg)](https://github.com/conda-forge/multipers-feedstock)| [![Conda Version](https://img.shields.io/conda/vn/conda-forge/multipers.svg)](https://anaconda.org/conda-forge/multipers) |  [![Conda Downloads](https://img.shields.io/conda/dn/conda-forge/multipers.svg)](https://anaconda.org/conda-forge/multipers) |[![Conda Platforms](https://img.shields.io/conda/pn/conda-forge/multipers.svg)](https://anaconda.org/conda-forge/multipers) | 
 | [![pip Recipe](https://img.shields.io/badge/pip-package-green.svg)](https:///pypi.org/project/multipers) | [![PyPI](https://img.shields.io/pypi/v/multipers?color=green)](https://pypi.org/project/multipers) | [![ pip downloads](https://static.pepy.tech/badge/multipers)](https://pepy.tech/project/multipers) | | 
 
 

{multipers-2.3.3b7 → multipers-2.3.4}/pyproject.toml

@@ -9,7 +9,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "multipers"
-version = "2.3.3b7"
+version = "2.3.4"
 description = "Multiparameter Topological Persistence for Machine Learning"
 readme = "README.md"
 authors = [

{multipers-2.3.3b7 → multipers-2.3.4}/tests/test_grids.py

@@ -1,8 +1,8 @@
 import numpy as np
 import pytest
 
-import multipers.grids as mpg
 import multipers as mp
+import multipers.grids as mpg
 
 try:
     import torch
@@ -57,8 +57,8 @@ def test_regular_left():
         y,
         [
             0.0,
-            .1,
-            .21,
+            0.1,
+            0.21,
             1,
         ],
     ).all(), y
@@ -68,9 +68,38 @@ def test_regular_left():
         y_torch = torchapi.from_numpy(y)
         assert torch.allclose(
             y_torch,
-            torch.tensor(
-                [0.0, 0.1, 0.21, 1.0], dtype=torch.float32
-            ),
+            torch.tensor([0.0, 0.1, 0.21, 1.0], dtype=torch.float32),
         ), y_torch
     else:
         pytest.skip("Skipping test as torch is not available.")
+
+
+def test_sanity_numpy():
+    for k in range(2, 4):
+        img = np.random.random(size=(50, 50, k))
+        s = mp.filtrations.Cubical(img)
+        for strat in mp.grids.available_strategies:
+            _s = s.grid_squeeze(
+                strategy=strat, resolution=None if strat == "exact" else 10
+            )
+            f = _s.filtration_grid[0]
+            if strat not in ["exact", "precomputed"]:
+                assert len(f) <= 10, f"invalid resolution for {strat=}"
+
+
+@pytest.mark.skipif(torch is None, reason="Torch not installed.")
+def test_sanity_torch():
+    import torch
+
+    for k in range(2, 4):
+        img = torch.rand(size=(50, 50, k)).requires_grad_()
+        s = mp.filtrations.Cubical(img)
+        for strat in mp.grids.available_strategies:
+            _s = s.grid_squeeze(
+                strategy=strat, resolution=None if strat == "exact" else 10
+            )
+            f = _s.filtration_grid[0]
+            if strat not in ["regular", "partition"]:
+                assert f.requires_grad, f"Grad not working for {strat=}"
+            if strat not in ["exact", "precomputed"]:
+                assert len(f) <= 10, f"invalid resolution for {strat=}"