islpy 2023.2.4__tar.gz → 2024.1__tar.gz

{islpy-2023.2.4 → islpy-2024.1}/CITATION.cff

@@ -30,3 +30,4 @@ version: 2022.1.2
 doi: 10.5281/zenodo.6345184
 date-released: 2022-03-10
 url: "https://github.com/inducer/islpy"
+license: MIT

{islpy-2023.2.4 → islpy-2024.1}/CMakeLists.txt

@@ -53,7 +53,9 @@ endif()
 
 target_include_directories(_isl PRIVATE ${ISL_INC_DIRS})
 
-if(NOT USE_SHIPPED_ISL)
+if(USE_SHIPPED_ISL)
+  target_compile_definitions(_isl PRIVATE GIT_HEAD_ID="${ISL_GIT_HEAD_ID}")
+else()
   target_link_directories(_isl PRIVATE ${ISL_LIB_DIRS})
   target_link_libraries(_isl PRIVATE ${ISL_LIB_NAMES})
 endif()

{islpy-2023.2.4 → islpy-2024.1}/MANIFEST.in

@@ -1,3 +1,4 @@
+include isl/*.ac
 include isl/*.c
 include isl/*.h
 include isl/imath/*.c

{islpy-2023.2.4 → islpy-2024.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: islpy
-Version: 2023.2.4
+Version: 2024.1
 Summary: Wrapper around isl, an integer set library
 Home-page: http://documen.tician.de/islpy
 Author: Andreas Kloeckner

{islpy-2023.2.4 → islpy-2024.1}/aksetup_helper.py

@@ -43,14 +43,21 @@ def setup(*args, **kwargs):
 
 
 def get_numpy_incpath():
-    from os.path import join, dirname
+    from os.path import join, dirname, exists
     from importlib.util import find_spec
     origin = find_spec("numpy").origin
     if origin is None:
         raise RuntimeError("origin of numpy package not found")
 
     pathname = dirname(origin)
-    return join(pathname, "core", "include")
+    for p in [
+        join(pathname, "_core", "include"),  # numpy 2 onward
+        join(pathname, "core", "include"),  # numpy prior to 2
+    ]:
+        if exists(join(p, "numpy", "arrayobject.h")):
+            return p
+
+    raise RuntimeError("no valid path for numpy found")
 
 
 class NumpyExtension(Extension):

{islpy-2023.2.4 → islpy-2024.1}/doc/reference.rst

@@ -69,6 +69,13 @@ Called with          Argument Type
 
 as well as casts contained in the transitive closure of this 'casting graph'.
 
+Version Info
+------------
+
+.. data:: version
+
+.. function:: isl_version
+
 Error Reporting
 ---------------
 

islpy-2024.1/isl/configure.ac

@@ -0,0 +1,147 @@
+AC_INIT([isl], [0.26], [isl-development@googlegroups.com])
+AC_CONFIG_AUX_DIR([.])
+AC_CONFIG_MACRO_DIR([m4])
+AM_INIT_AUTOMAKE([foreign])
+m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])])
+AC_SUBST(versioninfo)
+versioninfo=26:0:3
+
+if test "x$prefix" != "xNONE"; then
+	prefix_wd=`cd $prefix && pwd`
+	srcdir_wd=`cd $srcdir && pwd`
+	wd=`pwd`
+	if test "x$prefix_wd" = "x$srcdir_wd"; then
+		AC_MSG_ERROR(Installation in source directory not supported)
+	fi
+	if test "x$prefix_wd" = "x$wd"; then
+		AC_MSG_ERROR(Installation in build directory not supported)
+	fi
+fi
+
+AC_PROG_CC
+AC_PROG_CXX
+AX_PROG_CC_FOR_BUILD
+
+AX_CC_MAXOPT
+AX_GCC_WARN_UNUSED_RESULT
+AX_C___ATTRIBUTE__
+
+AX_CXX_COMPILE_STDCXX_11_NO_OVERRIDE
+AX_CXX_COMPILE_STDCXX_17([], [optional])
+
+AC_PROG_GREP
+LT_INIT
+AC_PROG_SED
+AM_PATH_PYTHON([3.6], [], [:])
+AM_CONDITIONAL([HAVE_PYTHON], [test "$PYTHON" != :])
+
+AC_CHECK_PROG(CYGPATH, cygpath, cygpath, [])
+AC_CHECK_PROG(PERL, perl, perl, [])
+AC_CHECK_PROG(PDFLATEX, pdflatex, pdflatex, [])
+AC_CHECK_PROG(POD2HTML, pod2html, pod2html, [])
+
+AC_SUBST(OS_SRCDIR)
+if test "$host_os" = "mingw32" -a -n "$CYGPATH"; then
+	OS_SRCDIR=`$CYGPATH -m "$srcdir"`
+else
+	OS_SRCDIR="$srcdir"
+fi
+
+AM_CONDITIONAL(GENERATE_DOC, test -n "$PERL" -a -n "$PDFLATEX" -a -n "$POD2HTML")
+
+AX_CREATE_STDINT_H(include/isl/stdint.h)
+
+AC_ARG_WITH([int],
+	    [AS_HELP_STRING([--with-int=gmp|imath|imath-32],
+			    [Which package to use to represent
+				multi-precision integers [default=gmp]])],
+	    [], [with_int=gmp])
+case "$with_int" in
+gmp|imath|imath-32)
+	;;
+*)
+	AC_MSG_ERROR(
+	    [bad value ${withval} for --with-int (use gmp, imath or imath-32)])
+esac
+
+AC_SUBST(MP_CPPFLAGS)
+AC_SUBST(MP_CFLAGS)
+AC_SUBST(MP_LDFLAGS)
+AC_SUBST(MP_LIBS)
+case "$with_int" in
+gmp)
+	AX_DETECT_GMP
+	;;
+imath|imath-32)
+	AX_DETECT_IMATH
+	;;
+esac
+if test "x$with_int" = "ximath-32" -a "x$GCC" = "xyes"; then
+	MP_CFLAGS="-std=gnu99 $MP_CFLAGS"
+fi
+
+AM_CONDITIONAL(IMATH_FOR_MP, test x$with_int = ximath -o x$with_int = ximath-32)
+AM_CONDITIONAL(GMP_FOR_MP, test x$with_int = xgmp)
+
+AM_CONDITIONAL(HAVE_CXX11, test "x$HAVE_CXX11" = "x1")
+AM_CONDITIONAL(HAVE_CXX17, test "x$HAVE_CXX17" = "x1")
+AM_CONDITIONAL(SMALL_INT_OPT, test "x$with_int" = "ximath-32")
+AS_IF([test "x$with_int" = "ximath-32"], [
+	AC_DEFINE([USE_SMALL_INT_OPT], [], [Use small integer optimization])
+])
+
+AC_CHECK_DECLS(ffs,[],[],[#include <strings.h>])
+AC_CHECK_DECLS(__builtin_ffs,[],[],[])
+AC_CHECK_DECLS([_BitScanForward],[],[],[#include <intrin.h>])
+if test "x$ac_cv_have_decl_ffs" = xno -a \
+		"x$ac_cv_have_decl___builtin_ffs" = xno -a \
+		"x$ac_cv_have_decl__BitScanForward" = xno; then
+	AC_MSG_ERROR([No ffs implementation found])
+fi
+AC_CHECK_DECLS([strcasecmp,strncasecmp],[],[],[#include <strings.h>])
+AC_CHECK_DECLS([_stricmp,_strnicmp],[],[],[#include <string.h>])
+if test "x$ac_cv_have_decl_strcasecmp" = xno -a \
+		"x$ac_cv_have_decl__stricmp" = xno; then
+	AC_MSG_ERROR([No strcasecmp implementation found])
+fi
+if test "x$ac_cv_have_decl_strncasecmp" = xno -a \
+		"x$ac_cv_have_decl__strnicmp" = xno; then
+	AC_MSG_ERROR([No strncasecmp implementation found])
+fi
+AC_CHECK_DECLS([snprintf,_snprintf],[],[],[#include <stdio.h>])
+if test "x$ac_cv_have_decl_snprintf" = xno -a \
+		"x$ac_cv_have_decl__snprintf" = xno; then
+	AC_MSG_ERROR([No snprintf implementation found])
+fi
+
+AX_SUBMODULE(clang,system|no,no)
+AM_CONDITIONAL(HAVE_CLANG, test $with_clang = system)
+AM_CONDITIONAL(HAVE_CPP_ISL_H,
+    [(test $with_clang = system -a "x$HAVE_CXX11" = "x1") || \
+     test -f $srcdir/include/isl/cpp.h])
+
+AX_SET_WARNING_FLAGS
+
+AC_SUBST(WARNING_FLAGS)
+
+PACKAGE_CFLAGS="$MP_CPPFLAGS"
+PACKAGE_LDFLAGS="$MP_LDFLAGS"
+PACKAGE_LIBS="-lisl $MP_LIBS"
+AX_CREATE_PKGCONFIG_INFO
+
+AX_DETECT_GIT_HEAD
+
+AH_BOTTOM([#include <isl_config_post.h>])
+AC_CONFIG_HEADERS(isl_config.h)
+AC_CONFIG_FILES(isl_srcdir.c)
+AC_CONFIG_FILES(Makefile)
+AC_CONFIG_FILES(doc/Makefile)
+if test $with_clang = system; then
+	AC_CONFIG_SUBDIRS(interface)
+fi
+AC_CONFIG_FILES([bound_test.sh], [chmod +x bound_test.sh])
+AC_CONFIG_FILES([codegen_test.sh], [chmod +x codegen_test.sh])
+AC_CONFIG_FILES([pip_test.sh], [chmod +x pip_test.sh])
+AC_CONFIG_FILES([flow_test.sh], [chmod +x flow_test.sh])
+AC_CONFIG_FILES([schedule_test.sh], [chmod +x schedule_test.sh])
+AC_OUTPUT

{islpy-2023.2.4 → islpy-2024.1}/islpy/__init__.py

@@ -25,6 +25,8 @@ from typing import Optional, TypeVar, cast, Callable, Any
 import islpy._isl as _isl
 from islpy.version import VERSION, VERSION_TEXT  # noqa
 
+__version__ = VERSION_TEXT
+
 # {{{ copied verbatim from pytools to avoid numpy/pytools dependency
 
 F = TypeVar("F", bound=Callable[..., Any])
@@ -87,6 +89,8 @@ Error = _isl.Error
 
 # {{{ name imports
 
+isl_version = _isl.isl_version
+
 Context = _isl.Context
 IdList = _isl.IdList
 ValList = _isl.ValList

{islpy-2023.2.4 → islpy-2024.1}/islpy/version.py

@@ -1,2 +1,2 @@
-VERSION = (2023, 2, 4)
+VERSION = (2024, 1)
 VERSION_TEXT = ".".join(str(i) for i in VERSION)

{islpy-2023.2.4 → islpy-2024.1}/islpy.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: islpy
-Version: 2023.2.4
+Version: 2024.1
 Summary: Wrapper around isl, an integer set library
 Home-page: http://documen.tician.de/islpy
 Author: Andreas Kloeckner

{islpy-2023.2.4 → islpy-2024.1}/islpy.egg-info/SOURCES.txt

@@ -42,6 +42,7 @@ isl/check_single_reference_templ.c
 isl/check_type_range_templ.c
 isl/closure.c
 isl/codegen.c
+isl/configure.ac
 isl/dep.c
 isl/extract_key.c
 isl/flow.c

{islpy-2023.2.4 → islpy-2024.1}/pyproject.toml

@@ -1,7 +1,3 @@
-[tool.cibuildwheel]
-
-skip = "*-win-* [cp]p3[67]-*"
-
 [build-system]
 requires = [
     # setuptools >= 64 breaks editable builds:
@@ -14,12 +10,23 @@ requires = [
     "wheel>=0.34.2",
     "cmake>=3.18",
     "scikit-build",
-    "nanobind",
+    "nanobind>=1.3",
     "ninja",
     "pcpp",
 ]
 build-backend = "setuptools.build_meta"
 
-# Needed for full C++17 support
+[tool.cibuildwheel]
+# nanobind does not support Py<3.8
+skip = ["*-win-*", "[cp]p3[67]-*"]
+
+[tool.cibuildwheel.linux]
+# i686 does not have enough memory for LTO to complete
+skip = ["[cp]p3[67]-*", "*_i686"]
+
+[tool.cibuildwheel.macos]
+archs = "x86_64 arm64"
+
 [tool.cibuildwheel.macos.environment]
+# Needed for full C++17 support
 MACOSX_DEPLOYMENT_TARGET = "10.14"

{islpy-2023.2.4 → islpy-2024.1}/setup.py

@@ -221,6 +221,15 @@ def main():
         cmake_args.append(f"-DISL_INC_DIRS:LIST={';'.join(isl_inc_dirs)}")
 
         cmake_args.append(f"-DISL_SOURCES:list={';'.join(extra_objects)}")
+
+        with open("isl/configure.ac") as inf:
+            isl_version_line, = [ln for ln in inf
+                                 if ln.strip().startswith("versioninfo")]
+
+        _, isl_version = isl_version_line.strip().split("=")
+        isl_version = isl_version.replace(":", ".")
+
+        cmake_args.append(f"-DISL_GIT_HEAD_ID=isl-{isl_version}-included-with-islpy")
     else:
         if conf["ISL_INC_DIR"]:
             cmake_args.append(f"-DISL_INC_DIRS:LIST="

{islpy-2023.2.4 → islpy-2024.1}/src/wrapper/wrap_isl.cpp

@@ -107,7 +107,9 @@ NB_MODULE(_isl, m)
     .ENUM_VALUE(isl_stat_, ok)
     ;
 
-  py::enum_<isl_dim_type>(m, "dim_type")
+  // Arithmetic (i.e. export numerical values) to ensure that out == set, as on
+  // the C side.
+  py::enum_<isl_dim_type>(m, "dim_type", py::is_arithmetic())
     .ENUM_VALUE(isl_dim_, cst)
     .ENUM_VALUE(isl_dim_, param)
     .value("in_", isl_dim_in)
@@ -181,6 +183,7 @@ NB_MODULE(_isl, m)
     .value("if_", isl_ast_node_if)
     .ENUM_VALUE(isl_ast_node_, block)
     .ENUM_VALUE(isl_ast_node_, user)
+    .ENUM_VALUE(isl_ast_node_, mark)
     ;
 
   py::enum_<isl_ast_loop_type>(m, "ast_loop_type")
@@ -219,6 +222,8 @@ NB_MODULE(_isl, m)
   ADD_MACRO_ATTR(cls_schedule_algorithm, ISL_SCHEDULE_ALGORITHM_, ISL);
   ADD_MACRO_ATTR(cls_schedule_algorithm, ISL_SCHEDULE_ALGORITHM_, FEAUTRIER);
 
+  m.def("isl_version", [] () { return isl_version(); });
+
   islpy_expose_part1(m);
   islpy_expose_part2(m);
   islpy_expose_part3(m);

{islpy-2023.2.4 → islpy-2024.1}/src/wrapper/wrap_isl.hpp

@@ -23,6 +23,7 @@
 #include <isl/ast.h>
 #include <isl/ast_build.h>
 #include <isl/options.h>
+#include <isl/version.h>
 
 #ifdef ISLPY_INCLUDE_BARVINOK
 #include <barvinok/isl.h>

islpy-2023.2.4/isl-supplementary/gitversion.h

@@ -1 +0,0 @@
-#define GIT_HEAD_ID "isl-0.00-0-included-with-islpy"