Merge remote-tracking branch 'dan/master' into linux-static-onnxrunti…

…me-lib
k2-fsa · Sep 20, 2023 · e9cc91c · e9cc91c
2 parents af77939 + 6afa9c8
commit e9cc91c
Show file tree

Hide file tree

Showing 7 changed files with 348 additions and 6 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,7 +1,7 @@
 cmake_minimum_required(VERSION 3.13 FATAL_ERROR)
 project(sherpa-onnx)
 
-set(SHERPA_ONNX_VERSION "1.7.15")
+set(SHERPA_ONNX_VERSION "1.7.16")
 
 # Disable warning about
 #

diff --git a/sherpa-onnx/c-api/c-api.cc b/sherpa-onnx/c-api/c-api.cc
@@ -107,6 +107,13 @@ SherpaOnnxOnlineStream *CreateOnlineStream(
   return stream;
 }
 
+SherpaOnnxOnlineStream *CreateOnlineStreamWithHotwords(
+    const SherpaOnnxOnlineRecognizer *recognizer, const char *hotwords) {
+  SherpaOnnxOnlineStream *stream =
+      new SherpaOnnxOnlineStream(recognizer->impl->CreateStream(hotwords));
+  return stream;
+}
+
 void DestroyOnlineStream(SherpaOnnxOnlineStream *stream) { delete stream; }
 
 void AcceptWaveform(SherpaOnnxOnlineStream *stream, int32_t sample_rate,

diff --git a/sherpa-onnx/c-api/c-api.h b/sherpa-onnx/c-api/c-api.h
@@ -31,7 +31,7 @@ extern "C" {
 #define SHERPA_ONNX_IMPORT
 #endif
 #else  // WIN32
-#define SHERPA_ONNX_EXPORT
+#define SHERPA_ONNX_EXPORT __attribute__((visibility("default"))) 
 #define SHERPA_ONNX_IMPORT SHERPA_ONNX_EXPORT
 #endif
 
@@ -178,6 +178,13 @@ SHERPA_ONNX_API void DestroyOnlineRecognizer(
 SHERPA_ONNX_API SherpaOnnxOnlineStream *CreateOnlineStream(
     const SherpaOnnxOnlineRecognizer *recognizer);
 
+/// Create an online stream for accepting wave samples with the specified hot words.
+///
+/// @param recognizer  A pointer returned by CreateOnlineRecognizer()
+/// @return Return a pointer to an OnlineStream. The user has to invoke
+///         DestroyOnlineStream() to free it to avoid memory leak.
+SHERPA_ONNX_API SherpaOnnxOnlineStream *CreateOnlineStreamWithHotwords(const SherpaOnnxOnlineRecognizer *recognizer, const char *hotwords);
+
 /// Destroy an online stream.
 ///
 /// @param stream A pointer returned by CreateOnlineStream()

diff --git a/sherpa-onnx/csrc/CMakeLists.txt b/sherpa-onnx/csrc/CMakeLists.txt
@@ -85,9 +85,12 @@ set(sources
 if(SHERPA_ONNX_ENABLE_CHECK)
   list(APPEND sources log.cc)
 endif()
-
 add_library(sherpa-onnx-core ${sources})
 
+if(NOT WIN32)
+  target_link_libraries(sherpa-onnx-core -pthread)
+endif()
+
 if(ANDROID_NDK)
   target_link_libraries(sherpa-onnx-core android log)
 endif()
@@ -125,20 +128,24 @@ endif()
 
 add_executable(sherpa-onnx sherpa-onnx.cc)
 add_executable(sherpa-onnx-offline sherpa-onnx-offline.cc)
+add_executable(sherpa-onnx-offline-parallel sherpa-onnx-offline-parallel.cc)
 
 
 target_link_libraries(sherpa-onnx sherpa-onnx-core)
 target_link_libraries(sherpa-onnx-offline sherpa-onnx-core)
+target_link_libraries(sherpa-onnx-offline-parallel sherpa-onnx-core)
 if(NOT WIN32)
   target_link_libraries(sherpa-onnx "-Wl,-rpath,${SHERPA_ONNX_RPATH_ORIGIN}/../lib")
   target_link_libraries(sherpa-onnx "-Wl,-rpath,${SHERPA_ONNX_RPATH_ORIGIN}/../../../sherpa_onnx/lib")
 
   target_link_libraries(sherpa-onnx-offline "-Wl,-rpath,${SHERPA_ONNX_RPATH_ORIGIN}/../lib")
   target_link_libraries(sherpa-onnx-offline "-Wl,-rpath,${SHERPA_ONNX_RPATH_ORIGIN}/../../../sherpa_onnx/lib")
+  target_link_libraries(sherpa-onnx-offline-parallel "-Wl,-rpath,${SHERPA_ONNX_RPATH_ORIGIN}/../../../sherpa_onnx/lib")
 
   if(SHERPA_ONNX_ENABLE_PYTHON)
     target_link_libraries(sherpa-onnx "-Wl,-rpath,${SHERPA_ONNX_RPATH_ORIGIN}/../lib/python${PYTHON_VERSION}/site-packages/sherpa_onnx/lib")
     target_link_libraries(sherpa-onnx-offline "-Wl,-rpath,${SHERPA_ONNX_RPATH_ORIGIN}/../lib/python${PYTHON_VERSION}/site-packages/sherpa_onnx/lib")
+    target_link_libraries(sherpa-onnx-offline-parallel "-Wl,-rpath,${SHERPA_ONNX_RPATH_ORIGIN}/../lib/python${PYTHON_VERSION}/site-packages/sherpa_onnx/lib")
   endif()
 endif()
 
@@ -156,6 +163,7 @@ install(
   TARGETS
     sherpa-onnx
     sherpa-onnx-offline
+    sherpa-onnx-offline-parallel
   DESTINATION
     bin
 )

diff --git a/sherpa-onnx/csrc/offline-whisper-model.cc b/sherpa-onnx/csrc/offline-whisper-model.cc
@@ -78,9 +78,11 @@ class OfflineWhisperModel::Impl {
         decoder_input.size(), decoder_output_names_ptr_.data(),
         decoder_output_names_ptr_.size());
 
-    return {std::move(decoder_out[0]),   std::move(decoder_out[1]),
-            std::move(decoder_out[2]),   std::move(decoder_input[3]),
-            std::move(decoder_input[4]), std::move(decoder_input[5])};
+    return std::tuple<Ort::Value, Ort::Value, Ort::Value, Ort::Value,
+                      Ort::Value, Ort::Value>{
+        std::move(decoder_out[0]),   std::move(decoder_out[1]),
+        std::move(decoder_out[2]),   std::move(decoder_input[3]),
+        std::move(decoder_input[4]), std::move(decoder_input[5])};
   }
 
   std::pair<Ort::Value, Ort::Value> GetInitialSelfKVCache() {