Skip to content

fix: Pad/AveragePool fusion #23190

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
Merged
snnn merged 2 commits into from
Jan 7, 2025
Merged

fix: Pad/AveragePool fusion #23190

snnn merged 2 commits into from
Jan 7, 2025

Conversation

@mayeut
Copy link
Contributor

@mayeut mayeut commented Dec 24, 2024 •
edited
Loading

Description

Fusing Pad & AveragePool requires AveragePool to use count_include_pad=1. If the AveragePool already set some padding and count_include_pad=0, fusion can't happen.

This PR adds a condition to perform fusion depending on those attributes. If fusion occurs, count_include_pad is always set to 1.

Motivation and Context

Fix #22177 (mislabelled as a performance issue but there's an actual bug in the implementation)
Bug introduced in #21556

@mayeut
fix: Pad/AveragePool fusion
f2d0897 
Fusing Pad & AveragePool requires AveragePool to use `count_include_pad=1`.
If the AveragePool already set some padding and `count_include_pad=0`, fusion can't happen.

This PR adds a condition to perform fusion depending on those attributes. If fusion occurs,  `count_include_pad` is always set to `1`.

Fix microsoft#22177
@mayeut
Copy link
Contributor Author

mayeut commented Jan 6, 2025

@smk2007, since you reviewed #21556, can you review this one please ?

@justinchuby justinchuby requested a review from Copilot January 6, 2025 07:15
Copilot AI reviewed Jan 6, 2025
View reviewed changes
Copy link
Contributor

Copilot AI left a comment

Choose a reason for hiding this comment

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

Copilot reviewed 4 out of 6 changed files in this pull request and generated no comments.

Files not reviewed (2)
  • onnxruntime/core/optimizer/pad_fusion.cc: Language not supported
  • onnxruntime/test/optimizer/graph_transform_test.cc: Language not supported

@snnn
Copy link
Contributor

snnn commented Jan 7, 2025

/azp run Big Models, Linux Android Emulator QNN CI Pipeline, Linux CPU CI Pipeline, Linux CPU Minimal Build E2E CI Pipeline, Linux GPU CI Pipeline, Linux GPU TensorRT CI Pipeline

@snnn
Copy link
Contributor

snnn commented Jan 7, 2025

/azp run Linux OpenVINO CI Pipeline, Linux QNN CI Pipeline, MacOS CI Pipeline, ONNX Runtime Web CI Pipeline, Windows ARM64 QNN CI Pipeline, Windows CPU CI Pipeline, Windows GPU CUDA CI Pipeline

@snnn
Copy link
Contributor

snnn commented Jan 7, 2025

/azp run Windows GPU DML CI Pipeline, Windows GPU Doc Gen CI Pipeline, Windows GPU TensorRT CI Pipeline, Windows x64 QNN CI Pipeline, onnxruntime-binary-size-checks-ci-pipeline

@azure-pipelines
Copy link

azure-pipelines bot commented Jan 7, 2025

Azure Pipelines successfully started running 6 pipeline(s).

@azure-pipelines
Copy link

azure-pipelines bot commented Jan 7, 2025

Azure Pipelines successfully started running 5 pipeline(s).

@azure-pipelines
Copy link

azure-pipelines bot commented Jan 7, 2025

Azure Pipelines successfully started running 7 pipeline(s).

github-advanced-security[bot]
github-advanced-security bot found potential problems Jan 7, 2025
View reviewed changes
github-advanced-security[bot]
github-advanced-security bot found potential problems Jan 7, 2025
View reviewed changes
@mayeut
Copy link
Contributor Author

mayeut commented Jan 7, 2025

The linter issue is fixed.
The other warning relates to some disabled code in the generator that was here to check there was an issue before but not after the fix. I can remove this code and maybe add this to E2E tests somewhere ? Any advice ?

@snnn
Copy link
Contributor

snnn commented Jan 7, 2025

/azp run Big Models, Linux Android Emulator QNN CI Pipeline, Linux CPU CI Pipeline, Linux CPU Minimal Build E2E CI Pipeline, Linux GPU CI Pipeline, Linux GPU TensorRT CI Pipeline

@snnn
Copy link
Contributor

snnn commented Jan 7, 2025

/azp run Linux OpenVINO CI Pipeline, Linux QNN CI Pipeline, MacOS CI Pipeline, ONNX Runtime Web CI Pipeline, Windows ARM64 QNN CI Pipeline, Windows CPU CI Pipeline, Windows GPU CUDA CI Pipeline

@snnn
Copy link
Contributor

snnn commented Jan 7, 2025

/azp run Windows GPU DML CI Pipeline, Windows GPU Doc Gen CI Pipeline, Windows GPU TensorRT CI Pipeline, Windows x64 QNN CI Pipeline, onnxruntime-binary-size-checks-ci-pipeline

@azure-pipelines
Copy link

azure-pipelines bot commented Jan 7, 2025

Azure Pipelines successfully started running 6 pipeline(s).

@azure-pipelines
Copy link

azure-pipelines bot commented Jan 7, 2025

Azure Pipelines successfully started running 5 pipeline(s).

@azure-pipelines
Copy link

azure-pipelines bot commented Jan 7, 2025

Azure Pipelines successfully started running 7 pipeline(s).

snnn
snnn approved these changes Jan 7, 2025
View reviewed changes
Copy link
Contributor

@snnn snnn left a comment

Choose a reason for hiding this comment

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

Thanks!

@snnn
Copy link
Contributor

snnn commented Jan 7, 2025

/azp run Windows GPU DML CI Pipeline

@azure-pipelines
Copy link

azure-pipelines bot commented Jan 7, 2025

Azure Pipelines successfully started running 1 pipeline(s).

@snnn snnn merged commit 4b0cee3 into microsoft:main Jan 7, 2025
75 checks passed
snnn pushed a commit that referenced this pull request Jan 8, 2025
@mayeut
fix: Pad/AveragePool fusion (#23190)
1a1f669 
### Description
Fusing Pad & AveragePool requires AveragePool to use
`count_include_pad=1`. If the AveragePool already set some padding and
`count_include_pad=0`, fusion can't happen.

This PR adds a condition to perform fusion depending on those
attributes. If fusion occurs, `count_include_pad` is always set to `1`.

### Motivation and Context
Fix #22177 (mislabelled as a performance issue but there's an actual bug
in the implementation)
Bug introduced in #21556
tarekziade pushed a commit to tarekziade/onnxruntime that referenced this pull request Jan 10, 2025
@mayeut @tarekziade
fix: Pad/AveragePool fusion (microsoft#23190)
b4e2789 
### Description
Fusing Pad & AveragePool requires AveragePool to use
`count_include_pad=1`. If the AveragePool already set some padding and
`count_include_pad=0`, fusion can't happen.

This PR adds a condition to perform fusion depending on those
attributes. If fusion occurs, `count_include_pad` is always set to `1`.

### Motivation and Context
Fix microsoft#22177 (mislabelled as a performance issue but there's an actual bug
in the implementation)
Bug introduced in microsoft#21556
@mayeut mayeut deleted the pad-avgpool-fusion-fix branch January 10, 2025 20:13
guschmue pushed a commit that referenced this pull request Jan 12, 2025
@mayeut @guschmue
fix: Pad/AveragePool fusion (#23190)
3bfcdfa 
### Description
Fusing Pad & AveragePool requires AveragePool to use
`count_include_pad=1`. If the AveragePool already set some padding and
`count_include_pad=0`, fusion can't happen.

This PR adds a condition to perform fusion depending on those
attributes. If fusion occurs, `count_include_pad` is always set to `1`.

### Motivation and Context
Fix #22177 (mislabelled as a performance issue but there's an actual bug
in the implementation)
Bug introduced in #21556
ashrit-ms pushed a commit that referenced this pull request Mar 17, 2025
@mayeut @ashrit-ms
fix: Pad/AveragePool fusion (#23190)
d1ea174 
### Description
Fusing Pad & AveragePool requires AveragePool to use
`count_include_pad=1`. If the AveragePool already set some padding and
`count_include_pad=0`, fusion can't happen.

This PR adds a condition to perform fusion depending on those
attributes. If fusion occurs, `count_include_pad` is always set to `1`.

### Motivation and Context
Fix #22177 (mislabelled as a performance issue but there's an actual bug
in the implementation)
Bug introduced in #21556
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

Copilot code review Copilot Copilot left review comments

+1 more reviewer

@snnn snnn snnn approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

[Performance] Inconsistent Tensor Output with Optimizations Enabled/Disabled (Pad Fusion Issue)

2 participants

@mayeut @snnn