Switch to scikit-build core

Author: inducer

CMakeLists.txt

@@ -15,6 +15,152 @@ execute_process(
 list(APPEND CMAKE_PREFIX_PATH "${NB_DIR}")
 find_package(nanobind CONFIG REQUIRED)
 
+option(USE_SHIPPED_ISL "Use shipped ISL" 1)
+option(USE_SHIPPED_IMATH "Use shipped IMATH" 1)
+option(USE_IMATH_FOR_MP "Use IMATH for multiprecision arithmetic" 1)
+option(USE_IMATH_SIO "Use IMATH small-integer optimization" 1)
+option(USE_GMP_FOR_MP "Use GMP" 0)
+option(USE_BARVINOK "Use Barvinok (beware of GPL license)" 0)
+
+if(USE_SHIPPED_ISL)
+    if(USE_BARVINOK)
+        message(FATAL_ERROR "Using barvinok is not compatible with shipped ISL")
+    endif()
+    set(ISL_SOURCES
+        isl/isl_schedule.c
+        isl/isl_ast_build_expr.c
+        isl/isl_sample.c
+        isl/isl_coalesce.c
+        isl/isl_fold.c
+        isl/isl_schedule_read.c
+        isl/isl_aff_map.c
+        isl/isl_scheduler_clustering.c
+        isl/isl_flow.c
+        isl/isl_map_subtract.c
+        isl/uset_to_umap.c
+        isl/isl_hash.c
+        isl/isl_aff.c
+        isl/isl_transitive_closure.c
+        isl/isl_map_simplify.c
+        isl/print.c
+        isl/basis_reduction_tab.c
+        isl/isl_schedule_constraints.c
+        isl/isl_sort.c
+        isl/isl_ast.c
+        isl/bset_to_bmap.c
+        isl/bset_from_bmap.c
+        isl/isl_schedule_band.c
+        isl/isl_bernstein.c
+        isl/uset_from_umap.c
+        isl/isl_scheduler.c
+        isl/isl_set_to_ast_graft_list.c
+        isl/isl_convex_hull.c
+        isl/isl_schedule_tree.c
+        isl/isl_tarjan.c
+        isl/isl_equalities.c
+        isl/isl_constraint.c
+        isl/isl_union_map.c
+        isl/isl_bound.c
+        isl/isl_stride.c
+        isl/set_list_from_map_list_inl.c
+        isl/isl_farkas.c
+        isl/isl_tab_pip.c
+        isl/set_to_map.c
+        isl/set_from_map.c
+        isl/isl_lp.c
+        isl/isl_ffs.c
+        isl/isl_id_to_ast_expr.c
+        isl/isl_val.c
+        isl/isl_set_list.c
+        isl/isl_space.c
+        isl/isl_tab.c
+        isl/isl_map.c
+        isl/isl_version.c
+        isl/isl_stream.c
+        isl/isl_local_space.c
+        isl/isl_id_to_pw_aff.c
+        isl/isl_ilp.c
+        isl/isl_range.c
+        isl/isl_point.c
+        isl/isl_schedule_node.c
+        isl/isl_polynomial.c
+        isl/isl_options.c
+        isl/isl_morph.c
+        isl/isl_deprecated.c
+        isl/isl_ctx.c
+        isl/isl_seq.c
+        isl/isl_box.c
+        isl/isl_output.c
+        isl/isl_factorization.c
+        isl/isl_printer.c
+        isl/dep.c
+        isl/isl_id_to_id.c
+        isl/isl_ast_build.c
+        isl/isl_ast_codegen.c
+        isl/isl_obj.c
+        isl/isl_scheduler_scc.c
+        isl/isl_vec.c
+        isl/isl_map_list.c
+        isl/isl_vertices.c
+        isl/isl_arg.c
+        isl/isl_mat.c
+        isl/isl_id.c
+        isl/isl_affine_hull.c
+        isl/isl_scan.c
+        isl/isl_map_to_basic_set.c
+        isl/isl_blk.c
+        isl/isl_dim_map.c
+        isl/isl_local.c
+        isl/isl_reordering.c
+        isl/isl_ast_graft.c
+        isl/isl_input.c
+    )
+    set(ISL_INC_DIRS isl-supplementary isl/include isl)
+    if(USE_IMATH_FOR_MP)
+        if(USE_SHIPPED_IMATH)
+            list(APPEND ISL_SOURCES
+                isl/isl_imath.c
+                isl/imath/imath.c
+                isl/imath/imrat.c
+                isl/imath/gmp_compat.c
+            )
+            list(APPEND ISL_INC_DIRS isl/imath)
+        endif()
+        if(USE_IMATH_SIO)
+            list(APPEND ISL_SOURCES
+                isl/isl_int_sioimath.c
+                isl/isl_val_sioimath.c
+            )
+        endif()
+    endif()
+else()
+    set(ISL_SOURCES)
+endif()
+
+set(ISLPY_GENERATED_SOURCE
+    ${CMAKE_BINARY_DIR}/generated/gen-expose-part1.inc
+    ${CMAKE_BINARY_DIR}/generated/gen-expose-part2.inc
+    ${CMAKE_BINARY_DIR}/generated/gen-expose-part3.inc
+    ${CMAKE_BINARY_DIR}/generated/gen-wrap-part1.inc
+    ${CMAKE_BINARY_DIR}/generated/gen-wrap-part2.inc
+    ${CMAKE_BINARY_DIR}/generated/gen-wrap-part3.inc
+)
+
+if(USE_BARVINOK)
+    set(ISLPY_GENERATION_FLAGS -b)
+else()
+    set(ISLPY_GENERATION_FLAGS)
+endif()
+
+add_custom_command(
+    OUTPUT ${ISLPY_GENERATED_SOURCE}
+    COMMAND ${Python_EXECUTABLE} ${CMAKE_SOURCE_DIR}/gen_wrap.py
+        -o ${CMAKE_BINARY_DIR}/generated
+        -I ${CMAKE_SOURCE_DIR}
+        -I ${CMAKE_SOURCE_DIR}/isl/include
+        ${ISLPY_GENERATION_FLAGS}
+)
+
 nanobind_add_module(
     _isl
     NB_STATIC # Build static libnanobind (the extension module itself remains a shared library)
@@ -25,7 +171,9 @@ nanobind_add_module(
     src/wrapper/wrap_isl_part2.cpp
     src/wrapper/wrap_isl_part3.cpp
     ${ISL_SOURCES}
+    ${ISLPY_GENERATED_SOURCE}
 )
+target_include_directories(_isl PRIVATE ${CMAKE_BINARY_DIR}/generated)
 
 # Work around https://github.com/inducer/islpy/issues/120.
 # See https://stackoverflow.com/questions/43554227/extern-inline-func-results-in-undefined-reference-error
@@ -54,12 +202,12 @@ endif()
 target_include_directories(_isl PRIVATE ${ISL_INC_DIRS})
 
 if(USE_SHIPPED_ISL)
-    target_compile_definitions(_isl PRIVATE GIT_HEAD_ID="${ISL_GIT_HEAD_ID}")
+    target_compile_definitions(_isl PRIVATE GIT_HEAD_ID="included-with-islpy")
 else()
     target_link_directories(_isl PRIVATE ${ISL_LIB_DIRS})
     target_link_libraries(_isl PRIVATE ${ISL_LIB_NAMES})
 endif()
 
-install(TARGETS _isl LIBRARY DESTINATION .)
+install(TARGETS _isl LIBRARY DESTINATION islpy)
 
 # vim: sw=2

gen_wrap.py

@@ -20,7 +20,9 @@
 THE SOFTWARE.
 """
 
+import argparse
 import os
+from pathlib import Path
 import re
 import sys
 from collections.abc import Mapping, Sequence
@@ -1530,8 +1532,19 @@ def my_ismethod(method):
     expf.write("\n// }}}\n\n")
 
 
-def gen_wrapper(include_dirs, include_barvinok=False, isl_version=None):
-    fdata = FunctionData([".", *include_dirs])
+def gen_wrapper(include_dirs: Sequence[str],
+                *,
+                output_dir: str | None = None,
+                include_barvinok: bool = False,
+                isl_version: int | None = None
+            ):
+    if output_dir is None:
+        output_path = Path(".")
+    else:
+        output_path = Path(output_dir)
+    output_path.mkdir(exist_ok=True)
+
+    fdata = FunctionData(include_dirs)
     fdata.read_header("isl/ctx.h")
     fdata.read_header("isl/id.h")
     fdata.read_header("isl/space.h")
@@ -1564,8 +1577,8 @@ def gen_wrapper(include_dirs, include_barvinok=False, isl_version=None):
         fdata.read_header("barvinok/isl.h")
 
     for part, classes in PART_TO_CLASSES.items():
-        expf = open(f"src/wrapper/gen-expose-{part}.inc", "w")
-        wrapf = open(f"src/wrapper/gen-wrap-{part}.inc", "w")
+        expf = open(output_path / f"gen-expose-{part}.inc", "w")
+        wrapf = open(output_path / f"gen-wrap-{part}.inc", "w")
 
         classes = [
                 cls
@@ -1616,8 +1629,23 @@ def gen_wrapper(include_dirs, include_barvinok=False, isl_version=None):
         wrapf.close()
 
 
+def main():
+    parser = argparse.ArgumentParser()
+    parser.add_argument("-I", "--include-dir", nargs="*", default=[".", "isl/include"])
+    parser.add_argument("-o", "--output-dir", default=".")
+    parser.add_argument("--barvinok", action="store_true")
+    parser.add_argument("--isl-version", type=int)
+
+    args = parser.parse_args()
+
+    gen_wrapper(args.include_dir,
+                output_dir=args.output_dir,
+                include_barvinok=args.barvinok,
+                isl_version=args.isl_version,
+            )
+
+
 if __name__ == "__main__":
-    from os.path import expanduser
-    gen_wrapper([expanduser("isl/include")])
+    main()
 
 # vim: foldmethod=marker

islpy/version.py

@@ -1,2 +1,11 @@
-VERSION = (2025, 1, 5)
-VERSION_TEXT = ".".join(str(i) for i in VERSION)
+from __future__ import annotations
+
+import re
+from importlib import metadata
+
+
+VERSION_TEXT = metadata.version("islpy")
+_match = re.match(r"^([0-9.]+)([a-z0-9]*?)$", VERSION_TEXT)
+assert _match is not None
+VERSION_STATUS = _match.group(2)
+VERSION = tuple(int(nr) for nr in _match.group(1).split("."))

pyproject.toml

@@ -1,26 +1,56 @@
 [build-system]
+build-backend = "scikit_build_core.build"
 requires = [
-    # setuptools >= 64 breaks editable builds:
-    # https://github.com/scikit-build/scikit-build/pull/737#issuecomment-1215573830
-    # setuptools < 64 is incompatible with Python 3.12.
-    # So: no editable builds on Python 3.12, for now.
-    "setuptools>=42,<64;python_version<'3.12'",
-    "setuptools>=64;python_version>='3.12'",
-
-    "wheel>=0.34.2",
-    "scikit-build",
-    "nanobind>=1.3",
+    "scikit-build-core >=0.9.3",
+    "nanobind >=1.9.2",
     "pcpp",
+]
+
+[project]
+name = "islpy"
+version = "2025.2"
+description = "Wrapper around isl, an integer set library"
+readme = "README.rst"
+license = "MIT"
+authors = [
+    { name = "Andreas Kloeckner", email = "[email protected]" },
+]
+requires-python = "~=3.10"
+
+classifiers = [
+  "Development Status :: 4 - Beta",
+  "Intended Audience :: Developers",
+  "Intended Audience :: Other Audience",
+  "Intended Audience :: Science/Research",
+  "Programming Language :: C++",
+  "Programming Language :: Python",
+  "Programming Language :: Python :: 3",
+  "Topic :: Scientific/Engineering",
+  "Topic :: Scientific/Engineering :: Mathematics",
+  "Topic :: Scientific/Engineering :: Physics",
+  "Topic :: Scientific/Engineering :: Visualization",
+  "Topic :: Software Development :: Libraries",
+]
 
-    # Added dynamically in setup.py if needed
-    # "cmake>=3.18",
-    # "ninja",
+[project.urls]
+Documentation = "https://documen.tician.de/islpy"
+Repository = "https://github.com/inducer/islpy"
+
+
+[dependency-groups]
+dev = [
+    "pytest>=2",
 ]
-build-backend = "setuptools.build_meta"
 
 [tool.inducer-ci-support]
 disable-editable-pip-install = true
 
+[tool.scikit-build]
+sdist.exclude = [
+    ".github",
+    "run-*.sh",
+]
+
 [tool.ruff]
 preview = true
 exclude = [