DML EP RoiAlign-16 #15812

linnealovespie · 2023-05-04T22:03:51Z

Description

Add registration for DML RoiAlign-16 and tests for new coordinate_transform_mode attribute. PR 7354 is still open to fix the CPU EP version, which is why there are skipped tests right now. That will be completed separately so that, for now, we can officially support opset16 with the next release.

Motivation and Context

…ign-16

onnxruntime/core/providers/dml/OperatorAuthorHelper/OperatorHelper.h

Formatting self-consistency

fdwr

Would validate the coordinate transformation string. Otherwise LGTM.

onnxruntime/core/providers/dml/OperatorAuthorHelper/OperatorHelper.h

onnxruntime/core/providers/dml/DmlExecutionProvider/src/Operators/DmlOperatorRoiAlign.cpp

…osoft/onnxruntime into user/linneamay/roi-align-16

onnxruntime/test/providers/cpu/object_detection/roialign_test.cc

fdwr

Some comment typos. Otherwise LGTM.

onnxruntime/test/providers/cpu/object_detection/roialign_test.cc

fdwr · 2023-05-05T21:51:16Z

onnxruntime/test/providers/cpu/object_detection/roialign_test.cc

@@ -267,7 +506,194 @@ TEST(RoiAlignTest, MaxModePositive) {
  test.AddInput<float>("rois", {5, 4}, {7., 5., 7., 5., -15., -15., -15., -15., -10., 21., -10., 21., 13., 8., 13., 8., -14., 19., -14., 19.});
  test.AddInput<int64_t>("batch_indices", {5}, {0, 0, 0, 0, 0});
  test.AddOutput<float>("Y", {5, 3, 3, 4}, {2.10938f, 2.95313f, 3.375f, 2.53125f, 3.35938f, 4.70313f, 5.375f, 4.03125f, 3.51563f, 4.92188f, 5.625f, 4.21875f, 10.8984f, 15.2578f, 17.4375f, 13.0781f, 17.3568f, 24.2995f, 27.7708f, 20.8281f, 18.1641f, 25.4297f, 29.0625f, 21.7969f, 19.6875f, 27.5625f, 31.5f, 23.625f, 31.3542f, 43.8958f, 50.1667f, 37.625f, 32.8125f, 45.9375f, 52.5f, 39.375f, 0.f, 0.f, 0.f, 0.f, 0.f, 0.f, 0.f, 0.f, 0.f, 0.f, 0.f, 0.f, 25.f, 25.f, 25.f, 25.f, 25.f, 25.f, 25.f, 25.f, 25.f, 25.f, 25.f, 25.f, 50.f, 50.f, 50.f, 50.f, 50.f, 50.f, 50.f, 50.f, 50.f, 50.f, 50.f, 50.f, 5.625f, 5.625f, 5.625f, 4.57031f, 8.95833f, 8.95833f, 8.95833f, 7.27865f, 9.375f, 9.375f, 9.375f, 7.61719f, 19.6875f, 19.6875f, 19.6875f, 15.9961f, 31.3542f, 31.3542f, 31.3542f, 25.4753f, 32.8125f, 32.8125f, 32.8125f, 26.6602f, 33.75f, 33.75f, 33.75f, 27.4219f, 53.75f, 53.75f, 53.75f, 43.6719f, 56.25f, 56.25f, 56.25f, 45.7031f, 4.5f, 3.9375f, 2.8125f, 3.9375f, 5.5f, 4.8125f, 3.4375f, 4.8125f, 4.58333f, 4.01042f, 2.86458f, 3.9375f, 23.25f, 20.3438f, 14.5313f, 18.f, 28.4167f, 24.86458f, 17.76042f, 22.f, 23.25f, 20.3437f, 14.5312f, 18.f, 42.f, 36.75f, 26.25f, 32.0625f, 51.3333f, 44.9167f, 32.08333f, 39.1875f, 42.f, 36.75f, 26.25f, 32.0625f, 4.375f, 4.375f, 4.375f, 4.375f, 7.70833f, 7.70833f, 7.70833f, 7.70833f, 9.375f, 9.375f, 9.375f, 9.375f, 21.875f, 21.875f, 21.875f, 21.875f, 26.9792f, 26.9792f, 26.9792f, 26.9792f, 32.8125f, 32.8125f, 32.8125f, 32.8125f, 40.1042f, 40.1042f, 40.1042f, 40.1042f, 46.25f, 46.25f, 46.25f, 46.25f, 56.25f, 56.25f, 56.25f, 56.25f});
-
+  // As per ort issue #3428, the above output values are INCORRECT.


Suggested change

// As per ort issue #3428, the above output values are INCORRECT.

// As per ORT issue https://github.com/microsoft/onnxruntime/issues/6921, the above output values are INCORRECT.

This comment was resolved, but it still points to the old incorrect issue (3428 is a random CNTK to ONNX converter bug). Elsewhere too.

Comment typos.

…osoft/onnxruntime into user/linneamay/roi-align-16

fdwr · 2023-05-08T23:42:22Z

onnxruntime/test/providers/cpu/object_detection/roialign_test.cc

@@ -30,7 +29,241 @@ TEST(RoiAlignTest, AvgModePositive) {
  test.AddInput<float>("rois", {5, 4}, {7., 5., 7., 5., -15., -15., -15., -15., -10., 21., -10., 21., 13., 8., 13., 8., -14., 19., -14., 19.});
  test.AddInput<int64_t>("batch_indices", {5}, {0, 0, 0, 0, 0});
  test.AddOutput<float>("Y", {5, 3, 3, 4}, {2.95833f, 3.20833f, 3.45833f, 3.70833f, 4.625f, 4.875f, 5.125f, 5.375f, 6.29167f, 6.54167f, 6.79167f, 7.04167f, 27.9583f, 28.2083f, 28.4583f, 28.7083f, 29.625f, 29.875f, 30.125f, 30.375f, 31.2917f, 31.5417f, 31.7917f, 32.0417f, 52.9583f, 53.2083f, 53.4583f, 53.7083f, 54.625f, 54.875f, 55.125f, 55.375f, 56.2917f, 56.5417f, 56.7917f, 57.0417f, 0.f, 0.f, 0.f, 0.f, 0.f, 0.f, 0.f, 0.f, 0.f, 0.f, 0.f, 0.f, 25.f, 25.f, 25.f, 25.f, 25.f, 25.f, 25.f, 25.f, 25.f, 25.f, 25.f, 25.f, 50.f, 50.f, 50.f, 50.f, 50.f, 50.f, 50.f, 50.f, 50.f, 50.f, 50.f, 50.f, 7.39583f, 7.39583f, 7.42708f, 7.64583f, 9.0625f, 9.0625f, 9.09375f, 9.3125f, 10.7292f, 10.7292f, 10.7604f, 10.9792f, 32.3958f, 32.3958f, 32.4271f, 32.6458f, 34.0625f, 34.0625f, 34.0938f, 34.3125f, 35.7292f, 35.7292f, 35.7604f, 35.9792f, 57.3958f, 57.3958f, 57.4271f, 57.6458f, 59.0625f, 59.0625f, 59.0938f, 59.3125f, 60.7292f, 60.7292f, 60.7604f, 60.9792f, 4.27083f, 4.52083f, 4.77083f, 5.02083f, 5.9375f, 6.1875f, 6.4375f, 6.6875f, 7.60417f, 7.85417f, 8.10417f, 8.35417f, 29.2708f, 29.5208f, 29.7708f, 30.0208f, 30.9375f, 31.1875f, 31.4375f, 31.6875f, 32.6042f, 32.8542f, 33.1042f, 33.3542f, 54.2708f, 54.5208f, 54.7708f, 55.0208f, 55.9375f, 56.1875f, 56.4375f, 56.6875f, 57.6042f, 57.8542f, 58.1042f, 58.3542f, 6.77083f, 6.77083f, 6.77083f, 6.80208f, 8.4375f, 8.4375f, 8.4375f, 8.46875f, 10.1042f, 10.1042f, 10.1042f, 10.1354f, 31.7708f, 31.7708f, 31.7708f, 31.8021f, 33.4375f, 33.4375f, 33.4375f, 33.4688f, 35.1042f, 35.1042f, 35.1042f, 35.1354f, 56.7708f, 56.7708f, 56.7708f, 56.8021f, 58.4375f, 58.4375f, 58.4375f, 58.4688f, 60.1042f, 60.1042f, 60.1042f, 60.1354f});
+  // As per ORT issue https://github.com/microsoft/onnxruntime/issues/6921, the above output values are INCORRECT.


Would feel cleaner to just replace the existing output values later rather than leave this comment lingering here, or to least add a clarifying comment for readers like...

// DML has the correct outputs, which are defined below. // These will replace the above outputs once https://github.com/microsoft/onnxruntime/issues/6921 is fixed.

You can also just grab the correct values from https://github.com/microsoft/onnxruntime/pull/7354/files later. Note the NOLINT keyword used in that PR will also yield much more readable formatting than the clangformat bulldozer is aware of.

"Y", {5, 3, 3, 4}, { 2.0000, 2.0000, 2.0000, 2.0000, 2.0000, 2.0000, 2.0000, 2.0000, 2.0000, 2.0000, 2.0000, 2.0000, 27.0000, 27.0000, 27.0000, 27.0000, 27.0000, 27.0000, 27.0000, 27.0000, 27.0000, 27.0000, 27.0000, 27.0000, 52.0000, 52.0000, 52.0000, 52.0000, 52.0000, 52.0000, 52.0000, 52.0000, 52.0000, 52.0000, 52.0000, 52.0000, 0.0000, 0.0000, 0.0000, 0.0000, 0.0000, 0.0000, 0.0000, 0.0000, 0.0000, 0.0000, 0.0000, 0.0000, 25.0000, 25.0000, 25.0000, 25.0000, 25.0000, 25.0000, 25.0000, 25.0000, 25.0000, 25.0000, 25.0000, 25.0000, 50.0000, 50.0000, 50.0000, 50.0000, 50.0000, 50.0000, 50.0000, 50.0000, 50.0000, 50.0000, 50.0000, 50.0000, 6.5625, 6.5625, 6.5625, 6.5625, 6.5625, 6.5625, 6.5625, 6.5625, 6.5625, 6.5625, 6.5625, 6.5625, 31.5625, 31.5625, 31.5625, 31.5625, 31.5625, 31.5625, 31.5625, 31.5625, 31.5625, 31.5625, 31.5625, 31.5625, 56.5625, 56.5625, 56.5625, 56.5625, 56.5625, 56.5625, 56.5625, 56.5625, 56.5625, 56.5625, 56.5625, 56.5625, 3.3125, 3.3125, 3.3125, 3.3125, 3.3125, 3.3125, 3.3125, 3.3125, 3.3125, 3.3125, 3.3125, 3.3125, 28.3125, 28.3125, 28.3125, 28.3125, 28.3125, 28.3125, 28.3125, 28.3125, 28.3125, 28.3125, 28.3125, 28.3125, 53.3125, 53.3125, 53.3125, 53.3125, 53.3125, 53.3125, 53.3125, 53.3125, 53.3125, 53.3125, 53.3125, 53.3125, 5.9375, 5.9375, 5.9375, 5.9375, 5.9375, 5.9375, 5.9375, 5.9375, 5.9375, 5.9375, 5.9375, 5.9375, 30.9375, 30.9375, 30.9375, 30.9375, 30.9375, 30.9375, 30.9375, 30.9375, 30.9375, 30.9375, 30.9375, 30.9375, 55.9375, 55.9375, 55.9375, 55.9375, 55.9375, 55.9375, 55.9375, 55.9375, 55.9375, 55.9375, 55.9375, 55.9375, } ); // NOLINT

…osoft/onnxruntime into user/linneamay/roi-align-16

linnealovespie · 2023-05-09T20:51:57Z

dml roialign-16

### Description  Add registration for DML RoiAlign-16 and tests for new coordinate_transform_mode attribute. PR [7354](#7354) is still open to fix the CPU EP version, which is why there are skipped tests right now. That will be completed separately so that, for now, we can officially support opset16 with the next release. ### Motivation and Context  --------- Co-authored-by: Linnea May <[email protected]> Co-authored-by: Dwayne Robinson <[email protected]>

### Description  Add registration for DML RoiAlign-16 and tests for new coordinate_transform_mode attribute. PR [7354](#7354) is still open to fix the CPU EP version, which is why there are skipped tests right now. That will be completed separately so that, for now, we can officially support opset16 with the next release. ### Motivation and Context  --------- ### Description  ### Motivation and Context  Co-authored-by: Linnea May <[email protected]> Co-authored-by: Dwayne Robinson <[email protected]>

### Description  Add registration for DML RoiAlign-16 and tests for new coordinate_transform_mode attribute. PR [7354](#7354) is still open to fix the CPU EP version, which is why there are skipped tests right now. That will be completed separately so that, for now, we can officially support opset16 with the next release. ### Motivation and Context  --------- Co-authored-by: Linnea May <[email protected]> Co-authored-by: Dwayne Robinson <[email protected]>

snnn · 2023-05-19T00:24:46Z

already in

### Description  Add registration for DML RoiAlign-16 and tests for new coordinate_transform_mode attribute. PR [7354](microsoft#7354) is still open to fix the CPU EP version, which is why there are skipped tests right now. That will be completed separately so that, for now, we can officially support opset16 with the next release. ### Motivation and Context  --------- ### Description  ### Motivation and Context  Co-authored-by: Linnea May <[email protected]> Co-authored-by: Dwayne Robinson <[email protected]>

Linnea May added 4 commits April 27, 2023 11:20

roialign

f80ccf7

roi align test

129fc79

coordinate transform tests

16ec555

Merge remote-tracking branch 'origin/main' into user/linneamay/roi-al…

00911f9

…ign-16

linnealovespie requested review from fdwr, nums11 and smk2007 May 4, 2023 22:03

fdwr reviewed May 5, 2023

View reviewed changes

onnxruntime/core/providers/dml/OperatorAuthorHelper/OperatorHelper.h Outdated Show resolved Hide resolved

Apply suggestions from code review

3a7532c

Formatting self-consistency

fdwr reviewed May 5, 2023

View reviewed changes

onnxruntime/core/providers/dml/OperatorAuthorHelper/OperatorHelper.h Outdated Show resolved Hide resolved

onnxruntime/core/providers/dml/DmlExecutionProvider/src/Operators/DmlOperatorRoiAlign.cpp Outdated Show resolved Hide resolved

Linnea May added 2 commits May 5, 2023 13:17

PR comments

74cf5c3

Merge branch 'user/linneamay/roi-align-16' of https://github.com/micr…

e2b7f66

…osoft/onnxruntime into user/linneamay/roi-align-16

fdwr reviewed May 5, 2023

View reviewed changes

onnxruntime/test/providers/cpu/object_detection/roialign_test.cc Outdated Show resolved Hide resolved

fdwr reviewed May 5, 2023

View reviewed changes

onnxruntime/test/providers/cpu/object_detection/roialign_test.cc Show resolved Hide resolved

fdwr previously approved these changes May 5, 2023

View reviewed changes

Apply suggestions from code review

03b32b8

Comment typos.

fdwr dismissed their stale review via 03b32b8 May 5, 2023 21:54

fdwr previously approved these changes May 5, 2023

View reviewed changes

Linnea May added 2 commits May 5, 2023 15:39

half-pixel test

dad6f2f

Merge branch 'user/linneamay/roi-align-16' of https://github.com/micr…

8d2b2fe

…osoft/onnxruntime into user/linneamay/roi-align-16

linnealovespie dismissed fdwr’s stale review via 8d2b2fe May 5, 2023 22:42

comment

7841491

fdwr previously approved these changes May 5, 2023

View reviewed changes

skip broken onnx test

523cc3b

linnealovespie dismissed fdwr’s stale review via 523cc3b May 8, 2023 21:01

fdwr reviewed May 8, 2023

View reviewed changes

Linnea May added 3 commits May 8, 2023 17:59

filter

7715543

Merge branch 'main' of https://github.com/microsoft/onnxruntime

f1224c6

Merge branch 'user/linneamay/roi-align-16' of https://github.com/micr…

109f81d

…osoft/onnxruntime into user/linneamay/roi-align-16

smk2007 previously approved these changes May 9, 2023

View reviewed changes

add docs

3250a02

linnealovespie dismissed smk2007’s stale review via 3250a02 May 9, 2023 16:11

smk2007 approved these changes May 9, 2023

View reviewed changes

snnn added the release:1.15 label May 9, 2023

linnealovespie closed this May 9, 2023

linnealovespie reopened this May 9, 2023

linnealovespie merged commit 95a4607 into main May 10, 2023

linnealovespie deleted the user/linneamay/roi-align-16 branch May 10, 2023 04:56

fdwr changed the title ~~User/linneamay/roi align 16~~ DML EP User/linneamay/roi align 16 May 11, 2023

fdwr changed the title ~~DML EP User/linneamay/roi align 16~~ DML EP RoiAlign-16 May 11, 2023

snnn added triage:approved Approved for cherrypicks for release and removed triage:approved Approved for cherrypicks for release release:1.15 labels May 18, 2023

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

DML EP RoiAlign-16 #15812

DML EP RoiAlign-16 #15812

linnealovespie commented May 4, 2023 •

edited

Loading

fdwr left a comment

fdwr left a comment

fdwr May 5, 2023

fdwr May 8, 2023 •

edited

Loading

fdwr May 8, 2023 •

edited

Loading

linnealovespie commented May 9, 2023

snnn commented May 19, 2023

	// As per ort issue #3428, the above output values are INCORRECT.
	// As per ORT issue https://github.com/microsoft/onnxruntime/issues/6921, the above output values are INCORRECT.

DML EP RoiAlign-16 #15812

DML EP RoiAlign-16 #15812

Conversation

linnealovespie commented May 4, 2023 • edited Loading

Description

Motivation and Context

fdwr left a comment

Choose a reason for hiding this comment

fdwr left a comment

Choose a reason for hiding this comment

fdwr May 5, 2023

Choose a reason for hiding this comment

fdwr May 8, 2023 • edited Loading

Choose a reason for hiding this comment

fdwr May 8, 2023 • edited Loading

Choose a reason for hiding this comment

linnealovespie commented May 9, 2023

snnn commented May 19, 2023

linnealovespie commented May 4, 2023 •

edited

Loading

fdwr May 8, 2023 •

edited

Loading

fdwr May 8, 2023 •

edited

Loading