Skip to content

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

Merged
bri-prism merged 1 commit into
prismfrom
fix/merge-release-build
Oct 30, 2026
Merged

bri-prism merged 1 commit into
prismfrom
fix/merge-release-build

Conversation

@bri-prism

Copy link
Copy Markdown
Collaborator

What

  • Fixes the release builds that broke after the upstream merge (Merge upstream master (d854d98ba) into prism #352):
    • ggml-rpc: update the GGML_OP_COUNT assert to 103 and bump RPC_PROTO_PATCH_VERSION.
    • vulkan: restore vk_op_fwht_signed_push_constants, lost when upstream moved the push-constant structs into ggml-vulkan-push-constants.h.
    • sycl: the two oneDNN GEMM paths called the removed get_scratchpad_mem; allocate the scratchpad from the pool, as upstream does in the same file.

Why

  • The Release (Prism) run for b12124 failed on 9 RPC builds, Windows Vulkan and Windows SYCL (Windows CUDA 13.3 was a toolkit-install runner flake).

Testing

  • macOS build with RPC, Vulkan and Metal enabled: configures and builds, RPC and Vulkan backends link.
  • SYCL was not built locally (no oneAPI here); the next release run covers it.

- ggml-rpc: the merged tree has 103 ops; update the GGML_OP_COUNT assert and
  bump RPC_PROTO_PATCH_VERSION.
- vulkan: restore vk_op_fwht_signed_push_constants, dropped when upstream moved
  the push-constant structs into ggml-vulkan-push-constants.h.
- sycl: the two fork oneDNN GEMM paths still called the removed
  get_scratchpad_mem; allocate the scratchpad from the pool as upstream does.
@bri-prism
bri-prism merged commit 0244744 into prism Oct 30, 2026
10 of 21 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant