Label encoder with tensor attributes #5453

adityagoel4512 · 2023-07-30T15:37:43Z

Description

This PR adds keys_as_tensor and values_as_tensor attributes as discussed in #5412. This is intended to be in line with the approach followed when introducing tensor attributes to operators previously like TreeEnsemble* operators so converter libraries require no code change.

This requires a bump to ai.onnx.ml opset 4.

Shape inference tests can also now be applied across versions for ai.onnx.ml operators. Previously this only worked for the default domain.

In this new version of the LabelEncoder, int32_t and int16_t types are also proposed but no additional keys_*/values_* attributes are added.

Motivation and Context

Closes #5412.

Signed-off-by: Aditya Goel <agoel4512@gmail.com>

xadupre · 2023-07-31T14:20:50Z

Would it be possible to add a test case in folder https://github.com/onnx/onnx/tree/main/onnx/backend/test/case/node/ai_onnx_ml?

Signed-off-by: Aditya Goel <agoel4512@gmail.com>

docs/Changelog-ml.md

onnx/defs/traditionalml/defs.cc

onnx/test/shape_inference_test.py

Signed-off-by: Aditya Goel <agoel4512@gmail.com>

onnx/defs/shape_inference.h

onnx/defs/traditionalml/defs.cc

Signed-off-by: Aditya Goel <agoel4512@gmail.com>

onnx/defs/shape_inference.h

gramalingam

LGTM, thanks for the PR. One minor comment/nit left in the review.

Signed-off-by: Aditya Goel <agoel4512@gmail.com>

…tyagoel4512/onnx into label_encoder_with_tensor_attributes Signed-off-by: Aditya Goel <agoel4512@gmail.com>

Signed-off-by: Aditya Goel <agoel4512@gmail.com>

adityagoel4512 · 2023-08-22T21:14:43Z

Great, if resolved now can this be added to the merge queue please

### Description In #5453, we should have added support for double inputs. This PR adds double input tensor support. --------- Signed-off-by: Aditya Goel <agoel4512@gmail.com> Signed-off-by: Aditya Goel <48102515+adityagoel4512@users.noreply.github.com>

### Description  This PR adds `keys_as_tensor` and `values_as_tensor` attributes as discussed in onnx#5412. This is intended to be in line with the approach followed when introducing tensor attributes to operators previously like TreeEnsemble* operators so converter libraries require no code change. This requires a bump to `ai.onnx.ml` opset 4. Shape inference tests can also now be applied across versions for `ai.onnx.ml` operators. Previously this only worked for the default domain. In this new version of the LabelEncoder, `int32_t` and `int16_t` types are also proposed but no additional `keys_*`/`values_*` attributes are added. ### Motivation and Context Closes onnx#5412. --------- Signed-off-by: Aditya Goel <agoel4512@gmail.com> Signed-off-by: Aditya Goel <48102515+adityagoel4512@users.noreply.github.com> Signed-off-by: Corwin Joy <corwinjoy@gmail.com>

### Description In onnx#5453, we should have added support for double inputs. This PR adds double input tensor support. --------- Signed-off-by: Aditya Goel <agoel4512@gmail.com> Signed-off-by: Aditya Goel <48102515+adityagoel4512@users.noreply.github.com> Signed-off-by: Corwin Joy <corwinjoy@gmail.com>

### Description  This PR adds `keys_as_tensor` and `values_as_tensor` attributes as discussed in onnx#5412. This is intended to be in line with the approach followed when introducing tensor attributes to operators previously like TreeEnsemble* operators so converter libraries require no code change. This requires a bump to `ai.onnx.ml` opset 4. Shape inference tests can also now be applied across versions for `ai.onnx.ml` operators. Previously this only worked for the default domain. In this new version of the LabelEncoder, `int32_t` and `int16_t` types are also proposed but no additional `keys_*`/`values_*` attributes are added. ### Motivation and Context Closes onnx#5412. --------- Signed-off-by: Aditya Goel <agoel4512@gmail.com> Signed-off-by: Aditya Goel <48102515+adityagoel4512@users.noreply.github.com> Signed-off-by: Corwin Joy <corwinjoy@gmail.com>

### Description In onnx#5453, we should have added support for double inputs. This PR adds double input tensor support. --------- Signed-off-by: Aditya Goel <agoel4512@gmail.com> Signed-off-by: Aditya Goel <48102515+adityagoel4512@users.noreply.github.com> Signed-off-by: Corwin Joy <corwinjoy@gmail.com>

liqunfu · 2023-09-18T18:33:26Z

@adityagoel4512 , thank you for contributing to ONNX. Now I am preparing ONNX 1.15.0 release and integrating the release with ORT, I wonder if you have a plan to implement the runtime kernel for this updated op in ORT? If so, I will let you know once ORT has ONNX 1.15.0 integrated. Thank you in advance.
I see you also added RegexFullMatch, StringConcat, and StringSplit. Please let me know if you have plan to add implementations for these new ops in ORT. Thank you.

adityagoel4512 · 2023-09-18T18:52:22Z

Hi @liqunfu. Yes, I intend to implement the runtime kernels once ORT integrates the new ONNX release. I would appreciate being notified once this is possible.

liqunfu · 2023-09-27T17:31:56Z

Hi @liqunfu. Yes, I intend to implement the runtime kernels once ORT integrates the new ONNX release. I would appreciate being notified once this is possible.

@adityagoel4512 , onnx rel-1.15.0 branch is in ORT now. (microsoft/onnxruntime#17125). @skottmckay has mentioned to me that There are also regex and string manipulation ops in onnxruntime-extensions: onnxruntime-extensions/operators/text at main · microsoft/onnxruntime-extensions (github.com). See if it helps. Thank you, Liqun

gramalingam · 2023-10-12T16:31:06Z

Hi @liqunfu. Yes, I intend to implement the runtime kernels once ORT integrates the new ONNX release. I would appreciate being notified once this is possible.

Hi @adityagoel4512 : it would be great if you could try this. Sometimes we find minor issues with the ONNX spec that need to be fixed when we try to implement it. It would be helpful to identify this before ONNX is released. Thanks!

adityagoel4512 · 2023-10-12T18:04:09Z

Hi @liqunfu. Yes, I intend to implement the runtime kernels once ORT integrates the new ONNX release. I would appreciate being notified once this is possible.

Hi @adityagoel4512 : it would be great if you could try this. Sometimes we find minor issues with the ONNX spec that need to be fixed when we try to implement it. It would be helpful to identify this before ONNX is released. Thanks!

Will take a look! I wasn't aware ORT would support 1.15 before the ONNX release.

adityagoel4512 added 7 commits July 30, 2023 04:14

Initial implementation

eb21a21

Signed-off-by: Aditya Goel <agoel4512@gmail.com>

Remove opset upgrade

738df68

Signed-off-by: Aditya Goel <agoel4512@gmail.com>

Remove opset upgrade

c9dbac9

Signed-off-by: Aditya Goel <agoel4512@gmail.com>

Remove opset upgrade

d3963b1

Signed-off-by: Aditya Goel <agoel4512@gmail.com>

Add full stop

3146e1b

Signed-off-by: Aditya Goel <agoel4512@gmail.com>

Add full stop

5b715d6

Signed-off-by: Aditya Goel <agoel4512@gmail.com>

Skip when ONNX_ML unset

c48dc62

Signed-off-by: Aditya Goel <agoel4512@gmail.com>

adityagoel4512 marked this pull request as ready for review July 31, 2023 08:03

adityagoel4512 requested review from a team as code owners July 31, 2023 08:03

adityagoel4512 and others added 5 commits July 31, 2023 18:27

Merge branch 'main' into label_encoder_with_tensor_attributes

292f4ae

Adds LabelEncoder tests

f6aaa1c

Signed-off-by: Aditya Goel <agoel4512@gmail.com>

Adds LabelEncoder tests

7288d82

Signed-off-by: Aditya Goel <agoel4512@gmail.com>

Add otypes in reference implementation

539f6fb

Signed-off-by: Aditya Goel <agoel4512@gmail.com>

Skip ort test

5386263

Signed-off-by: Aditya Goel <agoel4512@gmail.com>

cbourjau reviewed Aug 1, 2023

View reviewed changes

docs/Changelog-ml.md Outdated Show resolved Hide resolved

onnx/defs/traditionalml/defs.cc Outdated Show resolved Hide resolved

gramalingam reviewed Aug 1, 2023

View reviewed changes

onnx/defs/traditionalml/defs.cc Outdated Show resolved Hide resolved

gramalingam reviewed Aug 1, 2023

View reviewed changes

onnx/defs/traditionalml/defs.cc Outdated Show resolved Hide resolved

gramalingam reviewed Aug 1, 2023

View reviewed changes

onnx/defs/traditionalml/defs.cc Outdated Show resolved Hide resolved

gramalingam reviewed Aug 1, 2023

View reviewed changes

onnx/defs/traditionalml/defs.cc Outdated Show resolved Hide resolved

gramalingam reviewed Aug 1, 2023

View reviewed changes

onnx/test/shape_inference_test.py Outdated Show resolved Hide resolved

adityagoel4512 and others added 4 commits August 2, 2023 16:02

Update shape inference logic

7aed8de

Signed-off-by: Aditya Goel <agoel4512@gmail.com>

Update NaN behaviour description

fead4c9

Signed-off-by: Aditya Goel <agoel4512@gmail.com>

Merge branch 'main' into label_encoder_with_tensor_attributes

57bdb91

Remove structured bindings

1cc6734

Signed-off-by: Aditya Goel <agoel4512@gmail.com>

adityagoel4512 mentioned this pull request Aug 3, 2023

Default tensor attributes #5467

Closed

xadupre reviewed Aug 4, 2023

View reviewed changes

onnx/defs/shape_inference.h Outdated Show resolved Hide resolved

xadupre reviewed Aug 4, 2023

View reviewed changes

onnx/defs/traditionalml/defs.cc Outdated Show resolved Hide resolved

xadupre reviewed Aug 4, 2023

View reviewed changes

onnx/defs/traditionalml/defs.cc Outdated Show resolved Hide resolved

adityagoel4512 and others added 4 commits August 17, 2023 13:16

Fix assignment

0e07eab

Signed-off-by: Aditya Goel <agoel4512@gmail.com>

Fix singleton check

6fa4219

Signed-off-by: Aditya Goel <agoel4512@gmail.com>

Retrigger CI

6b9724d

Signed-off-by: Aditya Goel <agoel4512@gmail.com>

Merge branch 'main' into label_encoder_with_tensor_attributes

e53ede6

gramalingam reviewed Aug 21, 2023

View reviewed changes

onnx/defs/shape_inference.h Outdated Show resolved Hide resolved

gramalingam approved these changes Aug 21, 2023

View reviewed changes

adityagoel4512 added 2 commits August 22, 2023 11:45

Suggestions

004245f

Signed-off-by: Aditya Goel <agoel4512@gmail.com>

Merge branch 'label_encoder_with_tensor_attributes' of github.com:adi…

750af66

…tyagoel4512/onnx into label_encoder_with_tensor_attributes Signed-off-by: Aditya Goel <agoel4512@gmail.com>

adityagoel4512 force-pushed the label_encoder_with_tensor_attributes branch from 9bd2062 to 750af66 Compare August 22, 2023 11:02

Merge branch 'main' into label_encoder_with_tensor_attributes

45eac0f

Signed-off-by: Aditya Goel <agoel4512@gmail.com>

adityagoel4512 force-pushed the label_encoder_with_tensor_attributes branch from a04a822 to 45eac0f Compare August 22, 2023 15:27

gramalingam added this pull request to the merge queue Aug 22, 2023

Merged via the queue into onnx:main with commit c4f68dd Aug 22, 2023

adityagoel4512 deleted the label_encoder_with_tensor_attributes branch August 23, 2023 08:58

adityagoel4512 mentioned this pull request Aug 23, 2023

Add double support to tensor attribute LabelEncoder #5521

Merged

adityagoel4512 mentioned this pull request Sep 3, 2023

Tensor Attribute Element Type Access cbourjau/ort-custom-op#10

Closed

liqunfu mentioned this pull request Sep 18, 2023

add LabelEncoder compute kernel for ORT 1.17.0 microsoft/onnxruntime#17602

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Label encoder with tensor attributes #5453

Label encoder with tensor attributes #5453

Uh oh!

adityagoel4512 commented Jul 30, 2023 •

edited

Loading

Uh oh!

xadupre commented Jul 31, 2023

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

gramalingam left a comment

Uh oh!

adityagoel4512 commented Aug 22, 2023

Uh oh!

liqunfu commented Sep 18, 2023 •

edited

Loading

Uh oh!

adityagoel4512 commented Sep 18, 2023 •

edited

Loading

Uh oh!

liqunfu commented Sep 27, 2023

Uh oh!

gramalingam commented Oct 12, 2023

Uh oh!

adityagoel4512 commented Oct 12, 2023

Uh oh!

Uh oh!

Label encoder with tensor attributes #5453

Label encoder with tensor attributes #5453

Uh oh!

Conversation

adityagoel4512 commented Jul 30, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Description

Motivation and Context

Uh oh!

xadupre commented Jul 31, 2023

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

gramalingam left a comment

Choose a reason for hiding this comment

Uh oh!

adityagoel4512 commented Aug 22, 2023

Uh oh!

liqunfu commented Sep 18, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

adityagoel4512 commented Sep 18, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

liqunfu commented Sep 27, 2023

Uh oh!

gramalingam commented Oct 12, 2023

Uh oh!

adityagoel4512 commented Oct 12, 2023

Uh oh!

Uh oh!

adityagoel4512 commented Jul 30, 2023 •

edited

Loading

liqunfu commented Sep 18, 2023 •

edited

Loading

adityagoel4512 commented Sep 18, 2023 •

edited

Loading