ソースを参照

Build sherpa-ncnn for android by default (#45)

* build sherpa-ncnn for android

* enable gpu by default
Fangjun Kuang 2 年 前
コミット
ed57c19a7b
2 ファイル変更5 行追加4 行削除
  1. 4 3
      sherpa-ncnn/csrc/CMakeLists.txt
  2. 1 1
      sherpa-ncnn/csrc/model.h

+ 4 - 3
sherpa-ncnn/csrc/CMakeLists.txt

@@ -15,10 +15,11 @@ target_link_libraries(sherpa-ncnn-core kaldi-native-fbank-core ncnn)
 set_target_properties(sherpa-ncnn-core PROPERTIES VERSION ${SHERPA_NCNN_VERSION} SOVERSION ${SHERPA_NCNN_VERSION_MAJOR})
 install(TARGETS sherpa-ncnn-core DESTINATION lib)
 
+add_executable(sherpa-ncnn sherpa-ncnn.cc)
+target_link_libraries(sherpa-ncnn sherpa-ncnn-core)
+install(TARGETS sherpa-ncnn DESTINATION bin)
+
 if(NOT DEFINED ANDROID_ABI)
-  add_executable(sherpa-ncnn sherpa-ncnn.cc)
-  target_link_libraries(sherpa-ncnn sherpa-ncnn-core)
-  install(TARGETS sherpa-ncnn DESTINATION bin)
 
   if(SHERPA_NCNN_ENABLE_PORTAUDIO)
     add_executable(sherpa-ncnn-microphone

+ 1 - 1
sherpa-ncnn/csrc/model.h

@@ -36,7 +36,7 @@ struct ModelConfig {
   std::string joiner_param;   // path to joiner.ncnn.param
   std::string joiner_bin;     // path to joiner.ncnn.bin
   std::string tokens;         // path to tokens.txt
-  bool use_vulkan_compute = false;
+  bool use_vulkan_compute = true;
 
   ncnn::Option encoder_opt;
   ncnn::Option decoder_opt;