multipers 1.0__tar.gz → 1.0.2__tar.gz

{multipers-1.0/multipers.egg-info → multipers-1.0.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: multipers
-Version: 1.0
+Version: 1.0.2
 Summary: Multiparameter persistence toolkit
 Author: David Loiseaux
 Author-email: david.loiseaux@inria.fr

{multipers-1.0 → multipers-1.0.2}/README.md

@@ -9,13 +9,20 @@ Using conda
 ```sh
 conda create -n python311
 conda activate python311
-conda install python=3.11 cxx-compiler boost tbb tbb-devel numpy matplotlib gudhi scikit-learn cython sympy tqdm cycler typing shapely numba -c conda-forge
+conda install python=3.11 boost tbb numpy matplotlib gudhi scikit-learn sympy tqdm typing shapely -c conda-forge
 pip install filtration-domination pykeops
 ```
 
 ### Installation
-In a terminal, in the root folder
+#### Using pip (Recommended)
+Precompiled versions, for linux and macos, are available on PyPI. Just use 
 ```sh
+pip install multipers
+```
+#### Building from source
+Clone the repo, and in a terminal, in the root folder
+```sh
+conda install python=3.11 cxx-compiler boost tbb tbb-devel numpy matplotlib gudhi scikit-learn cython sympy tqdm cycler typing shapely -c conda-forge
 pip install .
 ```
 It has been tested with python 3.11 on Linux (gcc12) and Macos (clang14-clang16). 

{multipers-1.0 → multipers-1.0.2}/multipers/data/synthetic.py

@@ -1,5 +1,4 @@
 import numpy as np
-from sklearn.preprocessing import LabelEncoder
 def noisy_annulus(n1:int=1000,n2:int=200, r1:float=1, r2:float=2, dim:int=2, center:np.ndarray|list|None=None, **kwargs)->np.ndarray:
 	"""Generates a noisy annulus dataset.
 
@@ -61,6 +60,7 @@ def orbit(n:int=1000, r:float=1., x0=[]):
 	return np.asarray(point_list, dtype=float)
 
 def get_orbit5k(num_pts = 1000,  num_data=5000):
+	from sklearn.preprocessing import LabelEncoder
 	rs = [2.5, 3.5, 4, 4.1, 4.3]
 	labels = np.random.choice(rs, size=num_data, replace=True)
 	X = [orbit(n=num_pts, r=r) for r in labels]