Skip to content

build: fix RPC, Vulkan and SYCL builds after the upstream merge #421

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
bri-prism merged 1 commit into from
Oct 30, 2026
Merged

build: fix RPC, Vulkan and SYCL builds after the upstream merge #421

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
4 changes: 2 additions & 2 deletions ggml/include/ggml-rpc.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@ extern "C" {

#define RPC_PROTO_MAJOR_VERSION 8
#define RPC_PROTO_MINOR_VERSION 0
#define RPC_PROTO_PATCH_VERSION 1
#define RPC_PROTO_PATCH_VERSION 2

#ifdef __cplusplus
static_assert(GGML_OP_COUNT == 102, "GGML_OP_COUNT has changed - update RPC_PROTO_PATCH_VERSION");
static_assert(GGML_OP_COUNT == 103, "GGML_OP_COUNT has changed - update RPC_PROTO_PATCH_VERSION");
#endif

#define GGML_RPC_MAX_SERVERS 16
Expand Down
10 changes: 8 additions & 2 deletions ggml/src/ggml-sycl/gemm.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,10 @@ class DnnlGemmWrapper {
args.insert({ DNNL_ARG_WEIGHTS, dnnl::memory(w_md, eng, const_cast<uint8_t *>(w4)) });
args.insert({ DNNL_ARG_DST, dnnl::memory(pd.dst_desc(), eng, dst) });
args.insert({ DNNL_ARG_ATTR_SCALES | DNNL_ARG_WEIGHTS, dnnl::memory(sc_md, eng, const_cast<float *>(scales)) });
args.insert({ DNNL_ARG_SCRATCHPAD, ctx.get_scratchpad_mem(pd.scratchpad_desc(), eng, q) });
const auto scratchpad_md = pd.scratchpad_desc();
ggml_sycl_pool_alloc<uint8_t> scratchpad(ctx.pool());
void * scratchpad_ptr = scratchpad_md.get_size() > 0 ? scratchpad.alloc(scratchpad_md.get_size()) : nullptr;
args.insert({ DNNL_ARG_SCRATCHPAD, dnnl::memory(scratchpad_md, eng, scratchpad_ptr) });
prim.execute(stream, args);
}

Expand All @@ -127,7 +130,10 @@ class DnnlGemmWrapper {
args.insert({ DNNL_ARG_SRC, dnnl::memory(act_md, eng, const_cast<int8_t *>(act)) });
args.insert({ DNNL_ARG_WEIGHTS, dnnl::memory(w_md, eng, const_cast<int8_t *>(w)) });
args.insert({ DNNL_ARG_DST, dnnl::memory(pd.dst_desc(), eng, dst) });
args.insert({ DNNL_ARG_SCRATCHPAD, ctx.get_scratchpad_mem(pd.scratchpad_desc(), eng, q) });
const auto scratchpad_md = pd.scratchpad_desc();
ggml_sycl_pool_alloc<uint8_t> scratchpad(ctx.pool());
void * scratchpad_ptr = scratchpad_md.get_size() > 0 ? scratchpad.alloc(scratchpad_md.get_size()) : nullptr;
args.insert({ DNNL_ARG_SCRATCHPAD, dnnl::memory(scratchpad_md, eng, scratchpad_ptr) });
prim.execute(stream, args);
}

Expand Down
9 changes: 9 additions & 0 deletions ggml/src/ggml-vulkan/ggml-vulkan-push-constants.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,6 +158,15 @@ struct vk_op_fwht_push_constants {
float scale;
};

struct vk_op_fwht_signed_push_constants {
uint32_t n_rows;
uint32_t src_offset;
uint32_t signs_offset;
uint32_t signs_ne;
uint32_t dst_offset;
float scale;
};

struct vk_op_dsv4_hc_comb_push_constants {
uint32_t n_tokens;

Expand Down
Loading