multipers 2.3.3b2__cp312-cp312-win_amd64.whl → 2.3.3b4__cp312-cp312-win_amd64.whl

multipers/ml/signed_measures.py

@@ -758,6 +758,8 @@ class SignedMeasureFormatter(BaseEstimator, TransformerMixin):
                 ) = self._get_filtration_bounds(X, axis=ax)
                 self._filtrations_bounds.append(filtration_bounds)
                 self._normalization_factors.append(normalization_factors)
+            self._filtrations_bounds = self._backend.astensor(self._filtrations_bounds)
+            self._normalization_factors = self._backend.astensor(self._normalization_factors)
             # else:
             #     (
             #         self._filtrations_bounds,
@@ -782,9 +784,9 @@ class SignedMeasureFormatter(BaseEstimator, TransformerMixin):
             ]
             # axis, filtration_values
             filtration_values = [
-                compute_grid(
+                self._backend.astensor(compute_grid(
                     f_ax.T, resolution=self.resolution, strategy=self.grid_strategy
-                )
+                ))
                 for f_ax in filtration_values
             ]
             self._infered_grids = filtration_values
@@ -848,7 +850,7 @@ class SignedMeasureFormatter(BaseEstimator, TransformerMixin):
 
         if self.flatten:
             out = np.concatenate(out).flatten()
-        if self.axis == -1:
+        elif self.axis == -1:
             return np.asarray(out)
         else:
             return np.asarray(out)[0]

multipers/plots.py

@@ -1,11 +1,24 @@
 from typing import Optional
+from warnings import warn
 
+import matplotlib.colors as mcolors
 import matplotlib.pyplot as plt
 import numpy as np
+from matplotlib.colors import ListedColormap
 from numpy.typing import ArrayLike
-from warnings import warn
+
 from multipers.array_api import to_numpy
 
+_custom_colors = [
+    "#03045e",
+    "#0077b6",
+    "#00b4d8",
+    "#90e0ef",
+]
+_cmap = ListedColormap(_custom_colors)
+_continuous_cmap = mcolors.LinearSegmentedColormap.from_list(
+    "continuous_cmap", _cmap.colors, N=256
+)
 
 
 def _plot_rectangle(rectangle: np.ndarray, weight, **plt_kwargs):
@@ -185,7 +198,7 @@ def plot_surface(
         if discrete_surface:
             cmap = matplotlib.colormaps["gray_r"]
         else:
-            cmap = matplotlib.colormaps["plasma"]
+            cmap = _cmap
     if discrete_surface:
         if has_negative_values:
             bounds = np.arange(-5, 6, 1, dtype=int)
@@ -200,15 +213,15 @@ def plot_surface(
         )
         cbar.set_ticks(ticks=bounds, labels=bounds)
         return im
-    im = ax.pcolormesh(grid[0], grid[1], hf.T, cmap=cmap, **plt_args)
+    im = ax.contourf(grid[0], grid[1], hf.T, cmap=cmap, **plt_args)
     return im
 
 
 def plot_surfaces(HF, size=4, **plt_args):
     grid, hf = HF
-    assert hf.ndim == 3, (
-        f"Found hf.shape = {hf.shape}, expected ndim = 3 : degree, 2-parameter surface."
-    )
+    assert (
+        hf.ndim == 3
+    ), f"Found hf.shape = {hf.shape}, expected ndim = 3 : degree, 2-parameter surface."
     num_degrees = hf.shape[0]
     fig, axes = plt.subplots(
         nrows=1, ncols=num_degrees, figsize=(num_degrees * size, size)
@@ -388,7 +401,19 @@ def plot_simplicial_complex(
     return out
 
 
-def plot_point_cloud(pts, function, x, y, mma=None, degree=None):
+def plot_point_cloud(
+    pts,
+    function,
+    x,
+    y,
+    mma=None,
+    degree=None,
+    ball_alpha=0.3,
+    point_cmap="viridis",
+    color_bias=1,
+    ball_color=None,
+    point_size=20,
+):
     if mma is not None:
         fig, (a, b) = plt.subplots(ncols=2, figsize=(15, 5))
         plt.sca(a)
@@ -403,22 +428,23 @@ def plot_point_cloud(pts, function, x, y, mma=None, degree=None):
         plt.scatter([x], [y], c="r", zorder=10)
         plt.text(x + 0.01 * (b - a), y + 0.01 * (d - c), f"({x},{y})")
         return
-    values = 1 - function
+    values = -function
     qs = np.quantile(values, np.linspace(0, 1, 100))
 
     def color_idx(d):
-        return np.searchsorted(qs, d) / 100
+        return np.searchsorted(qs, d * color_bias) / 100
 
-    from matplotlib.pyplot import get_cmap
     from matplotlib.collections import PatchCollection
+    from matplotlib.pyplot import get_cmap
 
     def color(d):
-        return get_cmap("viridis")([0, color_idx(d), 1])[1]
+        return get_cmap(point_cmap)([0, color_idx(d), 1])[1]
 
+    _colors = np.array([color(v) for v in values])
     ax = plt.gca()
     idx = function <= y
-    circles = [plt.Circle(pt, x, color=color(c)) for pt, c in zip(pts[idx], function)]
-    pc = PatchCollection(circles, alpha=0.3)
+    circles = [plt.Circle(pt, x) for pt, c in zip(pts[idx], function)]
+    pc = PatchCollection(circles, alpha=ball_alpha, color=ball_color)
     ax.add_collection(pc)
-    plt.scatter(*pts.T, c=-function, s=20)
+    plt.scatter(*pts.T, c=_colors, s=point_size)
     ax.set_aspect(1)

multipers/slicer.pyx

@@ -19914,7 +19914,7 @@ def _from_bitmapf32(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_bitmapf64(image, **slicer_kwargs):
     from multipers import Slicer
     dtype = slicer_kwargs.get("dtype", image.dtype)
     slicer_kwargs["dtype"] = dtype
@@ -19932,9 +19932,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.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:
@@ -19952,7 +19952,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_bitmapi64(image, **slicer_kwargs):
+def _from_bitmapi32(image, **slicer_kwargs):
     from multipers import Slicer
     dtype = slicer_kwargs.get("dtype", image.dtype)
     slicer_kwargs["dtype"] = dtype
@@ -19970,9 +19970,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.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:
@@ -19990,7 +19990,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_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_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.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:
@@ -20033,12 +20033,12 @@ def from_bitmap(img, **kwargs):
     img = np.asarray(img)
     if img.dtype == np.float32:
         return _from_bitmapf32(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.int64:
         return _from_bitmapi64(img, **kwargs)
-    if img.dtype == np.float64:
-        return _from_bitmapf64(img, **kwargs)
     raise ValueError(f"Invalid dtype. Got {img.dtype=}, was expecting {available_dtype=}.")
 
 def from_function_delaunay(

{multipers-2.3.3b2.dist-info → multipers-2.3.3b4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: multipers
-Version: 2.3.3b2
+Version: 2.3.3b4
 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>
@@ -62,6 +62,11 @@ or
 ```sh
 conda install multipers -c conda-forge
 ```
+Pre-releases are available via
+```sh
+pip install --pre multipers
+```
+These release usually contain small bugfixes or unstable new features.
 
 Windows support is experimental, and some core dependencies are not available on Windows.
 We hence recommend Windows user to use [WSL](https://learn.microsoft.com/en-us/windows/wsl/).

{multipers-2.3.3b2.dist-info → multipers-2.3.3b4.dist-info}/RECORD

@@ -5,31 +5,31 @@ 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=1OoP8ySxNk67o3L-Y-vhvyLd4_g6r61IeN_Auo9sp0I,332800
+multipers/function_rips.cp312-win_amd64.pyd,sha256=vMmsB_8ArIBmqEO2PH97vQMgwcUuMiEk-l4boLFA6rw,332800
 multipers/function_rips.pyx,sha256=j5NjbK3YrAv_2s8YHB1JB0k6m9NC7RQCSFlJe-w_kgE,5252
-multipers/grids.cp312-win_amd64.pyd,sha256=jgNU_LxJnp-gcCRnmtc9YMgh2GmP1f4agF9G1p_3J_A,479232
+multipers/grids.cp312-win_amd64.pyd,sha256=P_CreKWsYECEaCNFKi8V-K_G2ACIHyyepW0kWgF-TGA,479232
 multipers/grids.pyx,sha256=ONN_RKkuxqwb9IaS9gd42FUGaiBLc8QWcd3L-ubZjKE,16575
-multipers/io.cp312-win_amd64.pyd,sha256=CVyI02FVhZo1aEY9HGuwRqXHMOJ_XKTHxM6zeNyZLGA,220160
+multipers/io.cp312-win_amd64.pyd,sha256=XZViksPv0mMwnWf_pDX_apJXhRV6mLgBc8SD6PVjNt4,220160
 multipers/io.pyx,sha256=pQBH_rSqaCZqDSxTLnhlyECP3fLbX2tR_RKJHydHm_0,22210
-multipers/mma_structures.cp312-win_amd64.pyd,sha256=_eOijo8kHpG_SBQ16BuxvBBSECoxnvlS9cTzPVYCLOA,1279488
+multipers/mma_structures.cp312-win_amd64.pyd,sha256=SqWa_guCCNJvHuOW-laycyduJrztaYzz9oln158Bm1o,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=gp7wBVt4OdaDLHB9CvMYm8dUOW6pQFGoA69f0jP2Boo,451584
+multipers/multiparameter_module_approximation.cp312-win_amd64.pyd,sha256=IzSXSjuUV4vk6Zg7JLlj_qfr605Lib6sEkj5lH8TtYU,451584
 multipers/multiparameter_module_approximation.pyx,sha256=wp7la7Z9wBngnfw6WOVddf93mPyXf4HfNT6dKW2Z0r0,9030
 multipers/pickle.py,sha256=YYVt4iHiD16E1x5Yn_4mX6P5P8rKi56pNGjJo5IzPhc,2579
-multipers/plots.py,sha256=UrVWFQvc7csmRIhTbY-3J1VQh78EjpaduCk76dbt-x0,14229
-multipers/point_measure.cp312-win_amd64.pyd,sha256=dHTEYZtq5Zepb8o1Crnh3d92fWHGNeSqOxqYVj9yRmQ,573952
+multipers/plots.py,sha256=aQcRpAKxwvzUiFXK2vZZLKtpZWD5eqga42BhV_FO31U,14719
+multipers/point_measure.cp312-win_amd64.pyd,sha256=Y93ME2sP1eQH-LXk5mtKr7s9i94TbfS7-2jKnEImdbY,573952
 multipers/point_measure.pyx,sha256=DVhal6HgCCuALSJMcHHKOW16CwDQCVTc2PpK8cGCqx8,12109
-multipers/simplex_tree_multi.cp312-win_amd64.pyd,sha256=AM1BNI-qheFX4uqMa64fY3jaIyMdyQJVEeHebtGEY2M,3616256
+multipers/simplex_tree_multi.cp312-win_amd64.pyd,sha256=kGJ4UBtsoaO9-CexTHf44uP1UVXOkHekHxBnKUit72g,3616256
 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=4WGcvaU8mHke6lAb2hP9H_rDhplJTSoZQOlB3OXcoJI,11682816
+multipers/slicer.cp312-win_amd64.pyd,sha256=4E0J7XCInx7QAdAuYxtrZ5Vij-uDItp23of1QJ6j8No,11682816
 multipers/slicer.pxd,sha256=bHcV5COzDcjhaVcL3bWSHivUYtdkSx4bdj24fVOe_DU,185230
 multipers/slicer.pxd.tp,sha256=fLOUPtPGqiY9o1fPDyc_whBrgKLh_6HVfvl7OtE-34Y,10243
-multipers/slicer.pyx,sha256=SYjCsYtPY-16fwABZvZncNJ3tKU5shVkx_WCvqs467U,894041
+multipers/slicer.pyx,sha256=SeG0uXmtVFloCXLG2R4qkJ_QtKBeqky3EcEAGsiW01o,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
@@ -146,7 +146,7 @@ multipers/ml/kernels.py,sha256=XWfvKY68-c9E-MpRzdNqGzGD6K24Aizx95TkiSeAtIY,6175
 multipers/ml/mma.py,sha256=mSwYqSHWGiboEiMnxArCuhHyrOExPYdML2Mbx4dTO7s,23950
 multipers/ml/one.py,sha256=np5jM8gywm65TsK1yeZ1BDWqP-Ym-7hz4brTXI_0imk,20119
 multipers/ml/point_clouds.py,sha256=nTkSjSzQy6S10-sZ0uwBp_Fs2EIWleB7yHncK2b_xLg,13770
-multipers/ml/signed_measures.py,sha256=MGxteZRNFvOPuNxCeJEp3iFKLLqHgfOk9EVeqM1OqIU,58131
+multipers/ml/signed_measures.py,sha256=LCf0gAfQ7y4q9gI7s72Y4nwgP6U8HZenwGrMDdK-azY,58339
 multipers/ml/sliced_wasserstein.py,sha256=jgq4ND3EWwwJBopqRvfJLsoOptiMHjS3zEAENBmPJDc,18644
 multipers/ml/tools.py,sha256=DOPcqmvZP2bA7M08GrwccdebwDq1HEwYdhNRGT7eZMI,3453
 multipers/multi_parameter_rank_invariant/diff_helpers.h,sha256=wMCOhAewWd6-lulLND0y8M0MZoru6zn_8J3qfXDjLds,3477
@@ -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.3b2.dist-info/licenses/LICENSE,sha256=UsQRnvlo_9wpQS9DNt52GEraERHwK2GIRwuqr2Yv5JI,1071
-multipers-2.3.3b2.dist-info/METADATA,sha256=dzqMyVIOk45QhWOjmyZRVi4oT6P6ogNxcGZ9hoSfemw,9672
-multipers-2.3.3b2.dist-info/WHEEL,sha256=8UP9x9puWI0P1V_d7K2oMTBqfeLNm21CTzZ_Ptr0NXU,101
-multipers-2.3.3b2.dist-info/top_level.txt,sha256=L9e0AGmhRzrNw9FpuUx-zlqi5NcBOmrI9wYY8kYWr8A,10
-multipers-2.3.3b2.dist-info/RECORD,,
+multipers-2.3.3b4.dist-info/licenses/LICENSE,sha256=UsQRnvlo_9wpQS9DNt52GEraERHwK2GIRwuqr2Yv5JI,1071
+multipers-2.3.3b4.dist-info/METADATA,sha256=n_srMz-MDQCYAL-DoZjzuj2Cy0vYUwG2D2HmycB0cjI,9817
+multipers-2.3.3b4.dist-info/WHEEL,sha256=8UP9x9puWI0P1V_d7K2oMTBqfeLNm21CTzZ_Ptr0NXU,101
+multipers-2.3.3b4.dist-info/top_level.txt,sha256=L9e0AGmhRzrNw9FpuUx-zlqi5NcBOmrI9wYY8kYWr8A,10
+multipers-2.3.3b4.dist-info/RECORD,,