Skip to content

ggml: fixes #12846 compilation error#12848

Merged
ggerganov merged 4 commits intoggml-org:masterfrom
taronaeo:fix/12846-s390x-compile-error
Apr 11, 2025
Merged

ggml: fixes #12846 compilation error#12848
ggerganov merged 4 commits intoggml-org:masterfrom
taronaeo:fix/12846-s390x-compile-error

Conversation

@taronaeo
Copy link
Collaborator

@taronaeo taronaeo commented Apr 9, 2025

Fixes the compilation error introduced in 995083e for s390x platform. Please refer to #12846 for more information.

cc: @AlekseiNikiforovIBM

@github-actions github-actions bot added the ggml changes relating to the ggml tensor library for machine learning label Apr 9, 2025
taronaeo and others added 2 commits April 9, 2025 18:46
Signed-off-by: Aaron Teo <aaron.teo1@ibm.com>

Co-authored-by: Aleksei Nikiforov <aleksei.nikiforov@ibm.com>
Signed-off-by: Aaron Teo <aaron.teo1@ibm.com>

Co-authored-by: Aleksei Nikiforov <aleksei.nikiforov@ibm.com>
@taronaeo taronaeo force-pushed the fix/12846-s390x-compile-error branch from 66e9fe0 to c2b19c8 Compare April 9, 2025 10:48
Signed-off-by: Aaron Teo <aaron.teo1@ibm.com>

Co-authored-by: Aleksei Nikiforov <aleksei.nikiforov@ibm.com>
@slaren slaren linked an issue Apr 9, 2025 that may be closed by this pull request
Signed-off-by: Aaron Teo <aaron.teo1@ibm.com>

Co-authored-by: Aleksei Nikiforov <aleksei.nikiforov@ibm.com>
@taronaeo
Copy link
Collaborator Author

Hey @slaren, thanks for reviewing this. I've updated the PR to match the comments above and if all is good, kindly merge this. Also, by any chance can #12846 be marked as "bug"? :)

@taronaeo
Copy link
Collaborator Author

Hey @ericcurtin by any chance could you help to merge this? Thank you in advance!

@ggerganov ggerganov merged commit 0fed24c into ggml-org:master Apr 11, 2025
51 checks passed
colout pushed a commit to colout/llama.cpp that referenced this pull request Apr 21, 2025
* ggml: fixes ggml-org#12846 compilation error

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

Co-authored-by: Aleksei Nikiforov <aleksei.nikiforov@ibm.com>

* ggml: add documentation for code change

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

Co-authored-by: Aleksei Nikiforov <aleksei.nikiforov@ibm.com>

* ggml: refactor to type-cast and update documentation

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

Co-authored-by: Aleksei Nikiforov <aleksei.nikiforov@ibm.com>

* ggml: update documentation to provide full issue link

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

Co-authored-by: Aleksei Nikiforov <aleksei.nikiforov@ibm.com>

---------

Co-authored-by: Aleksei Nikiforov <aleksei.nikiforov@ibm.com>
@taronaeo taronaeo mentioned this pull request May 1, 2025
4 tasks
timwu pushed a commit to timwu/llama.cpp that referenced this pull request Dec 20, 2025
* ggml: fixes ggml-org#12846 compilation error

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

Co-authored-by: Aleksei Nikiforov <aleksei.nikiforov@ibm.com>

* ggml: add documentation for code change

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

Co-authored-by: Aleksei Nikiforov <aleksei.nikiforov@ibm.com>

* ggml: refactor to type-cast and update documentation

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

Co-authored-by: Aleksei Nikiforov <aleksei.nikiforov@ibm.com>

* ggml: update documentation to provide full issue link

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

Co-authored-by: Aleksei Nikiforov <aleksei.nikiforov@ibm.com>

---------

Co-authored-by: Aleksei Nikiforov <aleksei.nikiforov@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

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Compile bug: Unable to compile on s390x (Regression Identified)

3 participants