Skip to content

sync : ggml #2972

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.

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
merged 9 commits into from
Mar 31, 2025
Merged

sync : ggml #2972

merged 9 commits into from
Mar 31, 2025

Conversation

ggerganov
Copy link
Member

No description provided.

cmdr2 and others added 7 commits March 31, 2025 14:13
* cpu: de-duplicate some of the operators and refactor

* Fix PR comments

* Fix PR comments
If users already set CMAKE_C_COMPILER_LAUNCHER globally, setting it in
cmake again will lead to conflict and compile fail.

Signed-off-by: Jay <[email protected]>
…nd update doc (llama/12611)

* musa: fix all warnings

Signed-off-by: Xiaodong Ye <[email protected]>

* musa: enable -DLLAMA_FATAL_WARNINGS=ON in run.sh

Signed-off-by: Xiaodong Ye <[email protected]>

* musa: update ci doc (install ccache)

Signed-off-by: Xiaodong Ye <[email protected]>

* fix Windows build issue

Signed-off-by: Xiaodong Ye <[email protected]>

* Address review comments

Signed-off-by: Xiaodong Ye <[email protected]>

* Address review comments

Signed-off-by: Xiaodong Ye <[email protected]>

---------

Signed-off-by: Xiaodong Ye <[email protected]>
* metal : use constexpr in FA kernels

ggml-ci

* cont

ggml-ci

* cont : fix typedef

ggml-ci
* SYCL: Remove misleading ggml_sycl_op_flatten function

* remove trailing whitespace

* Fix L2 norm from rebase

* remove try catch block from element_wise.cpp

* remove comment from common.hp

* ggml-sycl.cpp: Add try catch sycl::exception block in compute_forward

* norm.cpp: remove try catch exception block
ggml-ci
@ggerganov ggerganov force-pushed the sync-ggml-25-03-31 branch from 4f534fc to 2e460b1 Compare March 31, 2025 11:41
@ggerganov ggerganov merged commit 0a40ae9 into master Mar 31, 2025
54 of 57 checks passed
@ggerganov ggerganov deleted the sync-ggml-25-03-31 branch March 31, 2025 11:57
danbev added a commit to danbev/whisper.cpp that referenced this pull request Mar 31, 2025
This commit updates the ggml source to include the new unary and binary
operations. I merged ggml-org#2958
which seems to have overwritten the changes to the ggml source which
were added in ggml-org#2972.

Sorry about this.
danbev added a commit that referenced this pull request Mar 31, 2025
This commit updates the ggml source to include the new unary and binary
operations. I merged #2958
which seems to have overwritten the changes to the ggml source which
were added in #2972.

Sorry about this.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants