Skip to content

Fix WebGPU subgroup config header dependency - #32672

Merged
Ti-Tai Wang (titaiwangms) merged 1 commit into
mainfrom
fix/webgpu-subgroup-config-header
Sep 17, 2026
Merged

Ti-Tai Wang (titaiwangms) merged 1 commit into
mainfrom
fix/webgpu-subgroup-config-header

Conversation

@xadupre

Copy link
Copy Markdown
Member

Description

  • Replace the transitive compute_context.h dependency in subgroup_matrix_config.h with the Dawn type header and a forward declaration of ComputeContextBase.
  • Include compute_context.h in the implementation file where the complete type is required.

Motivation and Context

#32667 added subgroup_matrix_config.h to matmul_test.cc. In WebGPU plugin builds, the old transitive include chain reached webgpu_execution_provider.h without the EP adapter precompiled header, so onnxruntime::ep::adapter::Logger was undeclared. This broke webgpu_plugin_build_x64_RelWithDebInfo both on #32667 and on main.

Keeping the implementation dependency out of the public configuration header fixes the plugin test build and avoids exposing the execution-provider header to callers that only need subgroup matrix configuration types.

Failing main run: https://github.com/microsoft/onnxruntime/actions/runs/35204008069

Testing

  • git diff --check

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Copilot AI balanced review requested due to automatic review settings September 17, 2026 12:24

Copilot AI left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

🟢 Approval recommended

The dependency split is correct, localized, and preserves runtime behavior.

Pull request overview

Fixes WebGPU plugin compilation by removing an unnecessary transitive dependency from the subgroup configuration header.

Changes:

  • Includes only Dawn WebGPU types and forward-declares ComputeContextBase.
  • Moves the full compute-context dependency into the implementation file.
File summaries
File Description
subgroup_matrix_config.h Reduces public header dependencies.
subgroup_matrix_config.cc Includes the complete compute-context definition.
Review details
  • Files reviewed: 2/2 changed files
  • Comments generated: 0
  • Review effort level: Balanced

💡 Configure MCP servers for context-aware, tailored reviews. Learn more in the docs.

@titaiwangms
Ti-Tai Wang (titaiwangms) merged commit f7d31b3 into main Sep 17, 2026
91 checks passed
@titaiwangms
Ti-Tai Wang (titaiwangms) deleted the fix/webgpu-subgroup-config-header branch September 17, 2026 22:19
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants

⌂ 换网址