build: use cmake build system in fastjet and fastjet-contrib

.github/workflows/ci.yml

@@ -48,11 +48,13 @@ jobs:
       - name: Install compiler tools on macOS
         if: runner.os == 'macOS'
         run: |
-          brew install make automake swig gmp mpfr boost libtool
+          brew install make automake swig gmp mpfr boost libtool cgal
+          brew reinstall gfortran
+          which gfortran
 
       - name: Install extra deps on Linux
         if: runner.os == 'Linux'
-        run: sudo apt-get update && sudo apt-get install -y libboost-dev libmpfr-dev swig autoconf libtool
+        run: sudo apt-get update && sudo apt-get install -y libboost-dev libmpfr-dev swig autoconf libtool libcgal-dev
 
       - name: Install package (MacOS)
         if: runner.os == 'macOS'

.gitmodules

@@ -1,6 +1,6 @@
 [submodule "fastjet"]
 	path = extern/fastjet-core
-	url = https://gitlab.com/fastjet/fastjet.git
+	url = https://gitlab.com/lgray1/fastjet.git
 [submodule "fastjet-contrib"]
 	path = extern/fastjet-contrib
-	url = https://github.com/cms-externals/fastjet-contrib.git
+	url = https://github.com/lgray/fastjet-contrib.git

CMakeLists.txt

@@ -0,0 +1,48 @@
+cmake_minimum_required(VERSION 3.11)
+
+if(NOT SKBUILD_PROJECT_VERSION)
+  set(SKBUILD_PROJECT_VERSION "0.0.0")  # provided by scikit-build-core
+endif()
+string(REPLACE "." ";" VERSION_SPLIT ${SKBUILD_PROJECT_VERSION})
+list(GET VERSION_SPLIT 0 SPLIT_VERSION_MAJOR)
+list(GET VERSION_SPLIT 1 SPLIT_VERSION_MINOR)
+
+project(fastjet VERSION ${SPLIT_VERSION_MAJOR}.${SPLIT_VERSION_MINOR} LANGUAGES CXX)
+
+set(PKG_INSTALL "fastjet") ## python package name
+
+include(FetchContent)
+
+find_package(pybind11 REQUIRED)
+
+find_package(CGAL)
+if (NOT CGAL_FOUND)
+  FetchContent_Declare(CGAL
+    GIT_REPOSITORY https://github.com/CGAL/cgal.git
+    GIT_TAG  v6.0.1
+  )
+  FetchContent_MakeAvailable(CGAL)
+endif()
+
+#FetchContent_Declare(fastjet
+#    SOURCE_DIR ${CMAKE_SOURCE_DIR}/extern/fastjet-core
+#    CMAKE_ARGS "-DCMAKE_BUILD_TYPE=\"Release\" -DCMAKE_INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX}/${PKG_INSTALL} -DFASTJET_CUSTOM_PYTHON_INSTALL=lib/${PKG_INSTALL} -DFASTJET_PYTHON_PACKAGE_NAME=_swig -DFASTJET_ENABLE_CGAL=ON"
+#  )
+#FetchContent_MakeAvailable(fastjet)
+
+add_subdirectory(${CMAKE_SOURCE_DIR}/extern/fastjet-core)
+add_subdirectory(${CMAKE_SOURCE_DIR}/extern/fastjet-contrib)
+
+pybind11_add_module(_ext MODULE src/_ext.cpp)
+target_link_libraries(_ext PRIVATE fastjet::fastjet)
+target_link_libraries(_ext PRIVATE EnergyCorrelator LundPlane Nsubjettiness RecursiveTools)
+target_include_directories(_ext PRIVATE ${CMAKE_BINARY_DIR}/include)
+#set_target_properties(_ext PROPERTIES BUILD_WITH_INSTALL_RPATH TRUE)
+#set_target_properties(_ext PROPERTIES INSTALL_RPATH_USE_LINK_PATH TRUE)
+if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
+  set_target_properties(_ext PROPERTIES INSTALL_RPATH "@loader_path/lib")
+else()
+  set_target_properties(_ext PROPERTIES INSTALL_RPATH "$ORIGIN/lib")
+endif()
+
+install(TARGETS _ext LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX})

MANIFEST.in

@@ -2,5 +2,5 @@ graft src
 graft tests
 graft extern
 global-exclude .git .gitmodules
-include LICENSE README.md pyproject.toml setup.py setup.cfg patch_clustersequence.txt
+include LICENSE README.md pyproject.toml setup.py setup.cfg patch_clustersequence.txt CMakeLists.txt
 exclude .cirrus.yml

pyproject.toml

@@ -1,10 +1,21 @@
 [build-system]
 requires = [
-    "setuptools>=42",
-    "setuptools_scm[toml]>=3.4",
-    "pybind11>=2.12.0",
+  "setuptools_scm[toml]>=3.4",
+  "pybind11>=2.6.1",
+  "scikit-build-core>=0.8",
 ]
-build-backend = "setuptools.build_meta"
+build-backend = "scikit_build_core.build"
+
+[project]
+name = "fastjet"
+dynamic = ["version"]
+requires-python = ">=3.9"
+dependencies = [
+  "awkward>=2",
+  "numpy>=1.13.3",
+  "vector"
+]
+
 
 [tool.cibuildwheel]
 skip = "pp*"
@@ -23,3 +34,20 @@ before-all = [
 ]
 # Skip musllinux builds for the moment
 skip = "*-musllinux_*"
+
+[tool.scikit-build]
+metadata.version.provider = "scikit_build_core.metadata.setuptools_scm"
+cmake.version = ">=3.11.0"
+sdist.include = ["src/fastjet/version.py"]
+wheel.install-dir = "fastjet"
+
+[tool.scikit-build.cmake.define]
+FASTJET_ENABLE_PYTHON = "ON"
+FASTJET_ENABLE_CGAL = "ON"
+FASTJET_PYTHON_PACKAGE_NAME = "_swig"
+FASTJET_CUSTOM_PYTHON_INSTALL = "./"
+CMAKE_BUILD_TYPE = "Release"
+CMAKE_INSTALL_RPATH = "$ORIGIN/lib"
+
+[tool.setuptools_scm]
+write_to = "src/fastjet/version.py"

setup.py

@@ -181,7 +181,7 @@ def run(self):
         )
 
         shutil.copyfile(pythondir / "fastjet.py", fastjetdir / "_swig.py")
-        shutil.copyfile(pyexecdir / "_fastjet.so", fastjetdir / "_fastjet.so")
+        shutil.copyfile(pyexecdir / "_fastjet_swig.so", fastjetdir / "_fastjet_swig.so")
 
         setuptools.command.install.install.run(self)