islpy 2023.2.5__tar.gz → 2024.2__tar.gz

{islpy-2023.2.5 → islpy-2024.2}/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.5 → islpy-2024.2}/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.5 → islpy-2024.2}/MANIFEST.in

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

{islpy-2023.2.5 → islpy-2024.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: islpy
-Version: 2023.2.5
+Version: 2024.2
 Summary: Wrapper around isl, an integer set library
 Home-page: http://documen.tician.de/islpy
 Author: Andreas Kloeckner
@@ -23,7 +23,6 @@ Classifier: Topic :: Scientific/Engineering :: Visualization
 Classifier: Topic :: Software Development :: Libraries
 Requires-Python: ~=3.8
 Provides-Extra: test
-License-File: doc/misc.rst
 
 islpy: Polyhedral Analysis from Python
 ======================================

{islpy-2023.2.5 → islpy-2024.2}/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.5 → islpy-2024.2}/configure.py

@@ -1,4 +1,6 @@
 #! /usr/bin/env python3
 
 from aksetup_helper import configure_frontend
+
+
 configure_frontend()

{islpy-2023.2.5 → islpy-2024.2}/doc/conf.py

@@ -1,13 +1,13 @@
 import re
-
 from urllib.request import urlopen
 
+
 _conf_url = \
         "https://raw.githubusercontent.com/inducer/sphinxconfig/main/sphinxconfig.py"
 with urlopen(_conf_url) as _inf:
     exec(compile(_inf.read(), _conf_url, "exec"), globals())
 
-extensions.remove("sphinx.ext.linkcode")
+extensions.remove("sphinx.ext.linkcode")  # noqa: F821
 
 copyright = "2011-21, Andreas Kloeckner"
 
@@ -23,6 +23,7 @@ intersphinx_mapping = {
         "python": ("https://docs.python.org/3/", None),
         }
 
+
 def autodoc_process_signature(app, what, name, obj, options, signature,
         return_annotation):
     from inspect import ismethod
@@ -38,6 +39,7 @@ def autodoc_process_signature(app, what, name, obj, options, signature,
 
     return (signature, return_annotation)
 
+
 def autodoc_process_docstring(app, what, name, obj, options, lines):
     # clear out redundant pybind-generated member list
     if any("Members" in ln for ln in lines):
@@ -61,7 +63,7 @@ def autodoc_process_docstring(app, what, name, obj, options, lines):
 
                 doc_match = arg_list_re.match(meth_obj.__doc__)
                 if doc_match is None:
-                    #print(f"'{meth_obj.__doc__}' did not match arg list RE")
+                    # print(f"'{meth_obj.__doc__}' did not match arg list RE")
                     return result
 
                 arg_list = doc_match.group(2).split(", ")

{islpy-2023.2.5 → islpy-2024.2}/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-2023.2.5 → islpy-2024.2}/examples/demo.py

@@ -1,5 +1,6 @@
 import islpy as isl
 
+
 space = isl.Space.create_from_names(isl.DEFAULT_CONTEXT, set=["x", "y"])
 
 bset = (isl.BasicSet.universe(space)
@@ -53,8 +54,8 @@ def plot_basic_set(bset, *args, **kwargs):
     if plot_vert:
         pt.plot(vertex_pts[:, 0], vertex_pts[:, 1], "o")
 
-    import matplotlib.path as mpath
     import matplotlib.patches as mpatches
+    import matplotlib.path as mpath
 
     Path = mpath.Path  # noqa
 
@@ -76,7 +77,7 @@ plot_basic_set(bset2, facecolor="green", edgecolor="black", alpha=0.2)
 pt.grid()
 pt.xlim([-1, 6])
 pt.ylim([-1, 8])
-#pt.show()
+# pt.show()
 pt.savefig("before-union.png", dpi=50)
 
 plot_basic_set(union, facecolor="blue", edgecolor="yellow",

{islpy-2023.2.5 → islpy-2024.2}/gen_wrap.py

@@ -20,12 +20,13 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 """
 
-from dataclasses import dataclass
+import os
 import re
 import sys
-import os
+from dataclasses import dataclass
 from os.path import join
-from typing import Sequence, List
+from typing import ClassVar, List, Mapping, Sequence
+
 
 SEM_TAKE = "take"
 SEM_GIVE = "give"
@@ -53,19 +54,19 @@ def       for       lambda    try
 """.split()
 
 
-class Retry(RuntimeError):
+class Retry(RuntimeError):  # noqa: N818
     pass
 
 
-class BadArg(ValueError):
+class BadArg(ValueError):  # noqa: N818
     pass
 
 
-class Undocumented(ValueError):
+class Undocumented(ValueError):  # noqa: N818
     pass
 
 
-class SignatureNotSupported(ValueError):
+class SignatureNotSupported(ValueError):  # noqa: N818
     pass
 
 
@@ -184,7 +185,7 @@ PART_TO_CLASSES = {
 
             # others
             "ctx",
-            "printer",  "val", "multi_val", "vec", "mat", "fixed_box",
+            "printer", "val", "multi_val", "vec", "mat", "fixed_box",
             "aff", "pw_aff", "union_pw_aff",
             "multi_aff", "multi_pw_aff", "pw_multi_aff", "union_pw_multi_aff",
             "multi_union_pw_aff",
@@ -264,9 +265,9 @@ MACRO_ENUMS = [
 
 # }}}
 
-SAFE_TYPES = list(ENUMS) + ["int", "unsigned", "uint32_t", "size_t", "double",
-        "long", "unsigned long", "isl_size"]
-SAFE_IN_TYPES = SAFE_TYPES + ["const char *", "char *"]
+SAFE_TYPES = [*list(ENUMS), "int", "unsigned", "uint32_t", "size_t", "double", "long",
+    "unsigned long", "isl_size"]
+SAFE_IN_TYPES = [*SAFE_TYPES, "const char *", "char *"]
 
 # {{{ parser helpers
 
@@ -381,10 +382,13 @@ def parse_arg(arg):
 def preprocess_with_macros(macro_header_contents, code):
     try:
         from pcpp.preprocessor import (
-                Preprocessor as PreprocessorBase, OutputDirective, Action)
-    except ImportError:
+            Action,
+            OutputDirective,
+            Preprocessor as PreprocessorBase,
+        )
+    except ImportError as err:
         raise RuntimeError("pcpp was not found. Please install pcpp before "
-                "installing islpy. 'pip install pcpp' should do the job.")
+                "installing islpy. 'pip install pcpp' should do the job.") from err
 
     class MacroExpandingCPreprocessor(PreprocessorBase):
         def on_directive_handle(self, directive, toks, ifpassthru, precedingtoks):
@@ -420,7 +424,7 @@ def preprocess_with_macros(macro_header_contents, code):
 
 class FunctionData:
 
-    INVALID_PY_IDENTIFIER_RENAMING_MAP = {
+    INVALID_PY_IDENTIFIER_RENAMING_MAP: ClassVar[Mapping[str, str]] = {
         "2exp": "two_exp"
     }
 
@@ -458,11 +462,11 @@ class FunctionData:
         return h.hexdigest()
 
     preprocessed_dir = "preproc-headers"
-    macro_headers = ["isl/multi.h", "isl/list.h"]
+    macro_headers: ClassVar[Sequence[str]] = ["isl/multi.h", "isl/list.h"]
 
     def get_preprocessed_header(self, fname):
         header_hash = self.get_header_hashes(
-                self.macro_headers + [fname])
+                [*self.macro_headers, fname])
 
         # cache preprocessed headers to avoid install-time
         # dependency on pcpp
@@ -490,7 +494,7 @@ class FunctionData:
         prepro_header = preprocess_with_macros(
                 macro_header_contents, self.get_header_contents(fname))
 
-        with open(prepro_fname, "wt") as outf:
+        with open(prepro_fname, "w") as outf:
             outf.write(prepro_header)
 
         return prepro_header
@@ -1347,9 +1351,8 @@ def write_wrapper(outf, meth):
             inputs=", ".join(input_args),
             body="\n".join(body)))
 
-    docs = (["{}({})".format(meth.name, ", ".join(arg_names)), ""]
-            + docs
-            + [f":return: {ret_descr}"])
+    docs = (["{}({})".format(meth.name, ", ".join(arg_names)),
+            "", *docs, f":return: {ret_descr}"])
 
     return arg_names, "\n".join(docs)
 
@@ -1376,7 +1379,7 @@ def write_exposer(outf, meth, arg_names, doc_str):
     if meth.name == "get_hash" and len(meth.args) == 1:
         py_name = "__hash__"
 
-    #if meth.is_static:
+    # if meth.is_static:
     #    doc_str = "(static method)\n" + doc_str
 
     if not meth.is_exported:
@@ -1421,7 +1424,7 @@ def write_wrappers(expf, wrapf, methods):
     undoc = []
 
     for meth in methods:
-        #print "TRY_WRAP:", meth
+        # print "TRY_WRAP:", meth
         if meth.name.endswith("_si") or meth.name.endswith("_ui"):
             val_versions = [
                     meth2
@@ -1517,7 +1520,7 @@ def add_upcasts(basic_class, special_class, fmap, expf):
 
 
 def gen_wrapper(include_dirs, include_barvinok=False, isl_version=None):
-    fdata = FunctionData(["."] + include_dirs)
+    fdata = FunctionData([".", *include_dirs])
     fdata.read_header("isl/ctx.h")
     fdata.read_header("isl/id.h")
     fdata.read_header("isl/space.h")
@@ -1550,8 +1553,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", "wt")
-        wrapf = open(f"src/wrapper/gen-wrap-{part}.inc", "wt")
+        expf = open(f"src/wrapper/gen-expose-{part}.inc", "w")
+        wrapf = open(f"src/wrapper/gen-wrap-{part}.inc", "w")
 
         classes = [
                 cls

islpy-2024.2/isl/configure.ac

@@ -0,0 +1,146 @@
+AC_INIT([isl], [0.27], [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=27:0:4
+
+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, [])
+
+ISL_DETECT_DIFF_OPTIONS
+
+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)
+
+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