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

[WebNN EP] Update WebNN normalization ops #18817

Merged
merged 6 commits into from
Jan 9, 2024
Merged

[WebNN EP] Update WebNN normalization ops #18817

merged 6 commits into from
Jan 9, 2024

Conversation

zesongw
Copy link
Contributor

@zesongw zesongw commented Dec 14, 2023

Use batchNormalization, layerNormalization and instanceNormalization instead of meanVarianceNormalization to implement normalization Ops. The spec of meanVarianceNormalization has been deleted.
Remove groupNormalization.

[WebNN EP] Update WebNN normalization ops
22c19ad 
Use batchNormalization, layerNormalization and instanceNormalization instead of meanVarianceNormalization to implement normalization Ops.
The spec of meanVarianceNormalization has been deleted.
Remove groupNormalization.
@zesongw
Copy link
Contributor Author

zesongw commented Dec 14, 2023

@fdwr, @guschmue, PTAL, thanks!

@guschmue
Copy link
Contributor

/azp run ONNX Runtime Web CI Pipeline

@guschmue
Copy link
Contributor

/azp run Linux CPU CI Pipeline,Linux CPU Minimal Build E2E CI Pipeline,Linux GPU CI Pipeline,Linux GPU TensorRT CI Pipeline,Linux OpenVINO CI Pipeline,Linux QNN CI Pipeline,MacOS CI Pipeline,Windows ARM64 QNN CI Pipeline,Windows CPU CI Pipeline

@azure-pipelines Azure Pipelines
Copy link

Azure Pipelines successfully started running 1 pipeline(s).

@guschmue
Copy link
Contributor

/azp run Windows GPU CI Pipeline,Windows GPU TensorRT CI Pipeline,onnxruntime-binary-size-checks-ci-pipeline,orttraining-linux-ci-pipeline,orttraining-linux-gpu-ci-pipeline,orttraining-ortmodule-distributed,Windows x64 QNN CI Pipeline

@guschmue guschmue added the ep:WebNN WebNN execution provider label Dec 14, 2023
@azure-pipelines Azure Pipelines
Copy link

Azure Pipelines successfully started running 7 pipeline(s).

@azure-pipelines Azure Pipelines
Copy link

Azure Pipelines successfully started running 9 pipeline(s).

guschmue
guschmue previously approved these changes Dec 14, 2023
View reviewed changes
fdwr
fdwr reviewed Dec 15, 2023
View reviewed changes
Copy link
Contributor

@fdwr fdwr left a comment

Choose a reason for hiding this comment

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

One concern for NHWC layout, but otherwise LGTM.

fdwr
fdwr previously approved these changes Dec 19, 2023
View reviewed changes
@fdwr
Copy link
Contributor

fdwr commented Dec 19, 2023

/azp run ONNX Runtime Web CI Pipeline

@fdwr
Copy link
Contributor

fdwr commented Dec 19, 2023

/azp run Linux CPU CI Pipeline,Linux CPU Minimal Build E2E CI Pipeline,Linux GPU CI Pipeline,Linux GPU TensorRT CI Pipeline,Linux OpenVINO CI Pipeline,Linux QNN CI Pipeline,MacOS CI Pipeline,Windows ARM64 QNN CI Pipeline,Windows CPU CI Pipeline

@fdwr
Copy link
Contributor

fdwr commented Dec 19, 2023

/azp run Windows GPU CI Pipeline,Windows GPU TensorRT CI Pipeline,onnxruntime-binary-size-checks-ci-pipeline,orttraining-linux-ci-pipeline,orttraining-linux-gpu-ci-pipeline,orttraining-ortmodule-distributed,Windows x64 QNN CI Pipeline

@azure-pipelines Azure Pipelines
Copy link

Azure Pipelines successfully started running 1 pipeline(s).

@azure-pipelines Azure Pipelines
Copy link

Azure Pipelines successfully started running 7 pipeline(s).

@azure-pipelines Azure Pipelines
Copy link

Azure Pipelines successfully started running 9 pipeline(s).

@Honry
Copy link
Contributor

Honry commented Dec 25, 2023

@fdwr, @zesongw, we should support InstanceNormalization for other-D input shape, e.g. All the InstanceNormalization nodes in the unet model are 3-D input shape.

image

image

@zesongw
Copy link
Contributor Author

zesongw commented Dec 26, 2023

@fdwr, @zesongw, we should support InstanceNormalization for other-D input shape, e.g. All the InstanceNormalization nodes in the unet model are 3-D input shape.

The current WebNN spec for instancenorm only supports up to 4D inputs. Higher-dimensional inputs cannot be accommodated, even with the combination of reshape and transpose ops. Support for higher dimensions will be implemented in a manner similar to the previous meanvariancenorm, which requires specifying the corresponding axes.

fdwr
fdwr reviewed Jan 4, 2024
View reviewed changes
Copy link
Contributor

@fdwr fdwr left a comment

Choose a reason for hiding this comment

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

Thanks for adding 3D/5D/6D... support. Some easy-to-address comments.

onnxruntime/core/providers/webnn/builders/impl/normalization_op_builder.cc Outdated Show resolved Hide resolved
onnxruntime/core/providers/webnn/builders/impl/normalization_op_builder.cc Outdated Show resolved Hide resolved
onnxruntime/core/providers/webnn/builders/impl/normalization_op_builder.cc Show resolved Hide resolved
onnxruntime/core/providers/webnn/builders/impl/normalization_op_builder.cc Outdated Show resolved Hide resolved
@fdwr
Copy link
Contributor

fdwr commented Jan 6, 2024

/azp run ONNX Runtime Web CI Pipeline

@fdwr
Copy link
Contributor

fdwr commented Jan 6, 2024

/azp run Linux CPU CI Pipeline,Linux CPU Minimal Build E2E CI Pipeline,Linux GPU CI Pipeline,Linux GPU TensorRT CI Pipeline,Linux OpenVINO CI Pipeline,Linux QNN CI Pipeline,MacOS CI Pipeline,Windows ARM64 QNN CI Pipeline,Windows CPU CI Pipeline

@azure-pipelines Azure Pipelines
Copy link

Azure Pipelines successfully started running 1 pipeline(s).

@fdwr
Copy link
Contributor

fdwr commented Jan 6, 2024

/azp run Windows GPU CI Pipeline,Windows GPU TensorRT CI Pipeline,onnxruntime-binary-size-checks-ci-pipeline,orttraining-linux-ci-pipeline,orttraining-linux-gpu-ci-pipeline,orttraining-ortmodule-distributed,Windows x64 QNN CI Pipeline

@azure-pipelines Azure Pipelines
Copy link

Azure Pipelines successfully started running 9 pipeline(s).

@azure-pipelines Azure Pipelines
Copy link

Azure Pipelines successfully started running 7 pipeline(s).

fdwr
fdwr approved these changes Jan 9, 2024
View reviewed changes
Copy link
Contributor

@fdwr fdwr left a comment •
edited
Loading

Choose a reason for hiding this comment

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

Thanks Zesong.

@fdwr
Copy link
Contributor

fdwr commented Jan 9, 2024

/azp run Linux CPU CI Pipeline,Linux CPU Minimal Build E2E CI Pipeline,Linux GPU CI Pipeline,Linux GPU TensorRT CI Pipeline,Linux OpenVINO CI Pipeline,Linux QNN CI Pipeline,MacOS CI Pipeline,Windows ARM64 QNN CI Pipeline,Windows CPU CI Pipeline

@fdwr
Copy link
Contributor

fdwr commented Jan 9, 2024

/azp run Windows GPU CI Pipeline,Windows GPU TensorRT CI Pipeline,onnxruntime-binary-size-checks-ci-pipeline,orttraining-linux-ci-pipeline,orttraining-linux-gpu-ci-pipeline,orttraining-ortmodule-distributed,Windows x64 QNN CI Pipeline

@fdwr
Copy link
Contributor

fdwr commented Jan 9, 2024

/azp run ONNX Runtime Web CI Pipeline

@azure-pipelines Azure Pipelines
Copy link

Azure Pipelines successfully started running 1 pipeline(s).

@azure-pipelines Azure Pipelines
Copy link

Azure Pipelines successfully started running 9 pipeline(s).

@azure-pipelines Azure Pipelines
Copy link

Azure Pipelines successfully started running 7 pipeline(s).

@fdwr fdwr merged commit eb35896 into microsoft:main Jan 9, 2024
62 of 70 checks passed
jslap-ubi pushed a commit to jslap-ubi/onnxruntime that referenced this pull request Apr 5, 2024
@jslap-ubi
[WebNN EP] Update WebNN normalization ops (microsoft#18817)
88c0cc4 
Use batchNormalization, layerNormalization and instanceNormalization
instead of meanVarianceNormalization to implement normalization Ops. The
spec of meanVarianceNormalization has been deleted.
Remove groupNormalization.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Honry Honry Honry left review comments

@fdwr fdwr fdwr approved these changes

@guschmue guschmue guschmue left review comments

Assignees
No one assigned
Labels
ep:WebNN WebNN execution provider
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@zesongw @guschmue @fdwr @Honry