Skip to content

ggml-cpu(s390x): guard VXE-only repack helpers - #28775

Merged
taronaeo merged 1 commit into
ggml-org:masterfrom
bernardladenthin:s390x-guard-vxe-helpers
Sep 13, 2026
Merged

ggml-cpu(s390x): guard VXE-only repack helpers#28775
taronaeo merged 1 commit into
ggml-org:masterfrom
bernardladenthin:s390x-guard-vxe-helpers

Conversation

@bernardladenthin

Copy link
Copy Markdown
Contributor

Overview

On s390x without VXE/VXE2, the repack helpers vxe_dot_acc, vxe_splat_granule and vxe_fold are still compiled even though their vector intrinsics are unavailable, breaking the build.
This wraps the three helpers in the same #if defined(__VXE__) || defined(__VXE2__) guard as their call sites.

Additional information

Reported in #28667, ; @taronaeo confirmed the missing guards there.

Requirements

  • I have read and agree with the contributing guidelines
  • AI usage disclosure: YES - AI-assisted, but manually written, manually reviewed and manually committed. I take full responsibility for the changes.

@taronaeo taronaeo added the merge ready A maintainer can use this label to indicate that they consider the changes final and ready to merge. label Sep 11, 2026
@github-actions github-actions Bot added the ggml changes relating to the ggml tensor library for machine learning label Sep 11, 2026
taronaeo added a commit to taronaeo/llama.cpp-s390x that referenced this pull request Sep 13, 2026
Signed-off-by: Aaron Teo <aaron.teo1@ibm.com>
@taronaeo
taronaeo merged commit 6978052 into ggml-org:master Sep 13, 2026
29 of 30 checks passed
taronaeo added a commit to taronaeo/llama.cpp-s390x that referenced this pull request Sep 13, 2026
This reverts commit d464525.

Signed-off-by: Aaron Teo <aaron.teo1@ibm.com>
taronaeo added a commit to taronaeo/llama.cpp-s390x that referenced this pull request Sep 13, 2026
Signed-off-by: Aaron Teo <aaron.teo1@ibm.com>

ggml-cpu: add unused macro to fix ci

Signed-off-by: Aaron Teo <aaron.teo1@ibm.com>

Revert "ggml-cpu: temporarily add ggml-org#28775 patch until its merged"

This reverts commit d464525.

Signed-off-by: Aaron Teo <aaron.teo1@ibm.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

ggml changes relating to the ggml tensor library for machine learning merge ready A maintainer can use this label to indicate that they consider the changes final and ready to merge.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants