Skip to content

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

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

Merged
merged 1 commit into from
Jul 8, 2025
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 7 additions & 9 deletions ggml/src/ggml-vulkan/vulkan-shaders/rope_multi.comp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,21 +14,19 @@ void main() {

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 channel_x = row_dst / ne1;

const uint idst = row_dst*ne0 + 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 sec_w = p.sections[1] + p.sections[0];
const uint sector = (i0 / 2) % sect_dims;
Expand Down
16 changes: 7 additions & 9 deletions ggml/src/ggml-vulkan/vulkan-shaders/rope_neox.comp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,21 +13,19 @@ void main() {

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 channel_x = row_dst / ne1;

const uint idst = row_dst*ne0 + 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 freq_factor = p.has_ff != 0 ? data_ff[i0/2] : 1.0f;
Expand Down
16 changes: 7 additions & 9 deletions ggml/src/ggml-vulkan/vulkan-shaders/rope_norm.comp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,21 +13,19 @@ void main() {

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 channel_x = row_dst / ne1;

const uint idst = row_dst*ne0 + 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 freq_factor = p.has_ff != 0 ? data_ff[i0/2] : 1.0f;
Expand Down
Loading