upstream merge

GUDHI · Oct 15, 2024 · a5e3e0f · a5e3e0f
2 parents 587c03d + 6391ac2
commit a5e3e0f
Show file tree

Hide file tree

Showing 80 changed files with 6,807 additions and 4,069 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -1,12 +1,11 @@
 version: 2.0
 jobs:
-
-### With all third parties
+  ### With all third parties
 
   examples:
     docker:
       # cf. https://github.com/GUDHI/gudhi-deploy/blob/main/Dockerfile_for_circleci_image
-      - image: gudhi/ci_for_gudhi:2024.06.02
+      - image: gudhi/ci_for_gudhi:2024.09.01
     steps:
       - checkout
       - run:
@@ -25,7 +24,7 @@ jobs:
 
   tests:
     docker:
-      - image: gudhi/ci_for_gudhi:2024.06.02
+      - image: gudhi/ci_for_gudhi:2024.09.01
     steps:
       - checkout
       - run:
@@ -44,7 +43,7 @@ jobs:
 
   debug_tests:
     docker:
-      - image: gudhi/ci_for_gudhi:2024.06.02
+      - image: gudhi/ci_for_gudhi:2024.09.01
     steps:
       - checkout
       - run:
@@ -63,7 +62,7 @@ jobs:
 
   utils:
     docker:
-      - image: gudhi/ci_for_gudhi:2024.06.02
+      - image: gudhi/ci_for_gudhi:2024.09.01
     steps:
       - checkout
       - run:
@@ -82,7 +81,7 @@ jobs:
 
   python:
     docker:
-      - image: gudhi/ci_for_gudhi:2024.06.02
+      - image: gudhi/ci_for_gudhi:2024.09.01
     resource_class: large # Delaunay complex requires about 5 Gb of RAM to compile
     steps:
       - checkout
@@ -94,13 +93,12 @@ jobs:
       - run:
           name: Build and test python module. Generates and tests the python documentation
           command: |
-            pip3 install pydata-sphinx-theme
             mkdir build
             cd build
             cmake -DWITH_GUDHI_THIRD_PARTY=OFF -DUSER_VERSION_DIR=version ..
             make user_version
             cd version
-            cmake -DCMAKE_BUILD_TYPE=Release -DWITH_GUDHI_EXAMPLE=OFF -DWITH_GUDHI_UTILITIES=OFF -DWITH_GUDHI_PYTHON=ON -DPython_ADDITIONAL_VERSIONS=3 -DWITH_GUDHI_REMOTE_TEST=ON .
+            cmake -DCMAKE_BUILD_TYPE=Release -DWITH_GUDHI_EXAMPLE=OFF -DWITH_GUDHI_UTILITIES=OFF -DWITH_GUDHI_PYTHON=ON -DWITH_GUDHI_REMOTE_TEST=ON .
             cd python
             python3 setup.py build_ext --inplace
             ctest --output-on-failure
@@ -167,8 +165,7 @@ jobs:
             latexmk -pdf -interaction=nonstopmode test_biblio.tex
             latexmk -pdf -interaction=nonstopmode test_gudhi_citation.tex
 
-
-### With all third parties, except CGAL and Eigen
+  ### With all third parties, except CGAL and Eigen
 
   examples_without_cgal_eigen:
     docker:
@@ -243,13 +240,12 @@ jobs:
           command: |
             mkdir build
             cd build
-            cmake -DCMAKE_BUILD_TYPE=Release -DWITH_GUDHI_EXAMPLE=OFF -DWITH_GUDHI_UTILITIES=OFF -DWITH_GUDHI_PYTHON=ON -DPython_ADDITIONAL_VERSIONS=3 ..
+            cmake -DCMAKE_BUILD_TYPE=Release -DWITH_GUDHI_EXAMPLE=OFF -DWITH_GUDHI_UTILITIES=OFF -DWITH_GUDHI_PYTHON=ON ..
             cd src/python
             python3 setup.py build_ext --inplace
             ctest --output-on-failure
 
-
-### With all third parties, except CGAL
+  ### With all third parties, except CGAL
 
   examples_without_cgal:
     docker:
@@ -323,7 +319,7 @@ jobs:
           command: |
             mkdir build
             cd build
-            cmake -DCMAKE_BUILD_TYPE=Release -DEIGEN3_INCLUDE_DIR=/eigen-3.3.9 -DWITH_GUDHI_EXAMPLE=OFF -DWITH_GUDHI_UTILITIES=OFF -DWITH_GUDHI_PYTHON=ON -DPython_ADDITIONAL_VERSIONS=3 ..
+            cmake -DCMAKE_BUILD_TYPE=Release -DEIGEN3_INCLUDE_DIR=/eigen-3.3.9 -DWITH_GUDHI_EXAMPLE=OFF -DWITH_GUDHI_UTILITIES=OFF -DWITH_GUDHI_PYTHON=ON ..
             cd src/python
             python3 setup.py build_ext --inplace
             ctest --output-on-failure

diff --git a/.github/for_maintainers/new_gudhi_version_creation.md b/.github/for_maintainers/new_gudhi_version_creation.md
@@ -25,14 +25,14 @@ nor [unlabelled closed PRs](https://github.com/GUDHI/gudhi-devel/pulls?q=is%3Apr
 **Edit the file CMakeGUDHIVersion.txt**, and increment major, minor, or patch version number, in function of the version new delivery.
 ```bash
 # cf. .gitignore - ignore this if it is a fresh clone version
-rm -rf data/points/COIL_database/lucky_cat.off_dist data/points/COIL_database/lucky_cat.off_sc.dot data/points/KleinBottle5D.off_dist data/points/KleinBottle5D.off_sc.dot data/points/human.off_dist data/points/human.off_sc.off data/points/human.off_sc.txt src/python/test/__pycache__ src/python/gudhi/*.cpp
+rm -rf data/points/COIL_database/lucky_cat.off_dist data/points/COIL_database/lucky_cat.off_sc.dot data/points/KleinBottle5D.off_dist data/points/KleinBottle5D.off_sc.dot data/points/human.off_dist data/points/human.off_sc.off data/points/human.off_sc.txt src/python/test/__pycache__
 ```
 
 Checkin the modifications, build and test the version:
 ```bash
 git submodule update --init
 rm -rf build; mkdir build; cd build
-cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_PREFIX_PATH=$CONDA_PREFIX -DWITH_GUDHI_REMOTE_TEST=ON -DWITH_GUDHI_EXAMPLE=ON -DWITH_GUDHI_BENCHMARK=ON  -DUSER_VERSION_DIR=gudhi.@GUDHI_VERSION@ -DPython_ADDITIONAL_VERSIONS=3 ..
+cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_PREFIX_PATH=$CONDA_PREFIX -DWITH_GUDHI_REMOTE_TEST=ON -DWITH_GUDHI_EXAMPLE=ON -DWITH_GUDHI_BENCHMARK=ON  -DUSER_VERSION_DIR=gudhi.@GUDHI_VERSION@ ..
 make user_version
 date +"%d-%m-%Y-%T" > gudhi.@GUDHI_VERSION@/timestamp.txt
 tar -czvf gudhi.@[email protected] gudhi.@GUDHI_VERSION@
@@ -54,7 +54,7 @@ mkdir gudhi.doc.@GUDHI_VERSION@
 ```bash
 cd gudhi.@GUDHI_VERSION@
 rm -rf build; mkdir build; cd build
-cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_PREFIX_PATH=$CONDA_PREFIX -DWITH_GUDHI_EXAMPLE=ON -DPython_ADDITIONAL_VERSIONS=3 ..
+cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_PREFIX_PATH=$CONDA_PREFIX -DWITH_GUDHI_EXAMPLE=ON ..
 make doxygen && grep warning doxygen.log
 ```
 
@@ -154,4 +154,4 @@ Send version mail to the following lists :
 
 **Edit the file CMakeGUDHIVersion.txt**, and increment major, minor, or patch version number, in function of the future version (something like `3.X+1.0a0`).
 
-Reset [.github/next_release.md](.github/next_release.md) with [.github/for_maintainers/next_release_template.md](.github/for_maintainers/next_release_template.md).
+Reset [.github/next_release.md](.github/next_release.md) with [.github/for_maintainers/next_release_template.md](.github/for_maintainers/next_release_template.md).
diff --git a/.github/next_release.md b/.github/next_release.md
@@ -18,6 +18,10 @@ Below is a list of changes:
 - [Module](link)
      - **...**
 
+- Installation
+     - CMake &ge; 3.15 is now required (was &ge; 3.8).
+     - Python &ge; 3.8 is now required (was &ge; 3.5), because of `importlib.metadata`.
+
 - Miscellaneous
      - The [list of bugs that were solved](https://github.com/GUDHI/gudhi-devel/issues?q=label%3A3.11.0+is%3Aclosed) is available on GitHub.
 
@@ -26,7 +30,7 @@ However, there are still GPL dependencies for many modules. We invite you to che
 
 We kindly ask users to cite the GUDHI library as appropriately as possible in their papers, and to mention the use of the GUDHI library on the web pages of their projects using GUDHI and provide us with links to these web pages.
 
-We provide [bibtex entries](https://gudhi.inria.fr/doc/latest/_citation.html) for the modules of the User and Reference Manual, as well as for publications directly related to the GUDHI library. 
+We provide [bibtex entries](https://gudhi.inria.fr/doc/latest/_citation.html) for the modules of the User and Reference Manual, as well as for publications directly related to the GUDHI library.
 
 Feel free to [contact us](https://gudhi.inria.fr/contact/) in case you have any questions or remarks.
 

diff --git a/.github/workflows/pip-build-linux.yml b/.github/workflows/pip-build-linux.yml
@@ -21,7 +21,7 @@ jobs:
         run: |
           mkdir build_39
           cd build_39
-          cmake -DCMAKE_BUILD_TYPE=Release -DPYTHON_EXECUTABLE=$PYTHON39/bin/python ..
+          cmake -DCMAKE_BUILD_TYPE=Release -DPython_EXECUTABLE=$PYTHON39/bin/python ..
           cd src/python
           $PYTHON39/bin/python -m build -n -w
           auditwheel repair dist/*.whl

diff --git a/.github/workflows/pip-build-osx.yml b/.github/workflows/pip-build-osx.yml
@@ -46,7 +46,7 @@ jobs:
           python --version
           mkdir build
           cd build
-          cmake -DCMAKE_BUILD_TYPE=Release -DPython_ADDITIONAL_VERSIONS=3 ..
+          cmake -DCMAKE_BUILD_TYPE=Release ..
           cd src/python
           python -m build -n -w
           export PATH="$PATH:`python -m site --user-base`/bin"

diff --git a/.github/workflows/pip-packaging-linux.yml b/.github/workflows/pip-packaging-linux.yml
@@ -19,10 +19,9 @@ jobs:
       # numpy~=1.21.4 means any numpy=1.21.*, but also numpy>=1.21.4 (numpy~=1.21 do not work as it means any numpy==1.*)
       - name: Build wheel for Python 3.8
         run: |
-          rm -rf src/python/gudhi/*.cpp
           mkdir build_38
           cd build_38
-          cmake -DCMAKE_BUILD_TYPE=Release -DPYTHON_EXECUTABLE=$PYTHON38/bin/python ..
+          cmake -DCMAKE_BUILD_TYPE=Release -DPython_EXECUTABLE=$PYTHON38/bin/python ..
           cd src/python
           $PYTHON38/bin/python -m build -n -w
           auditwheel repair dist/*.whl
@@ -38,10 +37,9 @@ jobs:
           $PYTHON38/bin/python -m pytest -v src/python/test/test_rips_complex.py
       - name: Build wheel for Python 3.9
         run: |
-          rm -rf src/python/gudhi/*.cpp
           mkdir build_39
           cd build_39
-          cmake -DCMAKE_BUILD_TYPE=Release -DPYTHON_EXECUTABLE=$PYTHON39/bin/python ..
+          cmake -DCMAKE_BUILD_TYPE=Release -DPython_EXECUTABLE=$PYTHON39/bin/python ..
           cd src/python
           $PYTHON39/bin/python -m build -n -w
           auditwheel repair dist/*.whl
@@ -61,10 +59,9 @@ jobs:
           $PYTHON39/bin/python -m pytest -v src/python/test/test_rips_complex.py
       - name: Build wheel for Python 3.10
         run: |
-          rm -rf src/python/gudhi/*.cpp
           mkdir build_310
           cd build_310
-          cmake -DCMAKE_BUILD_TYPE=Release -DPYTHON_EXECUTABLE=$PYTHON310/bin/python ..
+          cmake -DCMAKE_BUILD_TYPE=Release -DPython_EXECUTABLE=$PYTHON310/bin/python ..
           cd src/python
           $PYTHON310/bin/python -m build -n -w
           auditwheel repair dist/*.whl
@@ -80,10 +77,9 @@ jobs:
           $PYTHON310/bin/python -m pytest -v src/python/test/test_rips_complex.py
       - name: Build wheel for Python 3.11
         run: |
-          rm -rf src/python/gudhi/*.cpp
           mkdir build_311
           cd build_311
-          cmake -DCMAKE_BUILD_TYPE=Release -DPYTHON_EXECUTABLE=$PYTHON311/bin/python ..
+          cmake -DCMAKE_BUILD_TYPE=Release -DPython_EXECUTABLE=$PYTHON311/bin/python ..
           cd src/python
           $PYTHON311/bin/python -m build -n -w
           auditwheel repair dist/*.whl
@@ -99,10 +95,9 @@ jobs:
           $PYTHON311/bin/python -m pytest -v src/python/test/test_rips_complex.py
       - name: Build wheel for Python 3.12
         run: |
-          rm -rf src/python/gudhi/*.cpp
           mkdir build_312
           cd build_312
-          cmake -DCMAKE_BUILD_TYPE=Release -DPYTHON_EXECUTABLE=$PYTHON312/bin/python ..
+          cmake -DCMAKE_BUILD_TYPE=Release -DPython_EXECUTABLE=$PYTHON312/bin/python ..
           cd src/python
           $PYTHON312/bin/python -m build -n -w
           auditwheel repair dist/*.whl

diff --git a/.github/workflows/pip-packaging-osx.yml b/.github/workflows/pip-packaging-osx.yml
@@ -42,7 +42,7 @@ jobs:
           python --version
           mkdir build
           cd build
-          cmake -DCMAKE_BUILD_TYPE=Release -DPython_ADDITIONAL_VERSIONS=3 ..
+          cmake -DCMAKE_BUILD_TYPE=Release ..
           cd src/python
           python -m build -n -w
       - name: Install and test python wheel
@@ -112,7 +112,7 @@ jobs:
           python --version
           mkdir build
           cd build
-          cmake -DCMAKE_BUILD_TYPE=Release -DPython_ADDITIONAL_VERSIONS=3 ..
+          cmake -DCMAKE_BUILD_TYPE=Release ..
           cd src/python
           python -m build -n -w
       # Test ABI compatibility with numpy 1.X

diff --git a/.gitignore b/.gitignore
@@ -1,9 +1,6 @@
 # Classical CMake build directory
 /*build*
 
-# Generated by Cython
-src/python/gudhi/*.cpp
-
 # Generated by tests
 data/points/COIL_database/lucky_cat.off_dist
 data/points/COIL_database/lucky_cat.off_sc.dot

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.8)
+cmake_minimum_required(VERSION 3.15)
 
 project(GUDHIdev)
 
@@ -37,6 +37,7 @@ add_gudhi_module(Hasse_complex)
 add_gudhi_module(Persistence_representations)
 add_gudhi_module(Persistent_cohomology)
 add_gudhi_module(Rips_complex)
+add_gudhi_module(Ripser)
 add_gudhi_module(Simplex_tree)
 add_gudhi_module(Skeleton_blocker)
 add_gudhi_module(Spatial_searching)