Skip to content
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

Refactor Vulkan backend to allow multiple contexts #7961

Merged
merged 3 commits into from
Jun 23, 2024
Merged

Refactor Vulkan backend to allow multiple contexts #7961

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d63aca3
Refactor Vulkan backend to allow multiple contexts
0cc4m Jun 16, 2024
0a321fc
Fix too many shader groups called validation error in llama3 on AMD a…
0cc4m Jun 17, 2024
fad942b
Fix Vulkan debug build error
0cc4m Jun 19, 2024
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
39,093 changes: 19,771 additions & 19,322 deletions ggml-vulkan-shaders.hpp
View file
Open in desktop

Large diffs are not rendered by default.

2,125 changes: 1,011 additions & 1,114 deletions ggml-vulkan.cpp
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion vulkan-shaders/mul_mat_vec.comp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ layout (constant_id = 0) const uint BLOCK_SIZE = 32;
shared FLOAT_TYPE tmp[BLOCK_SIZE];

void main() {
const uint row = gl_WorkGroupID.x;
const uint row = gl_WorkGroupID.x + gl_NumWorkGroups.x * gl_WorkGroupID.z;
const uint tid = gl_LocalInvocationID.x;

uint a_offset, b_offset, d_offset;
Expand Down
2 changes: 1 addition & 1 deletion vulkan-shaders/mul_mat_vec_q2_k.comp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ layout(local_size_x = 32, local_size_y = 1, local_size_z = 1) in;
shared FLOAT_TYPE tmp[32];

void main() {
const uint row = gl_WorkGroupID.x;
const uint row = gl_WorkGroupID.x + gl_NumWorkGroups.x * gl_WorkGroupID.z;

uint a_offset, b_offset, d_offset;
get_offsets(a_offset, b_offset, d_offset);
Expand Down
2 changes: 1 addition & 1 deletion vulkan-shaders/mul_mat_vec_q3_k.comp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ layout(local_size_x = 32, local_size_y = 1, local_size_z = 1) in;
shared FLOAT_TYPE tmp[32];

void main() {
const uint row = gl_WorkGroupID.x;
const uint row = gl_WorkGroupID.x + gl_NumWorkGroups.x * gl_WorkGroupID.z;

uint a_offset, b_offset, d_offset;
get_offsets(a_offset, b_offset, d_offset);
Expand Down
2 changes: 1 addition & 1 deletion vulkan-shaders/mul_mat_vec_q4_k.comp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ layout(local_size_x = 32, local_size_y = 1, local_size_z = 1) in;
shared FLOAT_TYPE tmp[32];

void main() {
const uint row = gl_WorkGroupID.x;
const uint row = gl_WorkGroupID.x + gl_NumWorkGroups.x * gl_WorkGroupID.z;

uint a_offset, b_offset, d_offset;
get_offsets(a_offset, b_offset, d_offset);
Expand Down
2 changes: 1 addition & 1 deletion vulkan-shaders/mul_mat_vec_q5_k.comp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ layout(local_size_x = 32, local_size_y = 1, local_size_z = 1) in;
shared FLOAT_TYPE tmp[32];

void main() {
const uint row = gl_WorkGroupID.x;
const uint row = gl_WorkGroupID.x + gl_NumWorkGroups.x * gl_WorkGroupID.z;

uint a_offset, b_offset, d_offset;
get_offsets(a_offset, b_offset, d_offset);
Expand Down
2 changes: 1 addition & 1 deletion vulkan-shaders/mul_mat_vec_q6_k.comp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ layout(local_size_x = 32, local_size_y = 1, local_size_z = 1) in;
shared FLOAT_TYPE tmp[32];

void main() {
const uint row = gl_WorkGroupID.x;
const uint row = gl_WorkGroupID.x + gl_NumWorkGroups.x * gl_WorkGroupID.z;

uint a_offset, b_offset, d_offset;
get_offsets(a_offset, b_offset, d_offset);
Expand Down
Loading