Skip to content

[IR] introduce slice support on graph #2307

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 18 additions & 3 deletions onnxscript/ir/_core.py
Original file line number Diff line number Diff line change
Expand Up @@ -2282,7 +2282,12 @@
def opset_imports(self) -> dict[str, int]:
return self._opset_imports

def __getitem__(self, index: int) -> Node:
@typing.overload
def __getitem__(self, index: int) -> Node: ...

Check notice

Code scanning / CodeQL

Statement has no effect Note

This statement has no effect.
@typing.overload
def __getitem__(self, index: slice) -> Sequence[Node]: ...

Check notice

Code scanning / CodeQL

Statement has no effect Note

This statement has no effect.

def __getitem__(self, index):
return self._nodes[index]

def __len__(self) -> int:
Expand Down Expand Up @@ -2712,7 +2717,12 @@
self._metadata_props: dict[str, str] | None = metadata_props
self._nodes: tuple[Node, ...] = tuple(nodes)

def __getitem__(self, index: int) -> Node:
@typing.overload
def __getitem__(self, index: int) -> Node: ...

Check notice

Code scanning / CodeQL

Statement has no effect Note

This statement has no effect.
@typing.overload
def __getitem__(self, index: slice) -> Sequence[Node]: ...

Check notice

Code scanning / CodeQL

Statement has no effect Note

This statement has no effect.

def __getitem__(self, index):
return self._nodes[index]

def __len__(self) -> int:
Expand Down Expand Up @@ -2961,7 +2971,12 @@
def attributes(self) -> OrderedDict[str, Attr]:
return self._attributes

def __getitem__(self, index: int) -> Node:
@typing.overload
def __getitem__(self, index: int) -> Node: ...

Check notice

Code scanning / CodeQL

Statement has no effect Note

This statement has no effect.
@typing.overload
def __getitem__(self, index: slice) -> Sequence[Node]: ...

Check notice

Code scanning / CodeQL

Statement has no effect Note

This statement has no effect.

def __getitem__(self, index):
return self._graph.__getitem__(index)

def __len__(self) -> int:
Expand Down
11 changes: 9 additions & 2 deletions onnxscript/ir/_linked_list.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

from __future__ import annotations

from typing import Generic, Iterable, Iterator, Sequence, TypeVar
from typing import Generic, Iterable, Iterator, Sequence, TypeVar, overload

T = TypeVar("T")

Expand Down Expand Up @@ -136,11 +136,18 @@
)
return self._length

def __getitem__(self, index: int) -> T:
@overload
def __getitem__(self, index: int) -> T: ...

Check notice

Code scanning / CodeQL

Statement has no effect Note

This statement has no effect.
@overload
def __getitem__(self, index: slice) -> Sequence[T]: ...

Check notice

Code scanning / CodeQL

Statement has no effect Note

This statement has no effect.

def __getitem__(self, index):
"""Get the node at the given index.

Complexity is O(n).
"""
if isinstance(index, slice):
return tuple(self)[index]
if index >= self._length or index < -self._length:
raise IndexError(
f"Index out of range: {index} not in range [-{self._length}, {self._length})"
Expand Down
9 changes: 9 additions & 0 deletions onnxscript/ir/_linked_list_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -373,6 +373,15 @@ def test_insert_after_supports_taking_elements_from_another_doubly_linked_list(
self.assertEqual(len(other_linked_list), 1)
self.assertEqual([elem.value for elem in other_linked_list], [42])

@parameterized.parameterized.expand(
[(s, t, p) for s in [-2, 0, 2, 3] for t in [2, -1, -2] for p in [-3, -1, 1, 2]]
)
def test_get_item_slice(self, start, stop, step):
elems = [_TestElement(i) for i in range(5)]
linked_list = _linked_list.DoublyLinkedSet(elems)
self.assertEqual(len(linked_list), 5)
self.assertEqual(list(linked_list[start:stop:step]), elems[start:stop:step])


if __name__ == "__main__":
unittest.main()
Loading