Skip to content
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

Jump to bottom

[draft] Xiaowu/fix bug(embedding bag) #1099

Draft
wants to merge 4 commits into
base: main
Choose a base branch
from
Draft

[draft] Xiaowu/fix bug(embedding bag) #1099

Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c871e74
Update core.py
xiaowuhu Oct 23, 2023
d91a83f
Update core.py
xiaowuhu Oct 23, 2023
2666f56
Update core.py
xiaowuhu Nov 20, 2023
95a24dd
Merge branch 'main' into xiaowu/fixBug(embedding_bag)
xiaowuhu Nov 20, 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
84 changes: 84 additions & 0 deletions onnxscript/function_libs/torch_lib/ops/core.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2849,6 +2849,90 @@
return result, offset2bag, bag_size, max_indices



def test_embedding_bag_onnx():
import numpy as np
Fixed Show fixed Hide fixed
# https://github.com/microsoft/onnxscript/issues/1056
# sample=7
weight = np.array(
[[ 1.9951, -1.1777, -3.7695, -3.3125, 8.5078],
[-3.9648, -3.2617, 4.5430, -6.7500, 1.1953],
[ 1.8193, -4.9297, 8.3438, 1.2217, 0.0352],
[-5.2812, -5.9414, -0.7295, 2.4785, -3.8496],
[ 7.2070, -0.1582, 3.8047, 1.9248, -1.8018]],
dtype=np.float16)
indices = np.array([2, 3, 1, 4, 3, 0], dtype=np.int64)
offsets = np.array([0, 3, 6], dtype=np.int64)
mode = 0 # sum
include_last_offset = True
#per_sample_weights = np.array([-2.2930, 6.2148, 3.1562, 0.0791, 6.3555], dtype=np.float16)
result, offset2bag, bag_size, max_indices = aten_embedding_bag(weight, indices, offsets, mode=mode, include_last_offset=include_last_offset)
print("result from onnx-script:")
print(result)
print(offset2bag)
print(bag_size)
print(max_indices)

def test_embedding_bag_aten():
import torch as t

Check notice

Code scanning / lintrunner

PYLINT/C0415 Note

Import outside toplevel (torch) (import-outside-toplevel)
See import-outside-toplevel. To disable, use # pylint: disable=import-outside-toplevel

weight = t.tensor(
[[ 1.9951, -1.1777, -3.7695, -3.3125, 8.5078],
[-3.9648, -3.2617, 4.5430, -6.7500, 1.1953],
[ 1.8193, -4.9297, 8.3438, 1.2217, 0.0352],
[-5.2812, -5.9414, -0.7295, 2.4785, -3.8496],
[ 7.2070, -0.1582, 3.8047, 1.9248, -1.8018]],
dtype=t.float16)

indices = t.tensor([2, 3, 1, 4, 3, 0],
dtype=t.int64)

mode = 0

offsets = t.tensor([0, 3, 6], dtype=t.int64)
mode = 0 # sum
include_last_offset = True
#per_sample_weights = t.tensor([-2.2930, 6.2148, 3.1562, 0.0791, 6.3555], dtype=t.float16)

result, offset2bag, bag_size, max_indices = t.ops.aten.embedding_bag(weight, indices, offsets, mode=mode, include_last_offset=include_last_offset)
print("result from aten:")
print(result)
print(offset2bag)
print(bag_size)
print(max_indices)

def test_embedding_bag_nn_function():
import torch as t

Check notice

Code scanning / lintrunner

PYLINT/C0415 Note

Import outside toplevel (torch) (import-outside-toplevel)
See import-outside-toplevel. To disable, use # pylint: disable=import-outside-toplevel
weight = t.tensor(

Check warning on line 2906 in onnxscript/function_libs/torch_lib/ops/core.py

View check run for this annotation

Codecov / codecov/patch

onnxscript/function_libs/torch_lib/ops/core.py#L2905-L2906 

Added lines #L2905 - L2906 were not covered by tests
[[-6.5664, 6.6250, 7.0664, -3.7344, 0.6152],
[ 4.1484, -3.7266, 3.4805, -6.2422, -2.8047],
[ 4.2734, -4.1562, -8.2344, -7.4688, 5.2734],
[-1.5381, 5.9492, -4.2812, -1.5732, -8.3672],
[-2.1719, 8.0469, -7.9883, -0.4219, -2.3633],
[ 6.2305, 8.9844, 7.4453, 3.7891, -5.0625],
[-1.5293, -8.1328, 8.6484, 1.5557, -2.3633],
[-1.9951, -3.2070, 1.2920, -1.0020, -5.2812],
[ 2.5312, 8.4453, 2.3281, -2.8750, -3.3828],
[-4.2188, -4.2266, -2.7246, -6.8555, -7.6719]], dtype=t.float16)
indices = t.tensor([4, 9, 3, 0, 3], dtype=t.int64)
offsets = t.tensor([0, 3], dtype=t.int64)
mode = 0 # sum

Check warning

Code scanning / lintrunner

PYLINT/W0612 Warning

Unused variable 'mode' (unused-variable)
See unused-variable. To disable, use # pylint: disable=unused-variable

Check warning

Code scanning / lintrunner

RUFF/F841 Warning

Local variable mode is assigned to but never used.
See https://beta.ruff.rs/docs/rules/

Check notice

Code scanning / CodeQL

Unused local variable

Variable mode is not used.
per_sample_weights = t.tensor([-2.2930, 6.2148, 3.1562, 0.0791, 6.3555], dtype=t.float16)
result = t.nn.functional.embedding_bag(indices, weight, offsets=offsets, mode="sum", per_sample_weights=per_sample_weights)
print("result from nn.functional:")
print(result)

Check warning on line 2923 in onnxscript/function_libs/torch_lib/ops/core.py

View check run for this annotation

Codecov / codecov/patch

onnxscript/function_libs/torch_lib/ops/core.py#L2917-L2923 

Added lines #L2917 - L2923 were not covered by tests


test_embedding_bag_onnx()
test_embedding_bag_aten()
#test_embedding_bag_nn_function()

exit(0)
Fixed Show fixed Hide fixed





@torch_op(
(
"aten::embedding_bag.padding_idx",
Expand Down
Loading