islpy 2025.2.2__tar.gz → 2025.2.5__tar.gz

{islpy-2025.2.2 → islpy-2025.2.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: islpy
-Version: 2025.2.2
+Version: 2025.2.5
 Summary: Wrapper around isl, an integer set library
 Author-Email: Andreas Kloeckner <inform@tiker.net>
 License-Expression: MIT

{islpy-2025.2.2 → islpy-2025.2.5}/doc/reference.rst

@@ -137,6 +137,7 @@ Output
 Helper functions
 ^^^^^^^^^^^^^^^^
 .. autoclass:: AlignableT
+.. autoclass:: AlignableT2
 
 .. autofunction:: align_spaces
 .. autofunction:: align_two
@@ -192,4 +193,9 @@ Canonical Names for Internal Module
 
     A type variable with an upper bound of :class:`islpy.BasicSet` | :class:`islpy.BasicMap`.
 
+.. class:: SetOrMapT
+
+    A type variable with comprising :class:`islpy.BasicSet` | :class:`islpy.Set` |
+    :class:`islpy.BasicMap` | :class:`islpy.Map`.
+
 .. vim: sw=4

islpy-2025.2.5/isl-supplementary/isl/config.h

@@ -0,0 +1 @@
+

islpy-2025.2.5/isl-supplementary/isl/stdint.h

@@ -0,0 +1 @@
+#include <stdint.h>

islpy-2025.2.5/isl-supplementary/isl_config.h

@@ -0,0 +1,9 @@
+#define HAVE_DECL_MP_GET_MEMORY_FUNCTIONS 1
+#define WARN_UNUSED /* nothing */
+#ifdef __GNUC__
+#define HAVE_DECL___BUILTIN_FFS 1
+#else
+#define HAVE_DECL_FFS 1
+#endif
+
+#include <isl_config_post.h>

{islpy-2025.2.2 → islpy-2025.2.5}/islpy/__init__.py

@@ -135,6 +135,7 @@ Alignable: TypeAlias = (
     | Aff | PwAff
 )
 AlignableT = TypeVar("AlignableT", bound=Alignable)
+AlignableT2 = TypeVar("AlignableT2", bound=Alignable)
 
 # }}}
 
@@ -151,11 +152,21 @@ def _get_default_context() -> Context:
 
 def _set_dim_id(obj: AlignableT, dt: dim_type, idx: int, id: Id) -> AlignableT:
     if isinstance(obj, BasicSet):
-        p, = obj.to_set().set_dim_id(dt, idx, id).get_basic_sets()
-        return cast("AlignableT", p)
+        s = obj.to_set().set_dim_id(dt, idx, id)
+        basicsets = s.get_basic_sets()
+        if not basicsets:
+            result = BasicSet.empty(s.space)
+        else:
+            result, = basicsets
+        return cast("AlignableT", result)
     elif isinstance(obj, BasicMap):
-        p, = obj.to_map().set_dim_id(dt, idx, id).get_basic_maps()
-        return cast("AlignableT", p)
+        m = obj.to_map().set_dim_id(dt, idx, id)
+        basicmaps = m.get_basic_maps()
+        if not basicmaps:
+            result = BasicMap.empty(m.space)
+        else:
+            result, = basicmaps
+        return cast("AlignableT", result)
 
     return cast("AlignableT", obj.set_dim_id(dt, idx, id))
 
@@ -304,8 +315,8 @@ def align_spaces(
 
 def align_two(
             obj1: AlignableT,
-            obj2: AlignableT,
-        ) -> tuple[AlignableT, AlignableT]:
+            obj2: AlignableT2,
+        ) -> tuple[AlignableT, AlignableT2]:
     """Align the spaces of two objects, potentially modifying both of them.
 
     See also :func:`align_spaces`.

{islpy-2025.2.2 → islpy-2025.2.5}/islpy/_monkeypatch.py

@@ -5,7 +5,6 @@ from functools import update_wrapper
 from sys import intern
 from typing import (
     TYPE_CHECKING,
-    Any,
     ClassVar,
     Concatenate,
     Literal,
@@ -43,6 +42,10 @@ _CHECK_DIM_TYPES: tuple[_isl.dim_type, ...] = (
 
 # {{{ typing helpers
 
+T = TypeVar("T")
+P = ParamSpec("P")
+ResultT = TypeVar("ResultT")
+
 SelfT = TypeVar("SelfT")
 
 BasicT = TypeVar("BasicT", _isl.BasicSet, _isl.BasicMap)
@@ -54,36 +57,28 @@ ExprLikeT = TypeVar("ExprLikeT", _isl.Aff, _isl.PwAff,
                    _isl.QPolynomial, _isl.PwQPolynomial
                )
 SetLikeT = TypeVar("SetLikeT", bound=_isl.BasicSet | _isl.Set)
+
+SetOrBasic: TypeAlias = _isl.BasicSet | _isl.Set
+SetOrBasicT = TypeVar("SetOrBasicT", bound=SetOrBasic)
+
+MapOrBasic: TypeAlias = _isl.BasicMap | _isl.Map
+MapOrBasicT = TypeVar("MapOrBasicT", bound=MapOrBasic)
+
 SetOrMap: TypeAlias = _isl.BasicSet | _isl.Set | _isl.BasicMap | _isl.Map
-SetOrMapT = TypeVar("SetOrMapT", bound=SetOrMap)
+SetOrMapT = TypeVar("SetOrMapT", _isl.BasicSet, _isl.Set, _isl.BasicMap, _isl.Map)
 
 HasSpace: TypeAlias = (
     _isl.Space
-    | _isl.Aff
-    | _isl.BasicMap
-    | _isl.BasicSet
     | _isl.Constraint
     | _isl.LocalSpace
-    | _isl.Map
+    | _isl.Aff
     | _isl.MultiAff
-    | _isl.MultiId
-    | _isl.MultiPwAff
-    | _isl.MultiUnionPwAff
-    | _isl.MultiVal
-    | _isl.Point
     | _isl.PwAff
     | _isl.PwMultiAff
-    | _isl.PwQPolynomial
-    | _isl.PwQPolynomialFold
-    | _isl.QPolynomial
-    | _isl.QPolynomialFold
+    | _isl.BasicMap
+    | _isl.BasicSet
     | _isl.Set
-    | _isl.UnionMap
-    | _isl.UnionPwAff
-    | _isl.UnionPwMultiAff
-    | _isl.UnionPwQPolynomial
-    | _isl.UnionPwQPolynomialFold
-    | _isl.UnionSet
+    | _isl.Map
     )
 
 
@@ -101,34 +96,30 @@ class IslObject(Protocol):
 
 # {{{ copied verbatim from pytools to avoid numpy/pytools dependency
 
-F = TypeVar("F", bound=Callable[..., Any])
-
-
 class _HasKwargs:
     pass
 
 
-def _memoize_on_first_arg(function: F, cache_dict_name: str | None = None) -> F:
+def _memoize_on_first_arg(
+        function: Callable[Concatenate[T, P], ResultT], *,
+        cache_dict_name: str | None = None) -> Callable[Concatenate[T, P], ResultT]:
     """Like :func:`memoize_method`, but for functions that take the object
     in which do memoization information is stored as first argument.
 
     Supports cache deletion via ``function_name.clear_cache(self)``.
     """
-    from sys import intern
 
     if cache_dict_name is None:
         cache_dict_name = intern(
                 f"_memoize_dic_{function.__module__}{function.__name__}"
                 )
 
-    def wrapper(obj, *args, **kwargs):
-        if kwargs:
-            key = (_HasKwargs, frozenset(kwargs.items()), *args)
-        else:
-            key = args
+    def wrapper(obj: T, *args: P.args, **kwargs: P.kwargs) -> ResultT:
+        key = (_HasKwargs, frozenset(kwargs.items()), *args) if kwargs else args
 
+        assert cache_dict_name is not None
         try:
-            return getattr(obj, cache_dict_name)[key]
+            return cast("ResultT", getattr(obj, cache_dict_name)[key])
         except AttributeError:
             attribute_error = True
         except KeyError:
@@ -138,11 +129,10 @@ def _memoize_on_first_arg(function: F, cache_dict_name: str | None = None) -> F:
         if attribute_error:
             object.__setattr__(obj, cache_dict_name, {key: result})
             return result
-        else:
-            getattr(obj, cache_dict_name)[key] = result
-            return result
+        getattr(obj, cache_dict_name)[key] = result
+        return result
 
-    def clear_cache(obj):
+    def clear_cache(obj: object):
         object.__delattr__(obj, cache_dict_name)
 
     from functools import update_wrapper
@@ -152,7 +142,8 @@ def _memoize_on_first_arg(function: F, cache_dict_name: str | None = None) -> F:
     # into the function's dict is moderately sketchy.
     new_wrapper.clear_cache = clear_cache  # type: ignore[attr-defined]
 
-    return cast("F", new_wrapper)
+    return new_wrapper
+
 
 # }}}
 
@@ -190,7 +181,7 @@ def context_ne(self: object, other: object) -> bool:
     return not self.__eq__(other)
 
 
-def generic_reduce(self: IslObject):
+def generic_reduce(self: HasSpace):
     ctx = self.get_ctx()
     prn = _isl.Printer.to_str(ctx)
     prn = getattr(prn, f"print_{self._base_name}")(self)
@@ -331,21 +322,100 @@ def space_create_from_names(
     return result
 
 
-def obj_or(self: SetOrMapT, other: object) -> SetOrMapT:
+def set_or(
+            self: _isl.Set,
+            other: _isl.Set | _isl.BasicSet,
+        ) -> _isl.Set:
+    try:
+        return self.union(other)
+    except TypeError:
+        return NotImplemented
+
+
+def bset_and(
+            self: _isl.BasicSet,
+            other: SetOrBasicT,
+        ) -> SetOrBasicT:
+    if isinstance(other, _isl.Set):
+        try:
+            return self.to_set().intersect(other)
+        except TypeError:
+            return NotImplemented
+    else:
+        try:
+            return self.intersect(other)
+        except TypeError:
+            return NotImplemented
+
+
+def set_and(
+            self: _isl.Set,
+            other: _isl.Set | _isl.BasicSet,
+        ) -> _isl.Set:
+    if isinstance(self, _isl.BasicSet):
+        self = self.to_set()
+    try:
+        return self.intersect(other)
+    except TypeError:
+        return NotImplemented
+
+
+def set_sub(
+            self: _isl.Set | _isl.BasicSet,
+            other: _isl.Set | _isl.BasicSet,
+        ) -> _isl.Set:
+    if isinstance(self, _isl.BasicSet):
+        self = self.to_set()
+    try:
+        return self.subtract(other)
+    except TypeError:
+        return NotImplemented
+
+
+def map_or(
+            self: _isl.Map | _isl.BasicMap,
+            other: _isl.Map | _isl.BasicMap,
+        ) -> _isl.Map:
+    if isinstance(self, _isl.BasicMap):
+        self = self.to_map()
     try:
         return self.union(other)
     except TypeError:
         return NotImplemented
 
 
-def obj_and(self: SetOrMapT, other: object) -> SetOrMapT:
+def bmap_and(
+            self: _isl.BasicMap,
+            other: MapOrBasicT,
+        ) -> MapOrBasicT:
+    if isinstance(other, _isl.Map):
+        try:
+            return self.to_map().intersect(other)
+        except TypeError:
+            return NotImplemented
+    else:
+        try:
+            return self.intersect(other)
+        except TypeError:
+            return NotImplemented
+
+
+def map_and(
+            self: _isl.Map,
+            other: _isl.Map | _isl.BasicMap,
+        ) -> _isl.Map:
     try:
         return self.intersect(other)
     except TypeError:
         return NotImplemented
 
 
-def obj_sub(self: SetOrMapT, other: object) -> SetOrMapT:
+def map_sub(
+            self: _isl.Map | _isl.BasicMap,
+            other: _isl.Map | _isl.BasicMap,
+        ) -> _isl.Map:
+    if isinstance(self, _isl.BasicMap):
+        self = self.to_map()
     try:
         return self.subtract(other)
     except TypeError:
@@ -538,16 +608,42 @@ def obj_get_var_dict(
 def obj_get_var_ids(
             self: HasSpace,
             dimtype: _isl.dim_type
-        ) -> Sequence[str]:
+        ) -> Sequence[str | None]:
     """Return a list of :class:`Id` instances for :class:`dim_type` *dimtype*."""
-    return [self.get_dim_name(dimtype, i) for i in range(self.dim(dimtype))]
+    return [
+        self.get_dim_name(dimtype, i)
+        for i in range(self.dim(dimtype))]
+
+
+@_memoize_on_first_arg
+def obj_get_var_names_not_none(
+            self: HasSpace,
+            dimtype: _isl.dim_type,
+        ) -> Sequence[str]:
+    """Return a list of dim names (in order) for :class:`dim_type` *dimtype*.
+
+    Raise :exc:`ValueError` if any of the names is *None*.
+
+    .. versionadded:: 2025.2.5
+    """
+    ndim = self.dim(dimtype)
+    res = [n
+        for i in range(ndim)
+        if (n := self.get_dim_name(dimtype, i)) is not None]
+    if len(res) != ndim:
+        raise ValueError("None encountered in dim names")
+    return res
 
 
 @_memoize_on_first_arg
-def obj_get_var_names(self: HasSpace, dimtype: _isl.dim_type) -> Sequence[str]:
-    """Return a list of dim names (in order) for :class:`dim_type` *dimtype*."""
+def obj_get_var_names(
+            self: HasSpace,
+            dimtype: _isl.dim_type,
+        ) -> Sequence[str | None]:
+    """Return a list of dim names (in order) for :class:`dim_type` *dimtype*.
+    """
     return [self.get_dim_name(dimtype, i)
-        for i in range(self.dim(dimtype))]
+            for i in range(self.dim(dimtype))]
 
 
 def pwaff_get_pieces(self: _isl.PwAff | _isl.Aff) -> list[tuple[_isl.Set, _isl.Aff]]:
@@ -585,7 +681,7 @@ def pw_get_aggregate_domain(self: _isl.PwAff | _isl.PwQPolynomial) -> _isl.Set:
 
     result = _isl.Set.empty(self.get_domain_space())
     for dom, _ in self.get_pieces():
-        result = result.union(cast("_isl.Set", dom))
+        result = result.union(dom)
 
     return result
 
@@ -657,7 +753,7 @@ def expr_like_add(self: ExprLikeT, other: ExprLikeT | int | _isl.Val) -> ExprLik
         return NotImplemented
 
 
-def expr_like_sub(self: ExprLikeT, other: ExprLikeT | int | _isl.Val):
+def expr_like_sub(self: ExprLikeT, other: ExprLikeT | int | _isl.Val) -> ExprLikeT:
     if not isinstance(other, ExprLike):
         other = _number_to_expr_like(self, other)
 
@@ -727,29 +823,45 @@ for cls in ALL_CLASSES:
         cls.__ne__ = obj_ne
 
 
-def obj_lt(self: SetOrMapT, other: SetOrMapT) -> bool:
+def set_lt(self: _isl.BasicSet | _isl.Set, other: _isl.BasicSet | _isl.Set) -> bool:
     return self.is_strict_subset(other)
 
 
-def obj_le(self: SetOrMapT, other: SetOrMapT) -> bool:
+def set_le(self: _isl.BasicSet | _isl.Set, other: _isl.BasicSet | _isl.Set) -> bool:
     return self.is_subset(other)
 
 
-def obj_gt(self: SetOrMapT, other: SetOrMapT) -> bool:
+def set_gt(self: _isl.BasicSet | _isl.Set, other: _isl.BasicSet | _isl.Set) -> bool:
     return other.is_strict_subset(self)
 
 
-def obj_ge(self: SetOrMapT, other: SetOrMapT) -> bool:
+def set_ge(self: _isl.BasicSet | _isl.Set, other: _isl.BasicSet | _isl.Set) -> bool:
+    return other.is_subset(self)
+
+
+def map_lt(self: _isl.BasicMap | _isl.Map, other: _isl.BasicMap | _isl.Map) -> bool:
+    return self.is_strict_subset(other)
+
+
+def map_le(self: _isl.BasicMap | _isl.Map, other: _isl.BasicMap | _isl.Map) -> bool:
+    return self.is_subset(other)
+
+
+def map_gt(self: _isl.BasicMap | _isl.Map, other: _isl.BasicMap | _isl.Map) -> bool:
+    return other.is_strict_subset(self)
+
+
+def map_ge(self: _isl.BasicMap | _isl.Map, other: _isl.BasicMap | _isl.Map) -> bool:
     return other.is_subset(self)
 
 
 # {{{ project_out_except
 
 def obj_project_out_except(
-            obj: SetLikeT,
+            obj: SetOrMapT,
             names: Collection[str],
             types: Collection[_isl.dim_type]
-        ) -> SetLikeT:
+        ) -> SetOrMapT:
     """
     :param types: list of :class:`dim_type` determining
         the types of axes to project out
@@ -786,10 +898,10 @@ def obj_project_out_except(
 # {{{ eliminate_except
 
 def obj_eliminate_except(
-            obj: SetLikeT,
+            obj: SetOrMapT,
             names: Collection[str],
             types: Collection[_isl.dim_type]
-        ) -> SetLikeT:
+        ) -> SetOrMapT:
     """
     :param types: list of :class:`dim_type` determining
         the types of axes to eliminate
@@ -871,12 +983,23 @@ def _add_functionality() -> None:
 
     # {{{ Python set-like behavior
 
-    for cls in [_isl.BasicSet, _isl.BasicMap, _isl.Set, _isl.Map]:
-        cls.__or__ = obj_or
-        cls.__ror__ = obj_or
-        cls.__and__ = obj_and
-        cls.__rand__ = obj_and
-        cls.__sub__ = obj_sub
+    _isl.BasicSet.__and__ = bset_and
+    _isl.BasicSet.__rand__ = bset_and
+    _isl.Set.__and__ = set_and
+    _isl.Set.__rand__ = set_and
+    for cls in [_isl.BasicSet, _isl.Set]:
+        cls.__or__ = set_or
+        cls.__ror__ = set_or
+        cls.__sub__ = set_sub
+
+    _isl.BasicMap.__and__ = bmap_and
+    _isl.BasicMap.__rand__ = bmap_and
+    _isl.Map.__and__ = map_and
+    _isl.Map.__rand__ = map_and
+    for cls in [_isl.BasicMap, _isl.Map]:
+        cls.__or__ = map_or
+        cls.__ror__ = map_or
+        cls.__sub__ = map_sub
 
     # }}}
 
@@ -938,6 +1061,7 @@ for cls in ALL_CLASSES:
         cls.get_var_dict = obj_get_var_dict
         cls.get_var_ids = obj_get_var_ids
         cls.get_var_names = obj_get_var_names
+        cls.get_var_names_not_none = obj_get_var_names_not_none
 
     # }}}
 
@@ -1005,11 +1129,17 @@ for cls in ALL_CLASSES:
 
     # {{{ rich comparisons
 
-    for cls in [_isl.BasicSet, _isl.BasicMap, _isl.Set, _isl.Map]:
-        cls.__lt__ = obj_lt
-        cls.__le__ = obj_le
-        cls.__gt__ = obj_gt
-        cls.__ge__ = obj_ge
+    for cls in [_isl.BasicSet, _isl.Set]:
+        cls.__lt__ = set_lt
+        cls.__le__ = set_le
+        cls.__gt__ = set_gt
+        cls.__ge__ = set_ge
+
+    for cls in [_isl.BasicMap, _isl.Map]:
+        cls.__lt__ = map_lt
+        cls.__le__ = map_le
+        cls.__gt__ = map_gt
+        cls.__ge__ = map_ge
 
     # }}}
 
@@ -1024,10 +1154,6 @@ for cls in ALL_CLASSES:
 _add_functionality()
 
 
-P = ParamSpec("P")
-ResultT = TypeVar("ResultT")
-
-
 _DOWNCAST_RE = re.compile(
           r"Downcast from :class:`([A-Za-z]+)` to :class:`([A-Za-z]+)`.")
 

{islpy-2025.2.2 → islpy-2025.2.5}/pyproject.toml

@@ -11,7 +11,7 @@ requires = [
 
 [project]
 name = "islpy"
-version = "2025.2.2"
+version = "2025.2.5"
 description = "Wrapper around isl, an integer set library"
 readme = "README.rst"
 license = "MIT"
@@ -52,6 +52,18 @@ disable-editable-pip-install = true
 sdist.exclude = [
     ".github",
     "run-*.sh",
+    "isl/test_inputs",
+    "isl/testsets",
+    "isl/m4",
+    ".basedpyright",
+    "isl/include/isl/typed_cpp.h",
+    "isl/include/isl/cpp.h",
+    "isl/include/isl/cpp-checked.h",
+    "isl/imath/tests",
+    "isl/interface/isl.py.core",
+]
+sdist.include = [
+    "isl-supplementary"
 ]
 
 # FIXME: Comment out before committing