Merge branch 'GUDHI:master' into persistence_matrix

hschreiber · May 22, 2024 · 02f6697 · 02f6697
2 parents 8305da1 + 561f74d
commit 02f6697
Show file tree

Hide file tree

Showing 7 changed files with 28 additions and 26 deletions.
diff --git a/.github/workflows/pip-build-osx.yml b/.github/workflows/pip-build-osx.yml
@@ -9,7 +9,8 @@ env:
 
 jobs:
   build:
-    runs-on: macos-latest
+    # Should use macos-latest, but python 3.8 is no more available from macos-14
+    runs-on: macos-13
     strategy:
       max-parallel: 4
       matrix:

diff --git a/.github/workflows/pip-packaging-osx.yml b/.github/workflows/pip-packaging-osx.yml
@@ -11,7 +11,8 @@ env:
 
 jobs:
   build:
-    runs-on: macos-latest
+    # Should use macos-latest, but python 3.8 is no more available from macos-14
+    runs-on: macos-13
     strategy:
       max-parallel: 4
       matrix:

diff --git a/src/Alpha_complex/include/gudhi/Alpha_complex.h b/src/Alpha_complex/include/gudhi/Alpha_complex.h
@@ -45,6 +45,7 @@
 #include <stdexcept>
 #include <numeric>  // for std::iota
 #include <algorithm>  // for std::sort
+#include <type_traits>  // for std::is_same_v
 
 // Make compilation fail - required for external projects - https://github.com/GUDHI/gudhi-devel/issues/10
 #if CGAL_VERSION_NR < 1041101000
@@ -109,10 +110,15 @@ class Alpha_complex {
   /** \brief Geometric traits class that provides the geometric types and predicates needed by the triangulations.*/
   using Geom_traits = std::conditional_t<Weighted, CGAL::Regular_triangulation_traits_adapter<Kernel>, Kernel>;
 
+  // CGAL::Triangulation_ds_full_cell<void, CGAL::TDS_full_cell_mirror_storage_policy> has been enhanced for CGAL >= 6.0
+  // But faster only with static dimensions
+  using Triangulation_full_cell = std::conditional_t<std::is_same_v<typename Kernel::Dimension, CGAL::Dynamic_dimension_tag>,
+                                                     CGAL::Triangulation_ds_full_cell<>,
+                                                     CGAL::Triangulation_ds_full_cell<void, CGAL::TDS_full_cell_mirror_storage_policy>>;
   // Add an int in TDS to save point index in the structure
   using TDS = CGAL::Triangulation_data_structure<typename Geom_traits::Dimension,
                                                  CGAL::Triangulation_vertex<Geom_traits, Internal_vertex_handle>,
-                                                 CGAL::Triangulation_full_cell<Geom_traits> >;
+                                                 Triangulation_full_cell >;
 
   /** \brief A (Weighted or not) Delaunay triangulation of a set of points in \f$ \mathbb{R}^D\f$.*/
   using Triangulation = std::conditional_t<Weighted, CGAL::Regular_triangulation<Kernel, TDS>,

diff --git a/src/common/doc/footer.html b/src/common/doc/footer.html
@@ -10,7 +10,6 @@
 <!--BEGIN PROJECT_NAME--> $projectname
 <!--BEGIN PROJECT_NUMBER-->&#160;Version $projectnumber<!--END PROJECT_NUMBER-->
 <!--BEGIN PROJECT_BRIEF-->&#160;-&#160;$projectbrief<!--END PROJECT_BRIEF-->
-<!--BEGIN PROJECT_BRIEF-->&#160;-&#160;Copyright : MIT<!--END PROJECT_BRIEF-->
 <!--END PROJECT_NAME-->
       </td>
       <td class="network-entypo">

diff --git a/src/common/doc/main_page.md b/src/common/doc/main_page.md
@@ -19,7 +19,7 @@
     <td width="15%">
       <b>Author:</b> Pawel Dlotko<br>
       <b>Introduced in:</b> GUDHI 1.3.0<br>
-      <b>Copyright:</b> MIT<br>
+      <b>License:</b> MIT<br>
     </td>
   </tr>
   <tr>
@@ -45,7 +45,7 @@
     <td width="15%">
       <b>Author:</b> Cl&eacute;ment Maria<br>
       <b>Introduced in:</b> GUDHI 1.0.0<br>
-      <b>Copyright:</b> MIT<br>
+      <b>License:</b> MIT<br>
     </td>
   </tr>
   <tr>
@@ -70,7 +70,7 @@
     <td width="15%">
       <b>Author:</b> Fran&ccedil;ois Godi<br>
       <b>Introduced in:</b> GUDHI 2.1.0<br>
-      <b>Copyright:</b> MIT<br>
+      <b>License:</b> MIT<br>
     </td>
   </tr>
   <tr>
@@ -98,7 +98,7 @@
     <td width="15%">
       <b>Author:</b> David Salinas<br>
       <b>Introduced in:</b> GUDHI 1.1.0<br>
-      <b>Copyright:</b> MIT<br>
+      <b>License:</b> MIT<br>
     </td>
   </tr>
   <tr>
@@ -124,7 +124,7 @@
     <td width="15%">
       <b>Author:</b> David Salinas<br>
       <b>Introduced in:</b> GUDHI 1.1.0<br>
-      <b>Copyright:</b> MIT [(LGPL v3)](../../licensing/)<br>
+      <b>License:</b> MIT [(LGPL v3)](../../licensing/)<br>
       <b>Requires:</b> \ref cgal &ge; 4.11.0
     </td>
   </tr>
@@ -155,7 +155,7 @@
     <td width="15%">
       <b>Author:</b> Vincent Rouvreau<br>
       <b>Introduced in:</b> GUDHI 1.3.0<br>
-      <b>Copyright:</b> MIT [(GPL v3)](../../licensing/)<br>
+      <b>License:</b> MIT [(GPL v3)](../../licensing/)<br>
       <b>Requires:</b> \ref eigen &ge; 3.1.0 and \ref cgal &ge; 4.11.0
     </td>
   </tr>
@@ -180,7 +180,7 @@
     <td width="15%">
       <b>Author:</b> Vincent Rouvreau, Hind Montassif<br>
       <b>Introduced in:</b> GUDHI 2.2.0<br>
-      <b>Copyright:</b> MIT [(LGPL v3)](../../licensing/)<br>
+      <b>License:</b> MIT [(LGPL v3)](../../licensing/)<br>
       <b>Requires:</b> \ref cgal
     </td>
   </tr>
@@ -207,7 +207,7 @@
     <td width="15%">
       <b>Author:</b> Cl&eacute;ment Maria, Pawel Dlotko, Vincent Rouvreau, Marc Glisse<br>
       <b>Introduced in:</b> GUDHI 2.0.0<br>
-      <b>Copyright:</b> MIT<br>
+      <b>License:</b> MIT<br>
     </td>
   </tr>
   <tr>
@@ -236,7 +236,7 @@
     <td width="15%">
       <b>Author:</b> Siddharth Pritam, Marc Glisse<br>
       <b>Introduced in:</b> GUDHI 3.3.0<br>
-      <b>Copyright:</b> MIT
+      <b>License:</b> MIT
     </td>
   </tr>
   <tr>
@@ -260,7 +260,7 @@
     <td width="15%">
       <b>Author:</b> Siargey Kachanovich<br>
       <b>Introduced in:</b> GUDHI 1.3.0<br>
-      <b>Copyright:</b> MIT ([GPL v3](../../licensing/) for Euclidean version)<br>
+      <b>License:</b> MIT ([GPL v3](../../licensing/) for Euclidean version)<br>
       <b>Euclidean version requires:</b> \ref eigen &ge; 3.1.0 and \ref cgal &ge; 4.11.0
     </td>
   </tr>
@@ -286,7 +286,7 @@
     <td width="15%">
       <b>Author:</b> Mathieu Carri&egrave;re<br>
       <b>Introduced in:</b> GUDHI 2.1.0<br>
-      <b>Copyright:</b> MIT [(GPL v3)](../../licensing/)<br>
+      <b>License:</b> MIT [(GPL v3)](../../licensing/)<br>
       <b>Requires:</b> \ref cgal &ge; 4.11.0
     </td>
   </tr>
@@ -312,7 +312,7 @@
     <td width="15%">
       <b>Author:</b> Siargey Kachanovich<br>
       <b>Introduced in:</b> GUDHI 3.4.0<br>
-      <b>Copyright:</b> MIT [(LGPL v3)](../../licensing/)<br>
+      <b>License:</b> MIT [(LGPL v3)](../../licensing/)<br>
       <b>Requires:</b> \ref eigen &ge; 3.1.0
     </td>
   </tr>
@@ -340,7 +340,7 @@
     <td width="15%">
       <b>Author:</b> Cl&eacute;ment Jamin<br>
       <b>Introduced in:</b> GUDHI 2.0.0<br>
-      <b>Copyright:</b> MIT [(GPL v3)](../../licensing/)<br>
+      <b>License:</b> MIT [(GPL v3)](../../licensing/)<br>
       <b>Requires:</b> \ref eigen &ge; 3.1.0 and \ref cgal &ge; 4.11.0
     </td>
   </tr>
@@ -373,7 +373,7 @@
     <td width="15%">
       <b>Author:</b> Cl&eacute;ment Maria<br>
       <b>Introduced in:</b> GUDHI 1.0.0<br>
-      <b>Copyright:</b> MIT<br>
+      <b>License:</b> MIT<br>
     </td>
   </tr>
   <tr>
@@ -428,7 +428,7 @@
     <td width="15%">
       <b>Author:</b> Fran&ccedil;ois Godi<br>
       <b>Introduced in:</b> GUDHI 2.0.0<br>
-      <b>Copyright:</b> MIT [(GPL v3)](../../licensing/)<br>
+      <b>License:</b> MIT [(GPL v3)](../../licensing/)<br>
       <b>Requires:</b> \ref cgal &ge; 4.11.0
     </td>
   </tr>
@@ -454,7 +454,7 @@
     <td width="15%">
       <b>Author:</b> Pawel Dlotko<br>
       <b>Introduced in:</b> GUDHI 2.1.0<br>
-      <b>Copyright:</b> MIT<br>      
+      <b>License:</b> MIT<br>      
     </td>
   </tr>
   <tr>
@@ -477,7 +477,7 @@
     <td width="15%">
       <b>Author:</b>Clément Jamin, Siargey Kachanovich, Marc Glisse<br>
       <b>Introduced in:</b> GUDHI 1.3.0<br>
-      <b>Copyright:</b> MIT [(GPL v3)](../../licensing/)<br>
+      <b>License:</b> MIT [(GPL v3)](../../licensing/)<br>
     </td>
   </tr>
   <tr>

diff --git a/src/python/doc/conf.py b/src/python/doc/conf.py
@@ -31,7 +31,6 @@
 
 # General information about the project.
 project = gudhi.__name__
-copyright = f"{gudhi.__copyright__} - MIT"
 
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the

diff --git a/src/python/setup.py.in b/src/python/setup.py.in
@@ -14,10 +14,6 @@ from Cython.Build import cythonize
 from numpy import get_include as numpy_get_include
 import pybind11
 
-__author__ = "Vincent Rouvreau"
-__copyright__ = "Copyright (C) 2016  Inria"
-__license__ = "MIT"
-
 cython_modules = [@GUDHI_CYTHON_MODULES@]
 pybind11_modules = [@GUDHI_PYBIND11_MODULES@]