The variant fallback in getHighPerfCpuCountByVariant() used
countKeepingMin() while the primary frequency branch used
countDroppingMin(). Both branches are meant to return the count of
high-performance cores, so the asymmetry caused the variant branch to
return the LITTLE cluster count instead.
On big.LITTLE SoCs, when cpuinfo_max_freq is unreadable and the code
falls back to CPU variant (verified by the reporter on Helio G85 in
ggml-org/whisper.cpp#3602), whisper ends up running on the LITTLE
cores and inference throughput roughly halves.
Fix mirrors the suggestion in the issue: use countDroppingMin() in the
variant branch, matching the frequency branch. Both the Kotlin
(whisper.android) and Java (whisper.android.java) examples share the
same asymmetry and are fixed together.
* whisper : add version function
This commit adds a version function to the whisper API.
The motivation for this is that it might be convenient to have a way to
programmatically check the version.
Example usage:
```c++
printf("Using whisper version: %s\n", whisper_version());
```
Will output:
```console
Using whisper version: 1.7.6
```
* examples : add version to android example CMakeLists.txt
* android : update CMakeLists.txt to use FetchContent for ggml
This commit updates the CMakeLists.txt file for the Android Whisper
example to use FetchContent for managing the ggml library.
The motivation for this change is avoid having to make manual changes to
the CMakeLists.txt file after syncing the ggml library.
I've built and run the example locally to verify that it works as
expected.
Refs: https://github.com/ggml-org/whisper.cpp/pull/3265#issuecomment-2986715717
* android.java : update cmake to use FetchContent for ggml
This commit updates the CMake configuration for the Android Java example
to use `FetchContent` for including the `ggml` library. Do be able to
use FetchContent we also update the `compileSdkVersion` and
`targetSdkVersion` to 31, and the `buildToolsVersion` to '30.0.3'.
This also required a an update to the Gradle plugin version to 7.4.0.
The motivation for this change is avoid having to make manual changes to
the CMakeLists.txt file after syncing the ggml library.
This commit add GGML_USE_CPU to built target library to enable CPU
backend.
The motivation for this that without the compile definition the CPU
backend is not enabled and the app will crash when trying to use it.
* Adding missing CMakeLists.txt include for ggm-cpu needed by whisper.android
* attempt to re-enable CI for JNI android
---------
Co-authored-by: Your Name <you@example.com>
Benchmarks are failing because JNI expects a jstring and the benchmarks
are missing a return statement (i.e., returning null). The functions
actually build a jstring but don't return it, so this seems to have been
an oversight.
This patch returns the jstring and now the benchmarks run successfully.
Fixes#1783.
Jinwei Han
Daniel Bevenius
Georgi Gerganov
Thamster
zhangjixiong
Neuman Vong
Tobrun