From 8a928ffd0d7b24b0939d1b61e4d205cf23ab2c8c Mon Sep 17 00:00:00 2001 From: Georgi Gerganov Date: Wed, 18 Jun 2025 15:38:37 +0300 Subject: [PATCH 1/4] cmake : fix android build --- .../whisper.android/lib/src/main/jni/whisper/CMakeLists.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/examples/whisper.android/lib/src/main/jni/whisper/CMakeLists.txt b/examples/whisper.android/lib/src/main/jni/whisper/CMakeLists.txt index 7971e8bee1b..b54abb35007 100644 --- a/examples/whisper.android/lib/src/main/jni/whisper/CMakeLists.txt +++ b/examples/whisper.android/lib/src/main/jni/whisper/CMakeLists.txt @@ -36,6 +36,8 @@ if (NOT GGML_HOME) ${WHISPER_LIB_DIR}/ggml/src/ggml-cpu/binary-ops.cpp ${WHISPER_LIB_DIR}/ggml/src/ggml-cpu/vec.cpp ${WHISPER_LIB_DIR}/ggml/src/ggml-cpu/ops.cpp + ${WHISPER_LIB_DIR}/ggml/src/ggml-cpu/arch/arm/quants.c + ${WHISPER_LIB_DIR}/ggml/src/ggml-cpu/arch/arm/repack.cpp ) endif() From fc6d4bcfeb6befe01a8b94774da09dbbad9d4b69 Mon Sep 17 00:00:00 2001 From: Georgi Gerganov Date: Wed, 18 Jun 2025 16:13:28 +0300 Subject: [PATCH 2/4] cont : another try --- .../app/src/main/jni/whisper/CMakeLists.txt | 4 ++-- .../whisper.android/lib/src/main/jni/whisper/CMakeLists.txt | 2 -- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/examples/whisper.android.java/app/src/main/jni/whisper/CMakeLists.txt b/examples/whisper.android.java/app/src/main/jni/whisper/CMakeLists.txt index 4e96faeaaa6..5c188b760e5 100644 --- a/examples/whisper.android.java/app/src/main/jni/whisper/CMakeLists.txt +++ b/examples/whisper.android.java/app/src/main/jni/whisper/CMakeLists.txt @@ -8,14 +8,14 @@ set(WHISPER_LIB_DIR ${CMAKE_SOURCE_DIR}/../../../../../../../) set(SOURCE_FILES ${WHISPER_LIB_DIR}/ggml/src/ggml.c ${WHISPER_LIB_DIR}/ggml/src/ggml-cpu/ggml-cpu.c - ${WHISPER_LIB_DIR}/ggml/src/ggml-cpu/repack.cpp ${WHISPER_LIB_DIR}/ggml/src/ggml-cpu/traits.cpp - ${WHISPER_LIB_DIR}/ggml/src/ggml-cpu/quants.c ${WHISPER_LIB_DIR}/ggml/src/ggml-cpu/ggml-cpu.cpp ${WHISPER_LIB_DIR}/ggml/src/ggml-cpu/unary-ops.cpp ${WHISPER_LIB_DIR}/ggml/src/ggml-cpu/binary-ops.cpp ${WHISPER_LIB_DIR}/ggml/src/ggml-cpu/vec.cpp ${WHISPER_LIB_DIR}/ggml/src/ggml-cpu/ops.cpp + ${WHISPER_LIB_DIR}/ggml/src/ggml-cpu/arch/arm/quants.c + ${WHISPER_LIB_DIR}/ggml/src/ggml-cpu/arch/arm/repack.cpp ${WHISPER_LIB_DIR}/ggml/src/ggml-alloc.c ${WHISPER_LIB_DIR}/ggml/src/ggml-backend.cpp ${WHISPER_LIB_DIR}/ggml/src/ggml-backend-reg.cpp diff --git a/examples/whisper.android/lib/src/main/jni/whisper/CMakeLists.txt b/examples/whisper.android/lib/src/main/jni/whisper/CMakeLists.txt index b54abb35007..7c335cabe57 100644 --- a/examples/whisper.android/lib/src/main/jni/whisper/CMakeLists.txt +++ b/examples/whisper.android/lib/src/main/jni/whisper/CMakeLists.txt @@ -28,9 +28,7 @@ if (NOT GGML_HOME) ${WHISPER_LIB_DIR}/ggml/src/ggml-threading.cpp ${WHISPER_LIB_DIR}/ggml/src/ggml-cpu/ggml-cpu.c ${WHISPER_LIB_DIR}/ggml/src/ggml-cpu/ggml-cpu.cpp - ${WHISPER_LIB_DIR}/ggml/src/ggml-cpu/repack.cpp ${WHISPER_LIB_DIR}/ggml/src/ggml-cpu/hbm.cpp - ${WHISPER_LIB_DIR}/ggml/src/ggml-cpu/quants.c ${WHISPER_LIB_DIR}/ggml/src/ggml-cpu/traits.cpp ${WHISPER_LIB_DIR}/ggml/src/ggml-cpu/unary-ops.cpp ${WHISPER_LIB_DIR}/ggml/src/ggml-cpu/binary-ops.cpp From 2c823bd20b929b6d1a2cf957f56bca08268602fd Mon Sep 17 00:00:00 2001 From: Daniel Bevenius Date: Thu, 19 Jun 2025 06:41:30 +0200 Subject: [PATCH 3/4] example : attempt to fix android builds With these changes I was able to build the android examples locally. --- .../app/src/main/jni/whisper/CMakeLists.txt | 3 +++ .../whisper.android/lib/src/main/jni/whisper/CMakeLists.txt | 2 ++ 2 files changed, 5 insertions(+) diff --git a/examples/whisper.android.java/app/src/main/jni/whisper/CMakeLists.txt b/examples/whisper.android.java/app/src/main/jni/whisper/CMakeLists.txt index 5c188b760e5..cc1e3006a0c 100644 --- a/examples/whisper.android.java/app/src/main/jni/whisper/CMakeLists.txt +++ b/examples/whisper.android.java/app/src/main/jni/whisper/CMakeLists.txt @@ -9,6 +9,9 @@ set(SOURCE_FILES ${WHISPER_LIB_DIR}/ggml/src/ggml.c ${WHISPER_LIB_DIR}/ggml/src/ggml-cpu/ggml-cpu.c ${WHISPER_LIB_DIR}/ggml/src/ggml-cpu/traits.cpp + ${WHISPER_LIB_DIR}/ggml/src/ggml-cpu/arch/arm/quants.c + ${WHISPER_LIB_DIR}/ggml/src/ggml-cpu/arch/arm/repack.cpp + ${WHISPER_LIB_DIR}/ggml/src/ggml-cpu/quants.c ${WHISPER_LIB_DIR}/ggml/src/ggml-cpu/ggml-cpu.cpp ${WHISPER_LIB_DIR}/ggml/src/ggml-cpu/unary-ops.cpp ${WHISPER_LIB_DIR}/ggml/src/ggml-cpu/binary-ops.cpp diff --git a/examples/whisper.android/lib/src/main/jni/whisper/CMakeLists.txt b/examples/whisper.android/lib/src/main/jni/whisper/CMakeLists.txt index 7c335cabe57..6549c54e305 100644 --- a/examples/whisper.android/lib/src/main/jni/whisper/CMakeLists.txt +++ b/examples/whisper.android/lib/src/main/jni/whisper/CMakeLists.txt @@ -36,6 +36,8 @@ if (NOT GGML_HOME) ${WHISPER_LIB_DIR}/ggml/src/ggml-cpu/ops.cpp ${WHISPER_LIB_DIR}/ggml/src/ggml-cpu/arch/arm/quants.c ${WHISPER_LIB_DIR}/ggml/src/ggml-cpu/arch/arm/repack.cpp + ${WHISPER_LIB_DIR}/ggml/src/ggml-cpu/quants.c + ) endif() From d58f5e77da1a309ddcc653fa0c3d030717cdfade Mon Sep 17 00:00:00 2001 From: Georgi Gerganov Date: Thu, 19 Jun 2025 08:53:13 +0300 Subject: [PATCH 4/4] cont : remove duplicate sources --- .../app/src/main/jni/whisper/CMakeLists.txt | 2 -- .../whisper.android/lib/src/main/jni/whisper/CMakeLists.txt | 1 - 2 files changed, 3 deletions(-) diff --git a/examples/whisper.android.java/app/src/main/jni/whisper/CMakeLists.txt b/examples/whisper.android.java/app/src/main/jni/whisper/CMakeLists.txt index cc1e3006a0c..68415f7f784 100644 --- a/examples/whisper.android.java/app/src/main/jni/whisper/CMakeLists.txt +++ b/examples/whisper.android.java/app/src/main/jni/whisper/CMakeLists.txt @@ -17,8 +17,6 @@ set(SOURCE_FILES ${WHISPER_LIB_DIR}/ggml/src/ggml-cpu/binary-ops.cpp ${WHISPER_LIB_DIR}/ggml/src/ggml-cpu/vec.cpp ${WHISPER_LIB_DIR}/ggml/src/ggml-cpu/ops.cpp - ${WHISPER_LIB_DIR}/ggml/src/ggml-cpu/arch/arm/quants.c - ${WHISPER_LIB_DIR}/ggml/src/ggml-cpu/arch/arm/repack.cpp ${WHISPER_LIB_DIR}/ggml/src/ggml-alloc.c ${WHISPER_LIB_DIR}/ggml/src/ggml-backend.cpp ${WHISPER_LIB_DIR}/ggml/src/ggml-backend-reg.cpp diff --git a/examples/whisper.android/lib/src/main/jni/whisper/CMakeLists.txt b/examples/whisper.android/lib/src/main/jni/whisper/CMakeLists.txt index 6549c54e305..cb789c42f6a 100644 --- a/examples/whisper.android/lib/src/main/jni/whisper/CMakeLists.txt +++ b/examples/whisper.android/lib/src/main/jni/whisper/CMakeLists.txt @@ -37,7 +37,6 @@ if (NOT GGML_HOME) ${WHISPER_LIB_DIR}/ggml/src/ggml-cpu/arch/arm/quants.c ${WHISPER_LIB_DIR}/ggml/src/ggml-cpu/arch/arm/repack.cpp ${WHISPER_LIB_DIR}/ggml/src/ggml-cpu/quants.c - ) endif()