whisper.android: Restore original API names.

examples/bench/bench.cpp

@@ -104,8 +104,8 @@ int main(int argc, char ** argv) {
 
     switch (params.what) {
         case 0: ret = whisper_bench_encoder(params);                break;
-        case 1: ret = whisper_print_bench_memcpy(params.n_threads);       break;
+        case 1: ret = whisper_bench_memcpy(params.n_threads);       break;
-        case 2: ret = whisper_print_bench_ggml_mul_mat(params.n_threads); break;
+        case 2: ret = whisper_bench_ggml_mul_mat(params.n_threads); break;
         default: fprintf(stderr, "error: unknown benchmark: %d\n", params.what); break;
     }
 

examples/whisper.android/app/src/main/jni/whisper/jni.c

@@ -230,7 +230,7 @@ JNIEXPORT jstring JNICALL
 Java_com_whispercppdemo_whisper_WhisperLib_00024Companion_benchMemcpy(JNIEnv *env, jobject thiz,
                                                                       jint n_threads) {
     UNUSED(thiz);
-    const char *bench_ggml_memcpy = whisper_bench_memcpy(n_threads);
+    const char *bench_ggml_memcpy = whisper_bench_memcpy_str(n_threads);
     jstring string = (*env)->NewStringUTF(env, bench_ggml_memcpy);
 }
 
@@ -238,6 +238,6 @@ JNIEXPORT jstring JNICALL
 Java_com_whispercppdemo_whisper_WhisperLib_00024Companion_benchGgmlMulMat(JNIEnv *env, jobject thiz,
                                                                           jint n_threads) {
     UNUSED(thiz);
-    const char *bench_ggml_mul_mat = whisper_bench_ggml_mul_mat(n_threads);
+    const char *bench_ggml_mul_mat = whisper_bench_ggml_mul_mat_str(n_threads);
     jstring string = (*env)->NewStringUTF(env, bench_ggml_mul_mat);
 }

whisper.cpp

@@ -4381,12 +4381,12 @@ float whisper_full_get_token_p(struct whisper_context * ctx, int i_segment, int
 // Will be removed in the future when ggml becomes a separate library
 //
 
-WHISPER_API int whisper_print_bench_memcpy(int n_threads) {
+WHISPER_API int whisper_bench_memcpy(int n_threads) {
-    fputs(whisper_bench_memcpy(n_threads), stderr);
+    fputs(whisper_bench_memcpy_str(n_threads), stderr);
     return 0;
 }
 
-WHISPER_API const char * whisper_bench_memcpy(int n_threads) {
+WHISPER_API const char * whisper_bench_memcpy_str(int n_threads) {
     static std::string s;
     s = "";
     char strbuf[256];
@@ -4439,12 +4439,12 @@ WHISPER_API const char * whisper_bench_memcpy(int n_threads) {
     return s.c_str();
 }
 
-WHISPER_API int whisper_print_bench_ggml_mul_mat(int n_threads) {
+WHISPER_API int whisper_bench_ggml_mul_mat(int n_threads) {
-    fputs(whisper_bench_ggml_mul_mat(n_threads), stderr);
+    fputs(whisper_bench_ggml_mul_mat_str(n_threads), stderr);
     return 0;
 }
 
-WHISPER_API const char * whisper_bench_ggml_mul_mat(int n_threads) {
+WHISPER_API const char * whisper_bench_ggml_mul_mat_str(int n_threads) {
     static std::string s;
     s = "";
     char strbuf[256];