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: fix aarch64 build #10781

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@ set(CMAKE_WARN_UNUSED_CLI YES)

set(CMAKE_EXPORT_COMPILE_COMMANDS ON)

#set(CMAKE_VERBOSE_MAKEFILE ON)

if (NOT XCODE AND NOT MSVC AND NOT CMAKE_BUILD_TYPE)
set(CMAKE_BUILD_TYPE Release CACHE STRING "Build type" FORCE)
set_property(CACHE CMAKE_BUILD_TYPE PROPERTY STRINGS "Debug" "Release" "MinSizeRel" "RelWithDebInfo")
Expand Down
4 changes: 2 additions & 2 deletions docs/build.md
Original file line number Diff line number Diff line change
Expand Up @@ -148,8 +148,8 @@ This provides GPU acceleration using the MUSA cores of your Moore Threads MTT GP
- Using `CMake`:

```bash
cmake -B build -DGGML_MUSA=ON
cmake --build build --config Release
cmake -B build -DGGML_MUSA=ON -DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++
cmake --build build --config Release -j$(($(nproc)-2))
```

The environment variable [`MUSA_VISIBLE_DEVICES`](https://docs.mthreads.com/musa-sdk/musa-sdk-doc-online/programming_guide/Z%E9%99%84%E5%BD%95/) can be used to specify which GPU(s) will be used.
Expand Down
4 changes: 4 additions & 0 deletions ggml/include/ggml-cuda.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
#pragma once

#ifdef GGML_USE_MUSA
#undef __ARM_NEON
#endif

#include "ggml.h"
#include "ggml-backend.h"

Expand Down
4 changes: 4 additions & 0 deletions ggml/src/ggml-cuda/common.cuh
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
#pragma once

#ifdef GGML_USE_MUSA
#undef __ARM_NEON
#endif

#include "ggml.h"
#include "ggml-cuda.h"

Expand Down
4 changes: 4 additions & 0 deletions ggml/src/ggml-cuda/opt-step-adamw.cu
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
#ifdef GGML_USE_MUSA
#undef __ARM_NEON
#endif

#include "ggml-impl.h"
#include "opt-step-adamw.cuh"

Expand Down
Loading