islpy 2025.2__cp313-cp313-macosx_11_0_arm64.whl → 2025.2.2__cp313-cp313-macosx_11_0_arm64.whl

islpy/__init__.py

@@ -21,7 +21,7 @@ THE SOFTWARE.
 """
 
 from collections.abc import Collection, Sequence
-from typing import Literal, TypeAlias, TypeVar
+from typing import Literal, TypeAlias, TypeVar, cast
 
 from islpy.version import VERSION, VERSION_TEXT
 
@@ -149,44 +149,34 @@ def _get_default_context() -> Context:
     return DEFAULT_CONTEXT
 
 
-def _back_to_basic(new_obj, old_obj):
-    # Work around set_dim_id not being available for Basic{Set,Map}
-    if isinstance(old_obj, BasicSet) and isinstance(new_obj, Set):
-        bsets = new_obj.get_basic_sets()
+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)
+    elif isinstance(obj, BasicMap):
+        p, = obj.to_map().set_dim_id(dt, idx, id).get_basic_maps()
+        return cast("AlignableT", p)
 
-        if len(bsets) == 0:
-            bset = BasicSet.universe(new_obj.space).complement()
-        else:
-            bset, = bsets
-
-        return bset
-
-    if isinstance(old_obj, BasicMap) and isinstance(new_obj, Map):
-        bmaps = new_obj.get_basic_maps()
-
-        if len(bmaps) == 0:
-            bmap = BasicMap.universe(new_obj.space).complement()
-        else:
-            bmap, = bmaps
-
-        return bmap
-
-    return new_obj
-
-
-def _set_dim_id(obj, dt, idx, id):
-    return _back_to_basic(obj.set_dim_id(dt, idx, id), obj)
+    return cast("AlignableT", obj.set_dim_id(dt, idx, id))
 
 
 def _align_dim_type(
             template_dt: dim_type,
             obj: AlignableT,
-            template: AlignableT,
+            template: Alignable,
             obj_bigger_ok: bool,
             obj_names: Collection[str],
             template_names: Collection[str],
         ) -> AlignableT:
 
+    # convert to a type that has get_dim_id
+    if isinstance(template, BasicSet):
+        template = template.to_set()
+    elif isinstance(template, BasicMap):
+        template = template.to_map()
+    elif isinstance(template, Aff):
+        template = template.to_pw_aff()
+
     # {{{ deal with Aff, PwAff
 
     # The technique below will not work for PwAff et al, because there is *only*

islpy/_isl.pyi

@@ -1,3 +1,4 @@
+from typing_extensions import Self
 from collections.abc import Callable
 import enum
 from typing import overload
@@ -1489,83 +1490,83 @@ class IdToAstExpr:
     pass
 
 class Printer:
-    def print_id_list(self, list: IdList) -> Printer: ...
+    def print_id_list(self, list: IdList) -> Self: ...
 
-    def print_id(self, id: Id) -> Printer: ...
+    def print_id(self, id: Id) -> Self: ...
 
-    def print_multi_id(self, mi: MultiId) -> Printer: ...
+    def print_multi_id(self, mi: MultiId) -> Self: ...
 
-    def print_space(self, space: Space) -> Printer: ...
+    def print_space(self, space: Space) -> Self: ...
 
-    def print_basic_set(self, bset: BasicSet) -> Printer: ...
+    def print_basic_set(self, bset: BasicSet) -> Self: ...
 
-    def print_set(self, map: Set | BasicSet) -> Printer: ...
+    def print_set(self, map: Set | BasicSet) -> Self: ...
 
-    def print_basic_map(self, bmap: BasicMap) -> Printer: ...
+    def print_basic_map(self, bmap: BasicMap) -> Self: ...
 
-    def print_map(self, map: Map | BasicMap) -> Printer: ...
+    def print_map(self, map: Map | BasicMap) -> Self: ...
 
-    def print_basic_map_list(self, list: BasicMapList) -> Printer: ...
+    def print_basic_map_list(self, list: BasicMapList) -> Self: ...
 
-    def print_map_list(self, list: MapList) -> Printer: ...
+    def print_map_list(self, list: MapList) -> Self: ...
 
-    def print_basic_set_list(self, list: BasicSetList) -> Printer: ...
+    def print_basic_set_list(self, list: BasicSetList) -> Self: ...
 
-    def print_set_list(self, list: SetList) -> Printer: ...
+    def print_set_list(self, list: SetList) -> Self: ...
 
-    def print_local_space(self, ls: LocalSpace | Space) -> Printer: ...
+    def print_local_space(self, ls: LocalSpace | Space) -> Self: ...
 
-    def print_aff(self, aff: Aff) -> Printer: ...
+    def print_aff(self, aff: Aff) -> Self: ...
 
-    def print_pw_aff(self, pwaff: PwAff | Aff) -> Printer: ...
+    def print_pw_aff(self, pwaff: PwAff | Aff) -> Self: ...
 
-    def print_multi_aff(self, maff: MultiAff) -> Printer: ...
+    def print_multi_aff(self, maff: MultiAff) -> Self: ...
 
-    def print_pw_multi_aff(self, pma: PwMultiAff | MultiAff) -> Printer: ...
+    def print_pw_multi_aff(self, pma: PwMultiAff | MultiAff) -> Self: ...
 
-    def print_union_pw_multi_aff(self, upma: UnionPwMultiAff | MultiAff | PwMultiAff) -> Printer: ...
+    def print_union_pw_multi_aff(self, upma: UnionPwMultiAff | MultiAff | PwMultiAff) -> Self: ...
 
-    def print_multi_pw_aff(self, mpa: MultiPwAff) -> Printer: ...
+    def print_multi_pw_aff(self, mpa: MultiPwAff) -> Self: ...
 
-    def print_union_pw_aff(self, upa: UnionPwAff | Aff | PwAff) -> Printer: ...
+    def print_union_pw_aff(self, upa: UnionPwAff | Aff | PwAff) -> Self: ...
 
-    def print_multi_union_pw_aff(self, mupa: MultiUnionPwAff) -> Printer: ...
+    def print_multi_union_pw_aff(self, mupa: MultiUnionPwAff) -> Self: ...
 
-    def print_aff_list(self, list: AffList) -> Printer: ...
+    def print_aff_list(self, list: AffList) -> Self: ...
 
-    def print_pw_aff_list(self, list: PwAffList) -> Printer: ...
+    def print_pw_aff_list(self, list: PwAffList) -> Self: ...
 
-    def print_pw_multi_aff_list(self, list: PwMultiAffList) -> Printer: ...
+    def print_pw_multi_aff_list(self, list: PwMultiAffList) -> Self: ...
 
-    def print_union_pw_aff_list(self, list: UnionPwAffList) -> Printer: ...
+    def print_union_pw_aff_list(self, list: UnionPwAffList) -> Self: ...
 
-    def print_union_pw_multi_aff_list(self, list: UnionPwMultiAffList) -> Printer: ...
+    def print_union_pw_multi_aff_list(self, list: UnionPwMultiAffList) -> Self: ...
 
-    def print_qpolynomial(self, qp: QPolynomial) -> Printer: ...
+    def print_qpolynomial(self, qp: QPolynomial) -> Self: ...
 
-    def print_pw_qpolynomial(self, pwqp: PwQPolynomial) -> Printer: ...
+    def print_pw_qpolynomial(self, pwqp: PwQPolynomial) -> Self: ...
 
-    def print_qpolynomial_fold(self, fold: QPolynomialFold) -> Printer: ...
+    def print_qpolynomial_fold(self, fold: QPolynomialFold) -> Self: ...
 
-    def print_pw_qpolynomial_fold(self, pwf: PwQPolynomialFold) -> Printer: ...
+    def print_pw_qpolynomial_fold(self, pwf: PwQPolynomialFold) -> Self: ...
 
-    def print_union_pw_qpolynomial(self, upwqp: UnionPwQPolynomial) -> Printer: ...
+    def print_union_pw_qpolynomial(self, upwqp: UnionPwQPolynomial) -> Self: ...
 
-    def print_union_pw_qpolynomial_fold(self, upwf: UnionPwQPolynomialFold) -> Printer: ...
+    def print_union_pw_qpolynomial_fold(self, upwf: UnionPwQPolynomialFold) -> Self: ...
 
-    def print_qpolynomial_list(self, list: QPolynomialList) -> Printer: ...
+    def print_qpolynomial_list(self, list: QPolynomialList) -> Self: ...
 
-    def print_pw_qpolynomial_list(self, list: PwQPolynomialList) -> Printer: ...
+    def print_pw_qpolynomial_list(self, list: PwQPolynomialList) -> Self: ...
 
-    def print_pw_qpolynomial_fold_list(self, list: PwQPolynomialFoldList) -> Printer: ...
+    def print_pw_qpolynomial_fold_list(self, list: PwQPolynomialFoldList) -> Self: ...
 
-    def print_union_map(self, umap: UnionMap | BasicMap | Map) -> Printer: ...
+    def print_union_map(self, umap: UnionMap | BasicMap | Map) -> Self: ...
 
-    def print_union_map_list(self, list: UnionMapList) -> Printer: ...
+    def print_union_map_list(self, list: UnionMapList) -> Self: ...
 
-    def print_union_set(self, uset: UnionSet | BasicSet | Set) -> Printer: ...
+    def print_union_set(self, uset: UnionSet | BasicSet | Set) -> Self: ...
 
-    def print_union_set_list(self, list: UnionSetList) -> Printer: ...
+    def print_union_set_list(self, list: UnionSetList) -> Self: ...
 
     @staticmethod
     def to_str(ctx: Context) -> Printer: ...
@@ -1574,87 +1575,87 @@ class Printer:
 
     def get_str(self) -> str: ...
 
-    def set_indent(self, indent: int) -> Printer: ...
+    def set_indent(self, indent: int) -> Self: ...
 
-    def indent(self, indent: int) -> Printer: ...
+    def indent(self, indent: int) -> Self: ...
 
-    def set_output_format(self, output_format: int) -> Printer: ...
+    def set_output_format(self, output_format: int) -> Self: ...
 
     def get_output_format(self) -> int: ...
 
-    def set_yaml_style(self, yaml_style: int) -> Printer: ...
+    def set_yaml_style(self, yaml_style: int) -> Self: ...
 
     def get_yaml_style(self) -> int: ...
 
-    def set_indent_prefix(self, prefix: str) -> Printer: ...
+    def set_indent_prefix(self, prefix: str) -> Self: ...
 
-    def set_prefix(self, prefix: str) -> Printer: ...
+    def set_prefix(self, prefix: str) -> Self: ...
 
-    def set_suffix(self, suffix: str) -> Printer: ...
+    def set_suffix(self, suffix: str) -> Self: ...
 
-    def set_isl_int_width(self, width: int) -> Printer: ...
+    def set_isl_int_width(self, width: int) -> Self: ...
 
     def has_note(self, id: Id) -> bool: ...
 
     def get_note(self, id: Id) -> Id: ...
 
-    def set_note(self, id: Id, note: Id) -> Printer: ...
+    def set_note(self, id: Id, note: Id) -> Self: ...
 
-    def start_line(self) -> Printer: ...
+    def start_line(self) -> Self: ...
 
-    def end_line(self) -> Printer: ...
+    def end_line(self) -> Self: ...
 
-    def print_double(self, d: int) -> Printer: ...
+    def print_double(self, d: int) -> Self: ...
 
-    def print_int(self, i: int) -> Printer: ...
+    def print_int(self, i: int) -> Self: ...
 
-    def print_str(self, s: str) -> Printer: ...
+    def print_str(self, s: str) -> Self: ...
 
-    def yaml_start_mapping(self) -> Printer: ...
+    def yaml_start_mapping(self) -> Self: ...
 
-    def yaml_end_mapping(self) -> Printer: ...
+    def yaml_end_mapping(self) -> Self: ...
 
-    def yaml_start_sequence(self) -> Printer: ...
+    def yaml_start_sequence(self) -> Self: ...
 
-    def yaml_end_sequence(self) -> Printer: ...
+    def yaml_end_sequence(self) -> Self: ...
 
-    def yaml_next(self) -> Printer: ...
+    def yaml_next(self) -> Self: ...
 
-    def flush(self) -> Printer: ...
+    def flush(self) -> Self: ...
 
-    def print_point(self, pnt: Point) -> Printer: ...
+    def print_point(self, pnt: Point) -> Self: ...
 
-    def print_constraint_list(self, list: ConstraintList) -> Printer: ...
+    def print_constraint_list(self, list: ConstraintList) -> Self: ...
 
-    def print_constraint(self, c: Constraint) -> Printer: ...
+    def print_constraint(self, c: Constraint) -> Self: ...
 
-    def print_val(self, v: Val | int) -> Printer: ...
+    def print_val(self, v: Val | int) -> Self: ...
 
-    def print_multi_val(self, mv: MultiVal) -> Printer: ...
+    def print_multi_val(self, mv: MultiVal) -> Self: ...
 
-    def print_val_list(self, list: ValList) -> Printer: ...
+    def print_val_list(self, list: ValList) -> Self: ...
 
-    def print_vec(self, vec: Vec) -> Printer: ...
+    def print_vec(self, vec: Vec) -> Self: ...
 
-    def print_schedule_constraints(self, sc: ScheduleConstraints) -> Printer: ...
+    def print_schedule_constraints(self, sc: ScheduleConstraints) -> Self: ...
 
-    def print_schedule(self, schedule: Schedule) -> Printer: ...
+    def print_schedule(self, schedule: Schedule) -> Self: ...
 
-    def print_schedule_node(self, node: ScheduleNode) -> Printer: ...
+    def print_schedule_node(self, node: ScheduleNode) -> Self: ...
 
-    def print_union_access_info(self, access: UnionAccessInfo) -> Printer: ...
+    def print_union_access_info(self, access: UnionAccessInfo) -> Self: ...
 
-    def print_union_flow(self, flow: UnionFlow) -> Printer: ...
+    def print_union_flow(self, flow: UnionFlow) -> Self: ...
 
-    def print_ast_expr(self, expr: AstExpr) -> Printer: ...
+    def print_ast_expr(self, expr: AstExpr) -> Self: ...
 
-    def print_ast_node(self, node: AstNode) -> Printer: ...
+    def print_ast_node(self, node: AstNode) -> Self: ...
 
-    def ast_op_type_set_print_name(self, type: ast_expr_op_type, name: str) -> Printer: ...
+    def ast_op_type_set_print_name(self, type: ast_expr_op_type, name: str) -> Self: ...
 
-    def print_ast_expr_list(self, list: AstExprList) -> Printer: ...
+    def print_ast_expr_list(self, list: AstExprList) -> Self: ...
 
-    def print_ast_node_list(self, list: AstNodeList) -> Printer: ...
+    def print_ast_node_list(self, list: AstNodeList) -> Self: ...
 
 class Val:
     @overload
@@ -2150,6 +2151,8 @@ class FixedBox:
 class Aff:
     def __init__(self, s: str, context: Context | None = None) -> None: ...
 
+    def to_pw_aff(self) -> PwAff: ...
+
     @staticmethod
     def zero_on_domain_space(space: Space) -> Aff: ...
 
@@ -2904,9 +2907,6 @@ class PwAff:
     __repr__ = islpy._monkeypatch.generic_repr
 
 class UnionPwAff:
-    @overload
-    def __init__(self, arg: Aff, /) -> None: ...
-
     @overload
     def __init__(self, arg: PwAff, /) -> None: ...
 
@@ -4574,6 +4574,8 @@ class Constraint:
 class Space:
     def __init__(self, s: str, context: Context | None = None) -> None: ...
 
+    def to_local_space(self) -> LocalSpace: ...
+
     def multi_id(self, list: IdList) -> MultiId: ...
 
     def get_ctx(self) -> Context: ...
@@ -4931,6 +4933,10 @@ class LocalSpace:
 class BasicSet:
     def __init__(self, s: str, context: Context | None = None) -> None: ...
 
+    def __hash__(self) -> int: ...
+
+    def is_params(self) -> bool: ...
+
     def n_dim(self) -> int: ...
 
     def n_param(self) -> int: ...
@@ -5311,8 +5317,6 @@ class BasicSet:
 
     def involves_locals(self) -> bool: ...
 
-    def is_params(self) -> bool: ...
-
     @overload
     def is_strict_subset(self, set2: Set | BasicSet) -> bool: ...
 
@@ -5365,8 +5369,6 @@ class BasicSet:
 
     def plain_is_disjoint(self, set2: Set | BasicSet) -> bool: ...
 
-    def __hash__(self) -> int: ...
-
     def n_basic_set(self) -> int: ...
 
     def foreach_basic_set(self, fn: Callable[[BasicSet], None]) -> None: ...
@@ -5504,6 +5506,10 @@ class BasicSet:
 class BasicMap:
     def __init__(self, s: str, context: Context | None = None) -> None: ...
 
+    def __hash__(self) -> int: ...
+
+    def to_map(self) -> Map: ...
+
     def total_dim(self) -> int: ...
 
     def dim(self, type: dim_type) -> int: ...
@@ -6106,8 +6112,6 @@ class BasicMap:
 
     def plain_is_equal(self, map2: Map | BasicMap) -> bool: ...
 
-    def __hash__(self) -> int: ...
-
     def n_basic_map(self) -> int: ...
 
     def foreach_basic_map(self, fn: Callable[[BasicMap], None]) -> None: ...

islpy/_monkeypatch.py

@@ -1,14 +1,21 @@
+import os
+import re
 from collections.abc import Callable, Collection, Iterable, Mapping, Sequence
+from functools import update_wrapper
+from sys import intern
 from typing import (
     TYPE_CHECKING,
     Any,
     ClassVar,
+    Concatenate,
     Literal,
+    ParamSpec,
     Protocol,
     TypeAlias,
     TypeVar,
     cast,
 )
+from warnings import warn
 
 
 if TYPE_CHECKING:
@@ -544,6 +551,8 @@ def obj_get_var_names(self: HasSpace, dimtype: _isl.dim_type) -> Sequence[str]:
 
 
 def pwaff_get_pieces(self: _isl.PwAff | _isl.Aff) -> list[tuple[_isl.Set, _isl.Aff]]:
+    if isinstance(self, _isl.Aff):
+        self = self.to_pw_aff()
     result: list[tuple[_isl.Set, _isl.Aff]] = []
 
     def append_tuple(s: _isl.Set, v: _isl.Aff):
@@ -1013,3 +1022,78 @@ 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]+)`.")
+
+
+_TO_METHODS = {
+    "PwAff": "to_pw_aff",
+    "PwMultiAff": "to_pw_multi_aff",
+    "UnionPwAff": "to_union_pw_aff",
+    "UnionPwMultiAff": "to_union_pw_multi_aff",
+    "LocalSpace": "to_local_space",
+    "Set": "to_set",
+    "UnionSet": "to_union_set",
+    "Map": "to_map",
+    "UnionMap": "to_union_map",
+}
+
+
+def _depr_downcast_wrapper(
+            f: Callable[Concatenate[object, P], ResultT],
+        ) -> Callable[Concatenate[object, P], ResultT]:
+    doc = f.__doc__
+    assert doc is not None
+    m = _DOWNCAST_RE.search(doc)
+    assert m, doc
+    basic_cls_name = intern(m.group(1))
+    tgt_cls_name = m.group(2)
+
+    tgt_cls = cast("type", getattr(_isl, tgt_cls_name))
+    is_overload = "Overloaded function" in doc
+    msg = (f"{basic_cls_name}.{f.__name__} "
+            f"with implicit conversion of self to {tgt_cls_name} is deprecated "
+            "and will stop working in 2026. "
+            f"Explicitly convert to {tgt_cls_name}, "
+            f"using .{_TO_METHODS[tgt_cls_name]}().")
+
+    if is_overload:
+        def wrapper(self: object, *args: P.args, **kwargs: P.kwargs) -> ResultT:
+            # "Try to" detect bad invocations of, e.g., Set.union, which is
+            # an overload of normal union and UnionSet.union.
+            if (
+                    any(isinstance(arg, tgt_cls) for arg in args)
+                    or
+                    any(isinstance(arg, tgt_cls) for arg in kwargs.values())
+                    ):
+                warn(msg, DeprecationWarning, stacklevel=2)
+
+            return f(self, *args, **kwargs)
+    else:
+        def wrapper(self: object, *args: P.args, **kwargs: P.kwargs) -> ResultT:
+            warn(msg, DeprecationWarning, stacklevel=2)
+
+            return f(self, *args, **kwargs)
+    update_wrapper(wrapper, f)
+    return wrapper
+
+
+def _monkeypatch_self_downcast_deprecation():
+    for cls in ALL_CLASSES:
+        for attr_name in dir(cls):
+            val = cast("object", getattr(cls, attr_name))
+            doc = getattr(val, "__doc__", None)
+            if doc and "\nDowncast from " in doc:
+                setattr(cls, attr_name, _depr_downcast_wrapper(
+                        cast("Callable", val),  # pyright: ignore[reportMissingTypeArgument]
+                        ))
+
+
+if not os.environ.get("ISLPY_NO_DOWNCAST_DEPRECATION", None):
+    _monkeypatch_self_downcast_deprecation()

{islpy-2025.2.dist-info → islpy-2025.2.2.dist-info}/METADATA

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

islpy-2025.2.2.dist-info/RECORD

@@ -0,0 +1,9 @@
+islpy/version.py,sha256=9KVEg7OX9uCaA6ElUMeiAh-zDrxsy3u2H6VQm_-LTUE,301
+islpy/_isl.cpython-313-darwin.so,sha256=QhUZVDAMG6d-lfiVJt9fk00yG84tGmf2akrNbgTHu9U,7927080
+islpy/__init__.py,sha256=di9XuiCE0E17rYvJF2odx710bD4X07gsKGWDW6oSgH0,13021
+islpy/_isl.pyi,sha256=_QvIK3y21H8sud47dr3bBOfxkSONwZzxV1x09WIxtRQ,260121
+islpy/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+islpy/_monkeypatch.py,sha256=J_EIwyHBinfCo_rBu1V9o1OzG9R3dE34lJ0XIMOJSQ4,31309
+islpy-2025.2.2.dist-info/RECORD,,
+islpy-2025.2.2.dist-info/WHEEL,sha256=LDEcERf6NwqnVU7GVh2ePzziJ1dorOEI8grnlWj9zQ0,141
+islpy-2025.2.2.dist-info/METADATA,sha256=Us2hmRlX7V2rNYGp3pg3ZEqYgbSbuzNYT7IIHd9dbT4,2966

islpy-2025.2.dist-info/RECORD

@@ -1,9 +0,0 @@
-islpy/version.py,sha256=9KVEg7OX9uCaA6ElUMeiAh-zDrxsy3u2H6VQm_-LTUE,301
-islpy/_isl.cpython-313-darwin.so,sha256=dYn3efr8wy86ZyGApl0cMfmxLW4DayHKkPYm0CReu2M,7927080
-islpy/__init__.py,sha256=6In7YFiBLKNNVIGkpKMiB1H_-H2OQ5ovlqJ_Tz0nAvA,13073
-islpy/_isl.pyi,sha256=rmWMkaV2DBUBqDl6c4hdyJR2QE7uOfS2yo2t4SOApSc,260256
-islpy/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-islpy/_monkeypatch.py,sha256=iFDDVUTNZhf98TcprqaW7UMXtx-fMm9sP-A3jWF32OA,28592
-islpy-2025.2.dist-info/RECORD,,
-islpy-2025.2.dist-info/WHEEL,sha256=LDEcERf6NwqnVU7GVh2ePzziJ1dorOEI8grnlWj9zQ0,141
-islpy-2025.2.dist-info/METADATA,sha256=MP7D5-bXwNkMnh82YAQwyKnxuYie87BD6azadm508mA,2964