Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
PaddlePaddle
DeepSpeech
提交
caf72258
D
DeepSpeech
项目概览
PaddlePaddle
/
DeepSpeech
大约 1 年 前同步成功
通知
207
Star
8425
Fork
1598
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
245
列表
看板
标记
里程碑
合并请求
3
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
D
DeepSpeech
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
245
Issue
245
列表
看板
标记
里程碑
合并请求
3
合并请求
3
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
caf72258
编写于
4月 21, 2022
作者:
H
Hui Zhang
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fix nnet model inputs and output name
上级
a655fb69
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
57 addition
and
48 deletion
+57
-48
speechx/examples/ds2_ol/decoder/ctc-prefix-beam-search-decoder-ol.cc
...mples/ds2_ol/decoder/ctc-prefix-beam-search-decoder-ol.cc
+6
-3
speechx/examples/ds2_ol/decoder/run.sh
speechx/examples/ds2_ol/decoder/run.sh
+2
-3
speechx/examples/ds2_ol/decoder/wfst-decoder-ol.cc
speechx/examples/ds2_ol/decoder/wfst-decoder-ol.cc
+6
-3
speechx/examples/ds2_ol/feat/CMakeLists.txt
speechx/examples/ds2_ol/feat/CMakeLists.txt
+1
-1
speechx/examples/ds2_ol/feat/cmvn-json2kaldi.cc
speechx/examples/ds2_ol/feat/cmvn-json2kaldi.cc
+42
-38
未找到文件。
speechx/examples/ds2_ol/decoder/ctc-prefix-beam-search-decoder-ol.cc
浏览文件 @
caf72258
...
...
@@ -34,10 +34,12 @@ DEFINE_int32(receptive_field_length,
DEFINE_int32
(
downsampling_rate
,
4
,
"two CNN(kernel=5) module downsampling rate."
);
DEFINE_string
(
model_input_names
,
"audio_chunk,audio_chunk_lens,chunk_state_h_box,chunk_state_c_box"
,
"model input names"
);
DEFINE_string
(
model_output_names
,
"save_infer_model/scale_0.tmp_1,save_infer_model/"
"scale_1.tmp_1,save_infer_model/scale_2.tmp_1,save_infer_model/"
"scale_3.tmp_1"
,
"softmax_0.tmp_0,tmp_5,concat_0.tmp_0,concat_1.tmp_0"
,
"model output names"
);
DEFINE_string
(
model_cache_names
,
"5-1-1024,5-1-1024"
,
"model cache names"
);
...
...
@@ -76,6 +78,7 @@ int main(int argc, char* argv[]) {
model_opts
.
model_path
=
model_path
;
model_opts
.
params_path
=
model_params
;
model_opts
.
cache_shape
=
FLAGS_model_cache_names
;
model_opts
.
input_names
=
FLAGS_model_input_names
;
model_opts
.
output_names
=
FLAGS_model_output_names
;
std
::
shared_ptr
<
ppspeech
::
PaddleNnet
>
nnet
(
new
ppspeech
::
PaddleNnet
(
model_opts
));
...
...
speechx/examples/ds2_ol/decoder/run.sh
浏览文件 @
caf72258
...
...
@@ -48,7 +48,6 @@ if [ ! -f $lm ]; then
popd
fi
feat_wspecifier
=
$exp_dir
/feats.ark
cmvn
=
$exp_dir
/cmvn.ark
...
...
@@ -57,7 +56,7 @@ export GLOG_logtostderr=1
# dump json cmvn to kaldi
cmvn-json2kaldi
\
--json_file
$ckpt_dir
/data/mean_std.json
\
--cmvn_write_path
$
exp_dir
/cmvn.ark
\
--cmvn_write_path
$
cmvn
\
--binary
=
false
echo
"convert json cmvn to kaldi ark."
...
...
@@ -66,7 +65,7 @@ echo "convert json cmvn to kaldi ark."
linear-spectrogram-wo-db-norm-ol
\
--wav_rspecifier
=
scp:
$data
/wav.scp
\
--feature_wspecifier
=
ark,t:
$feat_wspecifier
\
--cmvn_file
=
$
exp_dir
/cmvn.ark
--cmvn_file
=
$
cmvn
echo
"compute linear spectrogram feature."
# run ctc beam search decoder as streaming
...
...
speechx/examples/ds2_ol/decoder/wfst-decoder-ol.cc
浏览文件 @
caf72258
...
...
@@ -37,10 +37,12 @@ DEFINE_int32(receptive_field_length,
DEFINE_int32
(
downsampling_rate
,
4
,
"two CNN(kernel=5) module downsampling rate."
);
DEFINE_string
(
model_input_names
,
"audio_chunk,audio_chunk_lens,chunk_state_h_box,chunk_state_c_box"
,
"model input names"
);
DEFINE_string
(
model_output_names
,
"save_infer_model/scale_0.tmp_1,save_infer_model/"
"scale_1.tmp_1,save_infer_model/scale_2.tmp_1,save_infer_model/"
"scale_3.tmp_1"
,
"softmax_0.tmp_0,tmp_5,concat_0.tmp_0,concat_1.tmp_0"
,
"model output names"
);
DEFINE_string
(
model_cache_names
,
"5-1-1024,5-1-1024"
,
"model cache names"
);
...
...
@@ -79,6 +81,7 @@ int main(int argc, char* argv[]) {
model_opts
.
model_path
=
model_graph
;
model_opts
.
params_path
=
model_params
;
model_opts
.
cache_shape
=
FLAGS_model_cache_names
;
model_opts
.
input_names
=
FLAGS_model_input_names
;
model_opts
.
output_names
=
FLAGS_model_output_names
;
std
::
shared_ptr
<
ppspeech
::
PaddleNnet
>
nnet
(
new
ppspeech
::
PaddleNnet
(
model_opts
));
...
...
speechx/examples/ds2_ol/feat/CMakeLists.txt
浏览文件 @
caf72258
...
...
@@ -9,4 +9,4 @@ target_link_libraries(${bin_name} frontend kaldi-util kaldi-feat-common gflags g
set
(
bin_name cmvn-json2kaldi
)
add_executable
(
${
bin_name
}
${
CMAKE_CURRENT_SOURCE_DIR
}
/
${
bin_name
}
.cc
)
target_include_directories
(
${
bin_name
}
PRIVATE
${
SPEECHX_ROOT
}
${
SPEECHX_ROOT
}
/kaldi
)
target_link_libraries
(
${
bin_name
}
utils kaldi-util kaldi-matrix gflags glog
)
target_link_libraries
(
${
bin_name
}
utils kaldi-util kaldi-matrix gflags glog
${
DEPS
}
)
\ No newline at end of file
speechx/examples/ds2_ol/feat/cmvn-json2kaldi.cc
浏览文件 @
caf72258
...
...
@@ -14,18 +14,20 @@
// Note: Do not print/log ondemand object.
#include "base/common.h"
#include "base/flags.h"
#include "base/log.h"
#include "kaldi/matrix/kaldi-matrix.h"
#include "kaldi/util/kaldi-io.h"
#include "utils/file_utils.h"
#include "utils/simdjson.h"
// #include "boost/json.hpp"
#include <boost/json/src.hpp>
DEFINE_string
(
json_file
,
""
,
"cmvn json file"
);
DEFINE_string
(
cmvn_write_path
,
"./cmvn.ark"
,
"write cmvn"
);
DEFINE_bool
(
binary
,
true
,
"write cmvn in binary (true) or text(false)"
);
using
namespace
simdjson
;
using
namespace
boost
::
json
;
// from <boost/json.hpp>
int
main
(
int
argc
,
char
*
argv
[])
{
gflags
::
ParseCommandLineFlags
(
&
argc
,
&
argv
,
false
);
...
...
@@ -33,49 +35,51 @@ int main(int argc, char* argv[]) {
LOG
(
INFO
)
<<
"cmvn josn path: "
<<
FLAGS_json_file
;
try
{
padded_string
json
=
padded_string
::
load
(
FLAGS_json_file
);
ondemand
::
parser
parser
;
ondemand
::
document
doc
=
parser
.
iterate
(
json
)
;
ondemand
::
value
val
=
doc
;
auto
ifs
=
std
::
ifstream
(
FLAGS_json_file
);
std
::
string
json_str
=
ppspeech
::
ReadFile2String
(
FLAGS_json_file
);
auto
value
=
boost
::
json
::
parse
(
json_str
);
if
(
!
value
.
is_object
())
{
LOG
(
ERROR
)
<<
"Input json file format error."
;
}
ondemand
::
array
mean_stat
=
val
[
"mean_stat"
];
std
::
vector
<
kaldi
::
BaseFloat
>
mean_stat_vec
;
for
(
double
x
:
mean_stat
)
{
mean_stat_vec
.
push_back
(
x
);
for
(
auto
obj
:
value
.
as_object
())
{
if
(
obj
.
key
()
==
"mean_stat"
)
{
LOG
(
INFO
)
<<
"mean_stat:"
<<
obj
.
value
();
}
// LOG(INFO) << mean_stat; this line will casue
// simdjson::simdjson_error("Objects and arrays can only be iterated
// when
// they are first encountered")
ondemand
::
array
var_stat
=
val
[
"var_stat"
];
std
::
vector
<
kaldi
::
BaseFloat
>
var_stat_vec
;
for
(
double
x
:
var_stat
)
{
var_stat_vec
.
push_back
(
x
);
if
(
obj
.
key
()
==
"var_stat"
)
{
LOG
(
INFO
)
<<
"var_stat: "
<<
obj
.
value
();
}
kaldi
::
int32
frame_num
=
uint64_t
(
val
[
"frame_num"
]);
LOG
(
INFO
)
<<
"nframe: "
<<
frame_num
;
size_t
mean_size
=
mean_stat_vec
.
size
();
kaldi
::
Matrix
<
double
>
cmvn_stats
(
2
,
mean_size
+
1
);
for
(
size_t
idx
=
0
;
idx
<
mean_size
;
++
idx
)
{
cmvn_stats
(
0
,
idx
)
=
mean_stat_vec
[
idx
];
cmvn_stats
(
1
,
idx
)
=
var_stat_vec
[
idx
];
if
(
obj
.
key
()
==
"frame_num"
)
{
LOG
(
INFO
)
<<
"frame_num: "
<<
obj
.
value
();
}
cmvn_stats
(
0
,
mean_size
)
=
frame_num
;
LOG
(
INFO
)
<<
cmvn_stats
;
}
boost
::
json
::
array
mean_stat
=
value
.
at
(
"mean_stat"
).
as_array
();
std
::
vector
<
kaldi
::
BaseFloat
>
mean_stat_vec
;
for
(
auto
it
=
mean_stat
.
begin
();
it
!=
mean_stat
.
end
();
it
++
)
{
mean_stat_vec
.
push_back
(
it
->
as_double
());
}
kaldi
::
WriteKaldiObject
(
cmvn_stats
,
FLAGS_cmvn_write_path
,
FLAGS_binary
);
LOG
(
INFO
)
<<
"cmvn stats have write into: "
<<
FLAGS_cmvn_write_path
;
LOG
(
INFO
)
<<
"Binary: "
<<
FLAGS_binary
;
}
catch
(
simdjson
::
simdjson_error
&
err
)
{
LOG
(
ERROR
)
<<
err
.
what
();
boost
::
json
::
array
var_stat
=
value
.
at
(
"var_stat"
).
as_array
();
std
::
vector
<
kaldi
::
BaseFloat
>
var_stat_vec
;
for
(
auto
it
=
var_stat
.
begin
();
it
!=
var_stat
.
end
();
it
++
)
{
var_stat_vec
.
push_back
(
it
->
as_double
());
}
kaldi
::
int32
frame_num
=
uint64_t
(
value
.
at
(
"frame_num"
).
as_int64
());
LOG
(
INFO
)
<<
"nframe: "
<<
frame_num
;
size_t
mean_size
=
mean_stat_vec
.
size
();
kaldi
::
Matrix
<
double
>
cmvn_stats
(
2
,
mean_size
+
1
);
for
(
size_t
idx
=
0
;
idx
<
mean_size
;
++
idx
)
{
cmvn_stats
(
0
,
idx
)
=
mean_stat_vec
[
idx
];
cmvn_stats
(
1
,
idx
)
=
var_stat_vec
[
idx
];
}
cmvn_stats
(
0
,
mean_size
)
=
frame_num
;
LOG
(
INFO
)
<<
cmvn_stats
;
kaldi
::
WriteKaldiObject
(
cmvn_stats
,
FLAGS_cmvn_write_path
,
FLAGS_binary
);
LOG
(
INFO
)
<<
"cmvn stats have write into: "
<<
FLAGS_cmvn_write_path
;
LOG
(
INFO
)
<<
"Binary: "
<<
FLAGS_binary
;
return
0
;
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录