Skip to content
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

musa: remove Clang builtins mapping #9421

Merged
merged 1 commit into from
Sep 11, 2024

Conversation

yeahdongcn
Copy link
Contributor

This follow-up PR removes the Clang builtins mapping from PR #8383. MUSA compiler (mcc) now supports __vsubss4, __vsub4, __vcmpeq4, __vcmpne4 and etc.

Testing done:

  • make GGML_MUSA=1 -> passed

Signed-off-by: Xiaodong Ye <xiaodong.ye@mthreads.com>
@github-actions github-actions bot added the Nvidia GPU Issues specific to Nvidia GPUs label Sep 11, 2024
@yeahdongcn
Copy link
Contributor Author

BTW, the Ollama build (after switching to the PR branch) passed as well.

=> [musa-build-amd64 6/6] RUN --mount=type=cache,target=/root/.ccache OLLAMA_SKIP_STATIC_GENERATE=1 OLLAMA_SKIP_CPU_GENERATE=1 bash gen_linux.sh 473.7s

diff --git a/.gitmodules b/.gitmodules
index b92f645d..d94ad752 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,4 +1,5 @@
 [submodule "llama.cpp"]
        path = llm/llama.cpp
-       url = https://github.com/ggerganov/llama.cpp.git
+       url = https://github.com/makllama/llama.cpp.git
+       branch = remove_clang_builtins_mapping
        shallow = true
\ No newline at end of file
diff --git a/llm/llama.cpp b/llm/llama.cpp
index 8962422b..2963165c 160000
--- a/llm/llama.cpp
+++ b/llm/llama.cpp
@@ -1 +1 @@
-Subproject commit 8962422b1c6f9b8b15f5aeaea42600bcc2d44177
+Subproject commit 2963165ced11bc8059a49b3c63f76de9d0a2378d

@slaren slaren merged commit b34e023 into ggerganov:master Sep 11, 2024
51 checks passed
dsx1986 pushed a commit to dsx1986/llama.cpp that referenced this pull request Oct 29, 2024
Signed-off-by: Xiaodong Ye <xiaodong.ye@mthreads.com>
arthw pushed a commit to arthw/llama.cpp that referenced this pull request Nov 15, 2024
Signed-off-by: Xiaodong Ye <xiaodong.ye@mthreads.com>
arthw pushed a commit to arthw/llama.cpp that referenced this pull request Nov 18, 2024
Signed-off-by: Xiaodong Ye <xiaodong.ye@mthreads.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Nvidia GPU Issues specific to Nvidia GPUs
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants