multipers 2.3.3b4__tar.gz → 2.3.3b5__tar.gz

{multipers-2.3.3b4/multipers.egg-info → multipers-2.3.3b5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: multipers
-Version: 2.3.3b4
+Version: 2.3.3b5
 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.3b4 → multipers-2.3.3b5}/multipers/_signed_measure_meta.py

@@ -3,7 +3,6 @@ from typing import Optional, Union
 
 import numpy as np
 
-import multipers as mp
 from multipers.grids import compute_grid, sms_in_grid
 from multipers.plots import plot_signed_measures
 from multipers.point_measure import clean_sms, zero_out_sms
@@ -31,7 +30,7 @@ def signed_measure(
     verbose: bool = False,
     n_jobs: int = -1,
     expand_collapse: bool = False,
-    backend: Optional[str] = None, # deprecated
+    backend: Optional[str] = None,  # deprecated
     grid: Optional[Iterable] = None,
     coordinate_measure: bool = False,
     num_collapses: int = 0,  # TODO : deprecate
@@ -99,12 +98,21 @@ def signed_measure(
      - Rank: Same as Hilbert.
     """
     if backend is not None:
-        raise ValueError("backend is deprecated. reduce the complex before this function.")
-    if num_collapses >0:
-        raise ValueError("num_collapses is deprecated. reduce the complex before this function.")
+        raise ValueError(
+            "backend is deprecated. reduce the complex before this function."
+        )
+    if num_collapses > 0:
+        raise ValueError(
+            "num_collapses is deprecated. reduce the complex before this function."
+        )
     ## TODO : add timings in verbose
     if len(filtered_complex) == 0:
-        return [(np.empty((0,2), dtype=filtered_complex.dtype), np.empty(shape=(0,), dtype=int))]
+        return [
+            (
+                np.empty((0, 2), dtype=filtered_complex.dtype),
+                np.empty(shape=(0,), dtype=int),
+            )
+        ]
     if grid_conversion is not None:
         grid = tuple(f for f in grid_conversion)
         raise DeprecationWarning(
@@ -134,6 +142,8 @@ def signed_measure(
         "rank",
         "euler_characteristic",
         "hilbert_function",
+        "rectangle",
+        "hook",
     ]
 
     assert (
@@ -256,7 +266,7 @@ def signed_measure(
         #         if verbose:
         #             print("Done.")
         else:  # No backend
-            if invariant is not None and "rank" in invariant:
+            if invariant is not None and ("rank" in invariant or "hook" in invariant or "rectangle" in invariant):
                 degrees = np.asarray(degrees, dtype=int)
                 if verbose:
                     print("Computing rank...", end="")
@@ -269,6 +279,10 @@ def signed_measure(
                     ignore_inf=ignore_infinite_filtration_values,
                 )
                 fix_mass_default = False
+
+                if "hook" in invariant:
+                    from multipers.point_measure import rectangle_to_hook_minimal_signed_barcode
+                    sms = [rectangle_to_hook_minimal_signed_barcode(pts,w) for pts,w in sms]
                 if verbose:
                     print("Done.")
             elif filtered_complex_.is_minpres:
@@ -315,7 +329,7 @@ def signed_measure(
         if verbose:
             print("Input is a simplextree.")
         ## we still have a simplextree here
-        if invariant in ["rank_invariant", "rank"]:
+        if invariant in ["rank_invariant", "rank", "hook", "rectangle"]:
             if verbose:
                 print("Computing rank invariant...", end="")
             assert (
@@ -331,6 +345,9 @@ def signed_measure(
                 expand_collapse=expand_collapse,
             )
             fix_mass_default = False
+            if "hook" in invariant:
+                from multipers.point_measure import rectangle_to_hook_minimal_signed_barcode
+                sms = [rectangle_to_hook_minimal_signed_barcode(pts,w) for pts,w in sms]
             if verbose:
                 print("Done.")
         elif len(degrees) == 1 and degrees[0] is None:

{multipers-2.3.3b4 → multipers-2.3.3b5}/multipers/array_api/__init__.py

@@ -1,6 +1,7 @@
-def api_from_tensor(x, *, verbose: bool = False):
-    import multipers.array_api.numpy as npapi
+import multipers.array_api.numpy as npapi
+
 
+def api_from_tensor(x, *, verbose: bool = False):
     if npapi.is_promotable(x):
         if verbose:
             print("using numpy backend")
@@ -38,6 +39,7 @@ def api_from_tensors(*args):
         return torchapi
     raise ValueError(f"Incompatible types got {[type(x) for x in args]=}.")
 
+
 def to_numpy(x):
     api = api_from_tensor(x)
     return api.asnumpy(x)

{multipers-2.3.3b4 → multipers-2.3.3b5}/multipers/array_api/numpy.py

@@ -16,6 +16,8 @@ no_grad = nullcontext
 zeros = _np.zeros
 min = _np.min
 max = _np.max
+repeat_interleave = _np.repeat
+cdist = cdist  # type: ignore[no-redef]
 
 
 def minvalues(x: _np.ndarray, **kwargs):

{multipers-2.3.3b4 → multipers-2.3.3b5}/multipers/array_api/torch.py

@@ -13,6 +13,7 @@ cdist = _t.cdist
 zeros = _t.zeros
 min = _t.min
 max = _t.max
+repeat_interleave = _t.repeat_interleave
 
 
 def minvalues(x: _t.Tensor, **kwargs):

{multipers-2.3.3b4 → multipers-2.3.3b5}/multipers/plots.py

@@ -84,7 +84,7 @@ def _plot_signed_measure_4(
     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]:
+        if rectangle[2] >= x_smoothing * rectangle[0]:
             alpha_rescaling = max(
                 alpha_rescaling,
                 (rectangle[2] / x_smoothing - rectangle[0])
@@ -93,7 +93,7 @@ def _plot_signed_measure_4(
     # draw the rectangles
     for rectangle, weight in zip(pts, weights):
         # draw only the rectangles that have not been reduced to the empty set
-        if rectangle[2] > x_smoothing * rectangle[0]:
+        if rectangle[2] >= x_smoothing * rectangle[0]:
             # make the alpha channel proportional to the rectangle's area
             if area_alpha:
                 _plot_rectangle(

{multipers-2.3.3b4 → multipers-2.3.3b5}/multipers/point_measure.pyx

@@ -11,6 +11,7 @@ from collections import defaultdict
 cnp.import_array()
 from scipy import sparse
 
+from multipers.array_api import api_from_tensor
 
 import multipers.grids as mpg
 
@@ -31,7 +32,6 @@ import cython
 cimport cython
 
 
-
 # from scipy.sparse import coo_array
 # from scipy.ndimage import convolve1d
 
@@ -169,7 +169,7 @@ def sparsify(x):
 
 @cython.boundscheck(False)
 @cython.wraparound(False)
-def clean_signed_measure(some_float[:,:] pts, some_int[:] weights, dtype = np.float32):
+def clean_signed_measure_old(some_float[:,:] pts, some_int[:] weights, dtype = np.float32):
     """
     Sum the diracs at the same locations. i.e.,
     returns the minimal sized measure to represent the input.
@@ -190,6 +190,14 @@ def clean_signed_measure(some_float[:,:] pts, some_int[:] weights, dtype = np.fl
     new_weights = new_weights[idx]
     return (new_pts, new_weights)
 
+def clean_signed_measure(pts, w, dtype=np.int32):
+    api = api_from_tensor(pts)
+    _, idx, inv = np.unique(api.asnumpy(pts), return_index=True, return_inverse=True, axis=0)
+    new_w = np.bincount(inv, weights=w).astype(w.dtype)
+    pts, w = pts[idx], new_w
+    idx = w!=0
+    return pts[idx],w[idx]
+
 def clean_sms(sms):
     """
     Sum the diracs at the same locations. i.e.,
@@ -324,3 +332,64 @@ def estimate_rank_from_rank_sm(sm:tuple, a, b)->np.int64:
     return w[idx].sum()
 
 
+def rectangle_to_hook_minimal_signed_barcode(pts,w,):
+    if pts.shape[1] != 4:
+        raise NotImplementedError(
+            "Only works for 2-parameter persistence modules for the moment."
+        )
+    api = api_from_tensor(pts)
+    pts = api.astensor(pts)
+    w = np.asarray(w)
+    ## [a,b], [a, a0b1], [a,b0a1], proj, V,H 
+
+    projectives_idx = (pts[:,3] == np.inf) * (pts[:,2] == np.inf)
+    pts_proj = pts[projectives_idx]
+    w_proj = w[projectives_idx]
+    pts = pts[~projectives_idx]
+    w = w[~projectives_idx]
+    # print("projectives:", pts_proj)
+    
+    vert_blocks_idx = pts[:,3] == np.inf
+    pts_V = pts[vert_blocks_idx]
+    w_V = w[vert_blocks_idx]
+    pts_V[:,3] = pts_V[:,1]
+    pts = pts[~vert_blocks_idx]
+    w = w[~vert_blocks_idx]
+    # print("vertical:", pts_V)
+
+    h_idx = pts[:,2] == np.inf
+    pts_H = pts[h_idx]
+    w_H = w[h_idx]
+    pts_H[:,2] = pts_H[:,0]
+    pts = pts[~h_idx]
+    w = w[~h_idx]
+    # print("horizontal:", pts_H)
+    
+    
+    new_w = api.cat([-w, w, w,  w_proj,w_V,w_H])
+    
+    pts_b0a1 = api.tensor(pts)
+    pts_b0a1[:,3] = pts[:,1]
+    pts_a0b1 = api.tensor(pts)
+    pts_a0b1[:,2] = pts[:,0]
+    
+    new_pts = api.cat([
+        pts,
+        pts_b0a1,
+        pts_a0b1,
+        pts_proj, 
+        pts_V,
+        pts_H
+    ], axis=0)
+    # pts,w = new_pts,new_w
+    pts,w = clean_signed_measure(new_pts,new_w)
+
+    # Everything infinite is handled separately anyway
+    # inf0 = pts[:,2] == np.inf
+    # inf1 = pts[:,3] == np.inf
+    # pts[inf0,3] = pts[inf0,1]
+    # pts[inf1,2] = pts[inf1,0]
+    # pts,w = clean_signed_measure(pts,w)  
+
+    return pts,w
+

{multipers-2.3.3b4 → multipers-2.3.3b5/multipers.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: multipers
-Version: 2.3.3b4
+Version: 2.3.3b5
 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.3b4 → multipers-2.3.3b5}/pyproject.toml

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

{multipers-2.3.3b4 → multipers-2.3.3b5}/tests/test_signed_measure.py

@@ -89,3 +89,70 @@ def test_rank(degree):
         bc2 = s.persistence_on_line(bp, d)[degree]
         # assert_sm(bc1,bc2, max_error=.1)
         assert np.isclose(wasserstein_distance(bc1, bc2), 0)
+
+
+def test_hook_decomposition():
+    from multipers.point_measure import rectangle_to_hook_minimal_signed_barcode
+
+    B = [[], [0]]
+    D = [0, 1]
+    F = [[0, 0], [1, 1]]
+    s = mp.Slicer(return_type_only=True)(B, D, F)
+    (sm_rank,) = mp.signed_measure(
+        s,
+        invariant="rank",
+        degree=0,
+    )
+    sm_hook = rectangle_to_hook_minimal_signed_barcode(*sm_rank)
+    pts_hook, w_hook = sm_hook
+    assert np.array_equal(pts_hook, [[0, 0, 1, 1]]), pts_hook
+    assert np.array_equal(w_hook, [1]), w_hook
+    B = [[], [0], [0]]
+    D = [0, 1, 1]
+    F = [[0, 0], [1, 0], [0, 1]]
+    s = mp.Slicer(return_type_only=True)(B, D, F)
+    (sm_rank,) = mp.signed_measure(
+        s,
+        invariant="rank",
+        degree=0,
+    )
+    sm_hook = rectangle_to_hook_minimal_signed_barcode(*sm_rank)
+    pts_hook, w_hook = sm_hook
+    assert np.array_equal(
+        pts_hook, [[0, 0, 0, 1], [0, 0, 1, 0], [0, 0, 1, 1]]
+    ), pts_hook
+    assert np.array_equal(w_hook, [1, 1, -1]), w_hook
+
+    B = [
+        [],
+        [0],
+    ]
+    D = [
+        0,
+        1,
+    ]
+    F = [[0, 0], [1, 0]]
+    s = mp.Slicer(return_type_only=True)(B, D, F)
+    (sm_rank,) = mp.signed_measure(
+        s,
+        invariant="rank",
+        degree=0,
+    )
+    sm_hook = rectangle_to_hook_minimal_signed_barcode(*sm_rank)
+    pts_hook, w_hook = sm_hook
+    assert np.array_equal(pts_hook, [[0, 0, 1, 0]]), pts_hook
+    assert np.array_equal(w_hook, [1]), w_hook
+
+    B = [[], [0]]
+    D = [0, 1]
+    F = [[0, 0], [0, 1]]
+    s = mp.Slicer(return_type_only=True)(B, D, F)
+    (sm_rank,) = mp.signed_measure(
+        s,
+        invariant="rank",
+        degree=0,
+    )
+    sm_hook = rectangle_to_hook_minimal_signed_barcode(*sm_rank)
+    pts_hook, w_hook = sm_hook
+    assert np.array_equal(pts_hook, [[0, 0, 0, 1]]), pts_hook
+    assert np.array_equal(w_hook, [1]), w_hook

{multipers-2.3.3b4 → multipers-2.3.3b5}/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[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)}")
-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)}")