Merge pull request #57 from nschloe/cgal5-second-attempt

add cgal 5 compatibility

Author: nschloe

.circleci/config.yml

@@ -7,20 +7,27 @@ jobs:
     steps:
       - checkout
       - run: pip3 install -U black flake8 --user
-      - run: LC_ALL=C.UTF-8 black --check .
+      - run: black --check .
       - run: flake8 .
   build:
     working_directory: ~/work
     docker:
       - image: circleci/python:3
     steps:
-      - run: sudo apt-get install -y git-lfs libcgal-dev libeigen3-dev python3-pip clang
+      - run: sudo apt-get install -y git-lfs libeigen3-dev clang
+      # install cgal 5 from ppa
+      - run: sudo apt-get install -y software-properties-common
+      - run: sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys ECD154D280FEB8AC
+      - run: sudo apt-add-repository -y ppa:nschloe/cgal-backports
+      - run: sudo apt update
+      - run: sudo apt install -y libcgal-dev
+      #
       - run: pip3 install -U pytest pytest-cov pybind11 lxml --user
       - checkout
       - run: git lfs pull
       # install
-      # Use clang++ for its smaller memory footprint.
-      - run: CC="clang++" pip3 install . --user
+      # Use clang for its smaller memory footprint.
+      - run: CC="clang" pip3 install . --user --verbose
       # The actual test
       - run: 
           command: pytest

.github/workflows/ci.yml

@@ -32,10 +32,16 @@ jobs:
     - name: Install dependencies
       run: |
         sudo apt-get install -y libcgal-dev libeigen3-dev python3-pip clang
+    - name: install cgal-5 from ppa
+      run: |
+        sudo apt-get install -y software-properties-common
+        sudo apt-add-repository -y ppa:nschloe/cgal-backports
+        sudo apt update
+        sudo apt install -y libcgal-dev
     - name: Install package
       run: |
         pip install --upgrade pip
-        pip install .[all]
+        CC="clang" pip install .[all]
         pip install pytest pytest-cov
     - name: Test with pytest
       run: |

CMakeLists.txt

@@ -1,3 +1,5 @@
+# CMake is used for debugging in pygalmesh. Like every other Python package, the
+# production build system is setuptools.
 cmake_minimum_required(VERSION 3.0)
 
 project(pygalmesh CXX)

pygalmesh/__about__.py

@@ -2,7 +2,7 @@
 __author_email__ = "nico.schloemer@gmail.com"
 __copyright__ = "Copyright (C) 2016-2019 {} <{}>".format(__author__, __author_email__)
 __license__ = "License :: OSI Approved :: MIT License"
-__version__ = "0.4.0"
-__maintainer__ = u"Nico Schlömer"
+__version__ = "0.5.0"
+__maintainer__ = "Nico Schlömer"
 __status__ = "Development Status :: 4 - Beta"
 __url__ = "https://github.com/nschloe/pygalmesh"

setup.py

@@ -48,8 +48,8 @@ def read(fname):
             get_pybind_include(),
             get_pybind_include(user=True),
         ],
-        # CGAL_ImageIO for generate_from_inr
-        libraries=["CGAL", "CGAL_ImageIO", "gmp", "mpfr"],
+        # no CGAL libraries necessary from CGAL 5.0 onwards
+        libraries=["stdc++", "gmp", "mpfr"],
     )
 ]
 

src/generate.cpp

@@ -118,32 +118,6 @@ generate_mesh(
   return;
 }
 
-// same but with sizing field in cell_size
-// It'd be nice if we could replace this clumsy class by a simple function wrapper (like
-// domain), but CGAL expects the type FT to be present. :(
-// https://github.com/CGAL/cgal/issues/4146
-class Sizing_field_wrapper
-{
-  public:
-    typedef K::FT FT;
-
-    Sizing_field_wrapper(const std::shared_ptr<pygalmesh::SizingFieldBase> & cell_size):
-      cell_size_(cell_size)
-    {
-    }
-
-    virtual ~Sizing_field_wrapper() = default;
-
-    K::FT operator()(const K::Point_3& p, const int, const Mesh_domain::Index&) const
-    {
-      auto out = cell_size_->eval({p.x(), p.y(), p.z()});
-      return out;
-    }
-
-  private:
-     const std::shared_ptr<pygalmesh::SizingFieldBase> & cell_size_;
-};
-
 void
 generate_with_sizing_field(
     const std::shared_ptr<pygalmesh::DomainBase> & domain,
@@ -193,7 +167,9 @@ generate_with_sizing_field(
     std::cerr.setstate(std::ios_base::failbit);
   }
   if (cell_size) {
-    Sizing_field_wrapper size(cell_size);
+    const auto size = [&](K::Point_3 p, const int, const Mesh_domain::Index&) {
+        return cell_size->eval({p.x(), p.y(), p.z()});
+    };
     auto criteria = Mesh_criteria(
         CGAL::parameters::edge_size=edge_size,
         CGAL::parameters::facet_angle=facet_angle,