pull/1769/head
Hui Zhang 2 years ago
parent 147338eec6
commit d4ffa16112

@ -14,5 +14,3 @@
import _locale import _locale
_locale._getdefaultlocale = (lambda *args: ['en_US', 'utf8']) _locale._getdefaultlocale = (lambda *args: ['en_US', 'utf8'])

@ -41,7 +41,9 @@ DEFINE_string(
DEFINE_string(model_output_names, DEFINE_string(model_output_names,
"softmax_0.tmp_0,tmp_5,concat_0.tmp_0,concat_1.tmp_0", "softmax_0.tmp_0,tmp_5,concat_0.tmp_0,concat_1.tmp_0",
"model output names"); "model output names");
DEFINE_string(model_cache_names, "chunk_state_h_box,chunk_state_c_box", "model cache names"); DEFINE_string(model_cache_names,
"chunk_state_h_box,chunk_state_c_box",
"model cache names");
DEFINE_string(model_cache_shapes, "5-1-1024,5-1-1024", "model cache shapes"); DEFINE_string(model_cache_shapes, "5-1-1024,5-1-1024", "model cache shapes");
using kaldi::BaseFloat; using kaldi::BaseFloat;

@ -44,7 +44,9 @@ DEFINE_string(
DEFINE_string(model_output_names, DEFINE_string(model_output_names,
"softmax_0.tmp_0,tmp_5,concat_0.tmp_0,concat_1.tmp_0", "softmax_0.tmp_0,tmp_5,concat_0.tmp_0,concat_1.tmp_0",
"model output names"); "model output names");
DEFINE_string(model_cache_names, "chunk_state_h_box,chunk_state_c_box", "model cache names"); DEFINE_string(model_cache_names,
"chunk_state_h_box,chunk_state_c_box",
"model cache names");
DEFINE_string(model_cache_shapes, "5-1-1024,5-1-1024", "model cache shapes"); DEFINE_string(model_cache_shapes, "5-1-1024,5-1-1024", "model cache shapes");
using kaldi::BaseFloat; using kaldi::BaseFloat;

@ -42,7 +42,7 @@ int main(int argc, char* argv[]) {
int32 num_done = 0, num_err = 0; int32 num_done = 0, num_err = 0;
// feature pipeline: wave cache --> hanning window // feature pipeline: wave cache --> hanning window
// -->linear_spectrogram --> global cmvn -> feat cache // -->linear_spectrogram --> global cmvn -> feat cache
std::unique_ptr<ppspeech::FrontendInterface> data_source( std::unique_ptr<ppspeech::FrontendInterface> data_source(

@ -43,7 +43,9 @@ DEFINE_string(
DEFINE_string(model_output_names, DEFINE_string(model_output_names,
"softmax_0.tmp_0,tmp_5,concat_0.tmp_0,concat_1.tmp_0", "softmax_0.tmp_0,tmp_5,concat_0.tmp_0,concat_1.tmp_0",
"model output names"); "model output names");
DEFINE_string(model_cache_names, "chunk_state_h_box,chunk_state_c_box", "model cache names"); DEFINE_string(model_cache_names,
"chunk_state_h_box,chunk_state_c_box",
"model cache names");
DEFINE_string(model_cache_shapes, "5-1-1024,5-1-1024", "model cache shapes"); DEFINE_string(model_cache_shapes, "5-1-1024,5-1-1024", "model cache shapes");

@ -58,7 +58,7 @@ class AudioCache : public FrontendInterface {
std::mutex mutex_; std::mutex mutex_;
std::condition_variable ready_feed_condition_; std::condition_variable ready_feed_condition_;
kaldi::int32 timeout_; // millisecond kaldi::int32 timeout_; // millisecond
bool to_float32_; // int16 -> float32. used in linear_spectrogram bool to_float32_; // int16 -> float32. used in linear_spectrogram
DISALLOW_COPY_AND_ASSIGN(AudioCache); DISALLOW_COPY_AND_ASSIGN(AudioCache);
}; };

@ -30,7 +30,7 @@ using kaldi::Matrix;
using std::vector; using std::vector;
Mfcc::Mfcc(const MfccOptions& opts, Mfcc::Mfcc(const MfccOptions& opts,
std::unique_ptr<FrontendInterface> base_extractor) std::unique_ptr<FrontendInterface> base_extractor)
: opts_(opts), : opts_(opts),
computer_(opts.mfcc_opts), computer_(opts.mfcc_opts),
window_function_(computer_.GetFrameOptions()) { window_function_(computer_.GetFrameOptions()) {

@ -206,7 +206,7 @@ void PaddleNnet::FeedForward(const Vector<BaseFloat>& features,
inferences->Resize(row * col); inferences->Resize(row * col);
*inference_dim = col; *inference_dim = col;
output_tensor->CopyToCpu(inferences->Data()); output_tensor->CopyToCpu(inferences->Data());
ReleasePredictor(predictor); ReleasePredictor(predictor);
} }

@ -24,7 +24,7 @@ namespace ppspeech {
struct ModelOptions { struct ModelOptions {
std::string model_path; std::string model_path;
std::string param_path; std::string param_path;
int thread_num; // predictor thread pool size int thread_num; // predictor thread pool size
bool use_gpu; bool use_gpu;
bool switch_ir_optim; bool switch_ir_optim;
std::string input_names; std::string input_names;

Loading…
Cancel
Save