Skip to content

feat(atenlib): index_select; trace_only ops #274

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.

Sign up for GitHub

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
justinchuby merged 9 commits into from
Jan 7, 2023
+58 −13
Merged

feat(atenlib): index_select; trace_only ops #274

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
0cc2350
feat(atenlib): index_select
justinchuby Jan 5, 2023
2891c6c
format
justinchuby Jan 5, 2023
f908cf5
Update core.py
justinchuby Jan 5, 2023
ac83ab2
Merge branch 'main' into justinchu/index-select
justinchuby Jan 5, 2023
dc23335
Disable index_select compilation
justinchuby Jan 7, 2023
e99d5b7
Merge branch 'main' into justinchu/index-select
justinchuby Jan 7, 2023
df6f875
Trace only ops
justinchuby Jan 7, 2023
1a7fa36
format
justinchuby Jan 7, 2023
e6b8a9f
Fix transpose
justinchuby Jan 7, 2023
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
15 changes: 13 additions & 2 deletions onnxscript/function_libs/torch_aten/ops/core.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@

from typing import Any, Optional, Sequence, Union

import onnx.helper

from onnxscript import BOOL, DOUBLE, FLOAT, INT64
from onnxscript.function_libs.torch_aten.registration import torch_op
from onnxscript.function_libs.torch_aten.typing import (
Expand Down Expand Up @@ -2174,10 +2176,19 @@ def aten_index_reduce(
raise NotImplementedError()


def aten_index_select(self: TensorType, dim: int, index: TensorType) -> TensorType:
@torch_op("aten::index_select")
def aten_index_select(self: TTensor, dim: int, index: TInt) -> TTensor:
# index_select(Tensor self, int dim, Tensor index) -> Tensor

raise NotImplementedError()
if op.Size(op.Shape(index)) == 0:
Copy link
Copy Markdown
Collaborator

@gramalingam gramalingam Jan 5, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Otherwise, is index expected to be 1-dimensional? Or, can it have any other rank?

Copy link
Copy Markdown
Collaborator Author

@justinchuby justinchuby Jan 5, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, it should be 1d I think.

Copy link
Copy Markdown
Collaborator Author

@justinchuby justinchuby Jan 5, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

should I do op.Reshape(index, [-1]) instead?

Copy link
Copy Markdown
Collaborator

@gramalingam gramalingam Jan 5, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, if we expect it to be 0d or 1d, I think reshape, as you mention, is a better option.

Copy link
Copy Markdown
Collaborator Author

@justinchuby justinchuby Jan 5, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done. thanks!

# Index is a scalar. Reshape it to a size 1 tensor.
index = op.Expand(
index,
op.Constant(value=onnx.helper.make_tensor("size_one", INT64.dtype, [1], [1])),
)

index = op.Cast(index, to=INT64.dtype)
return op.Gather(self, index, axis=dim)


def aten_index_select_backward(
Expand Down
1 change: 1 addition & 0 deletions onnxscript/test/function_libs/torch_aten/ops_correctness_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,6 +170,7 @@ def wrapped(fn):
"exp2": core_ops.aten_exp2,
"fmod": core_ops.aten_fmod,
"gt": core_ops.aten_gt,
"index_select": core_ops.aten_index_select,
"isinf": core_ops.aten_isinf,
"lt": core_ops.aten_lt,
"matmul": core_ops.aten_matmul,
Expand Down