unified vulkan khr/nv cooperative matrix shader#6116
Merged
Conversation
Contributor
There was a problem hiding this comment.
Pull Request Overview
This pull request removes a number of shader files that implement various convolution and deconvolution operations using both NV and CM cooperative matrix extensions, moving toward a unified approach that conditionally handles VK_KHR and NV cooperative matrix features.
- Removed shader implementations for deconvolution, convolution, winograd transforms, and 1x1 convolutions that were specific to NV and CM variants.
- The changes use preprocessor conditionals (e.g. #if ncnn_VK_KHR_cooperative_matrix / #elif ncnn_VK_NV_cooperative_matrix) to manage the different cooperative matrix approaches.
Reviewed Changes
Copilot reviewed 20 out of 20 changed files in this pull request and generated no comments.
Show a summary per file
| File | Description |
|---|---|
| src/layer/vulkan/shader/deconvolution_pack4_gemm_nv_cm_16_8_8.comp | Removed NV-specific deconvolution shader |
| src/layer/vulkan/shader/deconvolution_pack4_gemm_nv_cm_16_16_16.comp | Removed NV-specific deconvolution shader |
| src/layer/vulkan/shader/deconvolution_pack4_gemm_cm_16_8_8.comp | Removed CM shader file with conditional cooperative matrix support |
| src/layer/vulkan/shader/deconvolution_pack4_gemm_cm_16_16_16.comp | Removed CM shader file with conditional cooperative matrix support |
| src/layer/vulkan/shader/convolution_pack4_gemm_nv_cm_16_8_8.comp | Removed NV-specific convolution shader |
| src/layer/vulkan/shader/convolution_pack4_gemm_nv_cm_16_16_16.comp | Removed NV-specific convolution shader |
| src/layer/vulkan/shader/convolution_pack4_gemm_cm_16_8_8.comp | Removed CM shader file with conditional cooperative matrix support |
| src/layer/vulkan/shader/convolution_pack4_gemm_cm_16_16_16.comp | Removed CM shader file with conditional cooperative matrix support |
| src/layer/vulkan/shader/convolution_pack4_3x3s1d1_winograd_gemm_nv_cm_16_8_8.comp | Removed NV-specific Winograd convolution shader |
| src/layer/vulkan/shader/convolution_pack4_3x3s1d1_winograd_gemm_nv_cm_16_16_16.comp | Removed NV-specific Winograd convolution shader |
| src/layer/vulkan/shader/convolution_pack4_3x3s1d1_winograd_gemm_cm_16_8_8.comp | Removed CM shader file with conditional cooperative matrix support for Winograd convolution |
| src/layer/vulkan/shader/convolution_pack4_3x3s1d1_winograd_gemm_cm_16_16_16.comp | Removed CM shader file with conditional cooperative matrix support for Winograd convolution |
| src/layer/vulkan/shader/convolution_pack4_1x1s1d1_nv_cm_16_8_8.comp | Removed NV-specific 1x1 convolution shader |
| src/layer/vulkan/shader/convolution_pack4_1x1s1d1_nv_cm_16_16_16.comp | Removed NV-specific 1x1 convolution shader |
| src/layer/vulkan/shader/convolution_pack4_1x1s1d1_cm_16_8_8.comp | Removed CM shader file with conditional cooperative matrix support for 1x1 convolution |
Codecov ReportAttention: Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## master #6116 +/- ##
=======================================
Coverage 95.84% 95.85%
=======================================
Files 829 829
Lines 270492 270472 -20
=======================================
+ Hits 259264 259266 +2
+ Misses 11228 11206 -22 ☔ View full report in Codecov by Sentry. 🚀 New features to boost your workflow:
|
|
The binary size change of libncnn.so (bytes)
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
No description provided.