Skip to content

Commit

Permalink
enabled cgal (#70)
Browse files Browse the repository at this point in the history
* enabled cgal

* update cgal

* --enable-cgal is incorrect?

* fastjet documentation does not match actual function

* gmp appears to be a harder requirement than thought

* remove mpfr for now...

* swig/autoconf/libtool

* specify swig3

* try older cgal, with more relaxed c++ requirement

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* newer bugfix for CGAL-4

* drop header only

* that's a big nope

* use only the source code - no compiled libs

* zipball

* ah well back to square one

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* order matters?

* add automake

* autoconf/make already included, mpfr related?

* match package basis from CI

awaiting patch from @chrispap95 for manual boost install in wheel (just add it to this branch).
Indeed looking in the CGAL docs it's header only and requires boost 1.66 or later.

* mpfr-devel in wheels

* libmpfr in ci

* try with boost 1.80

* typo

Co-authored-by: Lindsey Gray <lindsey.gray@gmail.com>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Co-authored-by: Chris Papageorgakis <Christos.Papageorgakis@cern.ch>
  • Loading branch information
4 people authored Nov 2, 2022
1 parent 446a707 commit 3d2d3a8
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 3 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ jobs:

- name: Install extra deps on Linux
if: runner.os == 'Linux'
run: sudo apt-get update && sudo apt-get install -y libboost-dev swig autoconf libtool
run: sudo apt-get update && sudo apt-get install -y libboost-dev libmpfr-dev swig autoconf libtool

- name: Install package
run: python -m pip install .[test] -v
Expand Down
5 changes: 4 additions & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -16,5 +16,8 @@ manylinux-i686-image = "manylinux2014"
[tool.cibuildwheel.linux]
before-all = [
"yum update -y",
"yum install -y mpfr-devel boost-devel",
"yum install -y mpfr-devel",
"curl -L https://boostorg.jfrog.io/artifactory/main/release/1.80.0/source/boost_1_80_0.tar.bz2 -o boost_1_80_0.tar.bz2",
"tar --bzip2 -xf boost_1_80_0.tar.bz2",
"mv boost_1_80_0/boost /usr/include/boost",
]
3 changes: 2 additions & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
import setuptools.command.install

CGAL_ZIP = (
"https://github.com/CGAL/cgal/releases/download/v5.2.1/CGAL-5.2.1-library.zip"
"https://github.com/CGAL/cgal/releases/download/v5.5.1/CGAL-5.5.1-library.zip"
)

DIR = pathlib.Path(__file__).parent.resolve()
Expand Down Expand Up @@ -70,6 +70,7 @@ def build_extensions(self):
f"--prefix={OUTPUT}",
"--enable-allcxxplugins",
"--enable-cgal-header-only",
"--enable-cgal",
f"--with-cgaldir={cgal_dir}",
"--enable-swig",
"--enable-pyext",
Expand Down

0 comments on commit 3d2d3a8

Please sign in to comment.