CS348Project/llama.cpp
5
0
Fork 0
mirror of https://github.com/ggml-org/llama.cpp.git synced 2025-10-30 08:42:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

vulkan: fix bug in coopmat1 mul_mat_id (#12316)

Browse Source 
* tests: run mul_mat_id with a larger N

* vulkan: fix bug in coopmat1 mul_mat_id
This commit is contained in:
Jeff Bolz
2025-03-12 00:59:19 -05:00
committed by GitHub
parent 10f2e81809
commit bf69cfe62f
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ggml/src/ggml-vulkan/vulkan-shaders/mul_mm.comp
View File

@@ -777,7 +777,7 @@ void main() {
[[unroll]] for (uint cm_col = 0; cm_col < cms_per_col; cm_col++) { [[unroll]] for (uint cm_col = 0; cm_col < cms_per_col; cm_col++) {
coopMatStore(sums[cm_col * cms_per_row + cm_row], coopmat_stage, warp_i * TM * TN, TM, gl_CooperativeMatrixLayoutColumnMajor); coopMatStore(sums[cm_col * cms_per_row + cm_row], coopmat_stage, warp_i * TM * TN, TM, gl_CooperativeMatrixLayoutColumnMajor);
[[unroll]] for (uint col = 0; col < BN; col += storestride) { [[unroll]] for (uint col = 0; col < TN; col += storestride) {
const uint row_i = dc + cm_col * TN + col + store_c; const uint row_i = dc + cm_col * TN + col + store_c;
if (row_i >= _ne1) break; if (row_i >= _ne1) break;

2
tests/test-backend-ops.cpp
View File

@@ -4113,7 +4113,7 @@ static std::vector<std::unique_ptr<test_case>> make_test_cases_eval() {
for (int n_mats : {4, 8}) { for (int n_mats : {4, 8}) {
for (int n_used : {1, 2, 4}) { for (int n_used : {1, 2, 4}) {
for (bool b : {false, true}) { for (bool b : {false, true}) {
for (int n : {1, 32}) { for (int n : {1, 32, 129}) {
int m = 512; int m = 512;
int k = 256; int k = 256;
test_cases.emplace_back(new test_mul_mat_id(type_a, type_b, n_mats, n_used, b, m, n, k)); test_cases.emplace_back(new test_mul_mat_id(type_a, type_b, n_mats, n_used, b, m, n, k));