islpy 2025.2.1__cp312-cp312-musllinux_1_2_aarch64.whl → 2025.2.2__cp312-cp312-musllinux_1_2_aarch64.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

@@ -2151,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: ...
 
@@ -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,8 @@ 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: ...
@@ -6108,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

@@ -551,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):

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: islpy
-Version: 2025.2.1
+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/__init__.py,sha256=di9XuiCE0E17rYvJF2odx710bD4X07gsKGWDW6oSgH0,13021
+islpy/_isl.cpython-312-aarch64-linux-musl.so,sha256=UDNRE-TofTBgR6dDOqrgYJAZNsmLEGUd7j2uZiEszXo,9380480
+islpy/_isl.pyi,sha256=_QvIK3y21H8sud47dr3bBOfxkSONwZzxV1x09WIxtRQ,260121
+islpy/_monkeypatch.py,sha256=J_EIwyHBinfCo_rBu1V9o1OzG9R3dE34lJ0XIMOJSQ4,31309
+islpy/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+islpy/version.py,sha256=9KVEg7OX9uCaA6ElUMeiAh-zDrxsy3u2H6VQm_-LTUE,301
+islpy-2025.2.2.dist-info/METADATA,sha256=Us2hmRlX7V2rNYGp3pg3ZEqYgbSbuzNYT7IIHd9dbT4,2966
+islpy-2025.2.2.dist-info/WHEEL,sha256=vdDoSHsGSt7A_0xA1xz2bhxzT0tKzOSwFgDqzMPnQX4,118
+islpy-2025.2.2.dist-info/RECORD,,

islpy-2025.2.1.dist-info/RECORD

@@ -1,9 +0,0 @@
-islpy/__init__.py,sha256=6In7YFiBLKNNVIGkpKMiB1H_-H2OQ5ovlqJ_Tz0nAvA,13073
-islpy/_isl.cpython-312-aarch64-linux-musl.so,sha256=zyIZjA5bI6aAXHCkaLmOjYPxSeGMwoOx-pEJXUlRT3g,9380480
-islpy/_isl.pyi,sha256=dAYJ9hZ0HrpMnUHdruE6cOvKU_Px2kZ7qr6YFDZ-Z-0,260082
-islpy/_monkeypatch.py,sha256=NrSQHBRxIVzSuYa2qR_oSnxRoJxVbu-l_Sv1AZcvE0Q,31242
-islpy/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-islpy/version.py,sha256=9KVEg7OX9uCaA6ElUMeiAh-zDrxsy3u2H6VQm_-LTUE,301
-islpy-2025.2.1.dist-info/METADATA,sha256=rKg9uyDgpaAp2mbvRv2YzFS9seQzhA1jjw75gcTmQvg,2966
-islpy-2025.2.1.dist-info/WHEEL,sha256=vdDoSHsGSt7A_0xA1xz2bhxzT0tKzOSwFgDqzMPnQX4,118
-islpy-2025.2.1.dist-info/RECORD,,