tqcq/llama.cpp
0
0
Fork 0
mirror of https://github.com/ggml-org/llama.cpp.git synced 2025-07-15 15:17:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

vulkan : fix rope with partial rotation and non-cont src (#14582)

Browse Source
This commit is contained in:
Jeff Bolz
2025-07-08 08:21:21 -05:00
committed by GitHub
parent 17a1f0d2d4
commit b8eeb8741d
3 changed files with 21 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
ggml/src/ggml-vulkan/vulkan-shaders/rope_multi.comp
View File

@ -14,21 +14,19 @@ void main() {
const uint row_dst = gl_GlobalInvocationID.x; const uint row_dst = gl_GlobalInvocationID.x;
if (i0 >= p.n_dims) {
const uint i = row_dst*ne0 + i0;
data_d[i + 0] = data_a[i + 0];
data_d[i + 1] = data_a[i + 1];
return;
}
const uint row_x = row_dst % ne1; const uint row_x = row_dst % ne1;
const uint channel_x = row_dst / ne1; const uint channel_x = row_dst / ne1;
const uint idst = row_dst*ne0 + i0/2; const uint idst = row_dst*ne0 + i0/2;
const uint ix = channel_x*p.s2 + row_x*p.s1 + i0/2; const uint ix = channel_x*p.s2 + row_x*p.s1 + i0/2;
if (i0 >= p.n_dims) {
data_d[idst + i0/2 + 0] = data_a[ix + i0/2 + 0];
data_d[idst + i0/2 + 1] = data_a[ix + i0/2 + 1];
return;
}
const int sect_dims = p.sections[0] + p.sections[1] + p.sections[2] + p.sections[3]; const int sect_dims = p.sections[0] + p.sections[1] + p.sections[2] + p.sections[3];
const int sec_w = p.sections[1] + p.sections[0]; const int sec_w = p.sections[1] + p.sections[0];
const uint sector = (i0 / 2) % sect_dims; const uint sector = (i0 / 2) % sect_dims;

16
ggml/src/ggml-vulkan/vulkan-shaders/rope_neox.comp
View File

@ -13,21 +13,19 @@ void main() {
const uint row_dst = gl_GlobalInvocationID.x; const uint row_dst = gl_GlobalInvocationID.x;
if (i0 >= p.n_dims) {
const uint i = row_dst*ne0 + i0;
data_d[i + 0] = data_a[i + 0];
data_d[i + 1] = data_a[i + 1];
return;
}
const uint row_x = row_dst % ne1; const uint row_x = row_dst % ne1;
const uint channel_x = row_dst / ne1; const uint channel_x = row_dst / ne1;
const uint idst = row_dst*ne0 + i0/2; const uint idst = row_dst*ne0 + i0/2;
const uint ix = channel_x*p.s2 + row_x*p.s1 + i0/2; const uint ix = channel_x*p.s2 + row_x*p.s1 + i0/2;
if (i0 >= p.n_dims) {
data_d[idst + i0/2 + 0] = data_a[ix + i0/2 + 0];
data_d[idst + i0/2 + 1] = data_a[ix + i0/2 + 1];
return;
}
const float theta_base = data_pos[channel_x] * pow(p.theta_scale, i0/2.0f); const float theta_base = data_pos[channel_x] * pow(p.theta_scale, i0/2.0f);
const float freq_factor = p.has_ff != 0 ? data_ff[i0/2] : 1.0f; const float freq_factor = p.has_ff != 0 ? data_ff[i0/2] : 1.0f;

16
ggml/src/ggml-vulkan/vulkan-shaders/rope_norm.comp
View File

@ -13,21 +13,19 @@ void main() {
const uint row_dst = gl_GlobalInvocationID.x; const uint row_dst = gl_GlobalInvocationID.x;
if (i0 >= p.n_dims) {
const uint i = row_dst*ne0 + i0;
data_d[i + 0] = data_a[i + 0];
data_d[i + 1] = data_a[i + 1];
return;
}
const uint row_x = row_dst % ne1; const uint row_x = row_dst % ne1;
const uint channel_x = row_dst / ne1; const uint channel_x = row_dst / ne1;
const uint idst = row_dst*ne0 + i0; const uint idst = row_dst*ne0 + i0;
const uint ix = channel_x*p.s2 + row_x*p.s1 + i0; const uint ix = channel_x*p.s2 + row_x*p.s1 + i0;
if (i0 >= p.n_dims) {
data_d[idst + 0] = data_a[ix + 0];
data_d[idst + 1] = data_a[ix + 1];
return;
}
const float theta_base = data_pos[channel_x] * pow(p.theta_scale, i0/2.0f); const float theta_base = data_pos[channel_x] * pow(p.theta_scale, i0/2.0f);
const float freq_factor = p.has_ff != 0 ? data_ff[i0/2] : 1.0f; const float freq_factor = p.has_ff != 0 ? data_ff[i0/2] : 1.0f;