Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
PaddlePaddle
models
提交
4d9d1413
M
models
项目概览
PaddlePaddle
/
models
1 年多 前同步成功
通知
222
Star
6828
Fork
2962
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
602
列表
看板
标记
里程碑
合并请求
255
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
M
models
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
602
Issue
602
列表
看板
标记
里程碑
合并请求
255
合并请求
255
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
未验证
提交
4d9d1413
编写于
3月 27, 2018
作者:
Y
Yibing Liu
提交者:
GitHub
3月 27, 2018
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #753 from kuke/kaldi_decoder
Add decoder for deep asr model
上级
745591ac
7473ec05
变更
7
显示空白变更内容
内联
并排
Showing
7 changed file
with
276 addition
and
40 deletion
+276
-40
fluid/DeepASR/decoder/decoder.cc
fluid/DeepASR/decoder/decoder.cc
+0
-21
fluid/DeepASR/decoder/post_decode_faster.cc
fluid/DeepASR/decoder/post_decode_faster.cc
+144
-0
fluid/DeepASR/decoder/post_decode_faster.h
fluid/DeepASR/decoder/post_decode_faster.h
+57
-0
fluid/DeepASR/decoder/pybind.cc
fluid/DeepASR/decoder/pybind.cc
+19
-9
fluid/DeepASR/decoder/setup.py
fluid/DeepASR/decoder/setup.py
+36
-6
fluid/DeepASR/decoder/setup.sh
fluid/DeepASR/decoder/setup.sh
+1
-1
fluid/DeepASR/infer_by_ckpt.py
fluid/DeepASR/infer_by_ckpt.py
+19
-3
未找到文件。
fluid/DeepASR/decoder/decoder.cc
已删除
100644 → 0
浏览文件 @
745591ac
/* Copyright (c) 2016 PaddlePaddle Authors. All Rights Reserved.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License. */
#include "decoder.h"
std
::
string
decode
(
std
::
vector
<
std
::
vector
<
float
>>
probs_mat
)
{
// Add decoding logic here
return
"example decoding result"
;
}
fluid/DeepASR/decoder/post_decode_faster.cc
0 → 100644
浏览文件 @
4d9d1413
/* Copyright (c) 2018 PaddlePaddle Authors. All Rights Reserved.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License. */
#include "post_decode_faster.h"
typedef
kaldi
::
int32
int32
;
using
fst
::
SymbolTable
;
using
fst
::
VectorFst
;
using
fst
::
StdArc
;
Decoder
::
Decoder
(
std
::
string
word_syms_filename
,
std
::
string
fst_in_filename
,
std
::
string
logprior_rxfilename
)
{
const
char
*
usage
=
"Decode, reading log-likelihoods (of transition-ids or whatever symbol "
"is on the graph) as matrices."
;
kaldi
::
ParseOptions
po
(
usage
);
binary
=
true
;
acoustic_scale
=
1.5
;
allow_partial
=
true
;
kaldi
::
FasterDecoderOptions
decoder_opts
;
decoder_opts
.
Register
(
&
po
,
true
);
// true == include obscure settings.
po
.
Register
(
"binary"
,
&
binary
,
"Write output in binary mode"
);
po
.
Register
(
"allow-partial"
,
&
allow_partial
,
"Produce output even when final state was not reached"
);
po
.
Register
(
"acoustic-scale"
,
&
acoustic_scale
,
"Scaling factor for acoustic likelihoods"
);
word_syms
=
NULL
;
if
(
word_syms_filename
!=
""
)
{
word_syms
=
fst
::
SymbolTable
::
ReadText
(
word_syms_filename
);
if
(
!
word_syms
)
KALDI_ERR
<<
"Could not read symbol table from file "
<<
word_syms_filename
;
}
std
::
ifstream
is_logprior
(
logprior_rxfilename
);
logprior
.
Read
(
is_logprior
,
false
);
// It's important that we initialize decode_fst after loglikes_reader, as it
// can prevent crashes on systems installed without enough virtual memory.
// It has to do with what happens on UNIX systems if you call fork() on a
// large process: the page-table entries are duplicated, which requires a
// lot of virtual memory.
decode_fst
=
fst
::
ReadFstKaldi
(
fst_in_filename
);
decoder
=
new
kaldi
::
FasterDecoder
(
*
decode_fst
,
decoder_opts
);
}
Decoder
::~
Decoder
()
{
if
(
!
word_syms
)
delete
word_syms
;
delete
decode_fst
;
delete
decoder
;
}
std
::
string
Decoder
::
decode
(
std
::
string
key
,
const
std
::
vector
<
std
::
vector
<
kaldi
::
BaseFloat
>>&
log_probs
)
{
size_t
num_frames
=
log_probs
.
size
();
size_t
dim_label
=
log_probs
[
0
].
size
();
kaldi
::
Matrix
<
kaldi
::
BaseFloat
>
loglikes
(
num_frames
,
dim_label
,
kaldi
::
kSetZero
,
kaldi
::
kStrideEqualNumCols
);
for
(
size_t
i
=
0
;
i
<
num_frames
;
++
i
)
{
memcpy
(
loglikes
.
Data
()
+
i
*
dim_label
,
log_probs
[
i
].
data
(),
sizeof
(
kaldi
::
BaseFloat
)
*
dim_label
);
}
return
decode
(
key
,
loglikes
);
}
std
::
vector
<
std
::
string
>
Decoder
::
decode
(
std
::
string
posterior_rspecifier
)
{
kaldi
::
SequentialBaseFloatMatrixReader
posterior_reader
(
posterior_rspecifier
);
std
::
vector
<
std
::
string
>
decoding_results
;
for
(;
!
posterior_reader
.
Done
();
posterior_reader
.
Next
())
{
std
::
string
key
=
posterior_reader
.
Key
();
kaldi
::
Matrix
<
kaldi
::
BaseFloat
>
loglikes
(
posterior_reader
.
Value
());
decoding_results
.
push_back
(
decode
(
key
,
loglikes
));
}
return
decoding_results
;
}
std
::
string
Decoder
::
decode
(
std
::
string
key
,
kaldi
::
Matrix
<
kaldi
::
BaseFloat
>&
loglikes
)
{
std
::
string
decoding_result
;
if
(
loglikes
.
NumRows
()
==
0
)
{
KALDI_WARN
<<
"Zero-length utterance: "
<<
key
;
}
KALDI_ASSERT
(
loglikes
.
NumCols
()
==
logprior
.
Dim
());
loglikes
.
ApplyLog
();
loglikes
.
AddVecToRows
(
-
1.0
,
logprior
);
kaldi
::
DecodableMatrixScaled
decodable
(
loglikes
,
acoustic_scale
);
decoder
->
Decode
(
&
decodable
);
VectorFst
<
kaldi
::
LatticeArc
>
decoded
;
// linear FST.
if
((
allow_partial
||
decoder
->
ReachedFinal
())
&&
decoder
->
GetBestPath
(
&
decoded
))
{
if
(
!
decoder
->
ReachedFinal
())
KALDI_WARN
<<
"Decoder did not reach end-state, outputting partial "
"traceback."
;
std
::
vector
<
int32
>
alignment
;
std
::
vector
<
int32
>
words
;
kaldi
::
LatticeWeight
weight
;
GetLinearSymbolSequence
(
decoded
,
&
alignment
,
&
words
,
&
weight
);
if
(
word_syms
!=
NULL
)
{
for
(
size_t
i
=
0
;
i
<
words
.
size
();
i
++
)
{
std
::
string
s
=
word_syms
->
Find
(
words
[
i
]);
decoding_result
+=
s
;
if
(
s
==
""
)
KALDI_ERR
<<
"Word-id "
<<
words
[
i
]
<<
" not in symbol table."
;
}
}
}
return
decoding_result
;
}
fluid/DeepASR/decoder/
decod
er.h
→
fluid/DeepASR/decoder/
post_decode_fast
er.h
浏览文件 @
4d9d1413
/* Copyright (c) 201
6
PaddlePaddle Authors. All Rights Reserved.
/* Copyright (c) 201
8
PaddlePaddle Authors. All Rights Reserved.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
...
...
@@ -14,5 +14,44 @@ limitations under the License. */
#include <string>
#include <vector>
#include "base/kaldi-common.h"
#include "base/timer.h"
#include "decoder/decodable-matrix.h"
#include "decoder/faster-decoder.h"
#include "fstext/fstext-lib.h"
#include "hmm/transition-model.h"
#include "lat/kaldi-lattice.h" // for {Compact}LatticeArc
#include "tree/context-dep.h"
#include "util/common-utils.h"
std
::
string
decode
(
std
::
vector
<
std
::
vector
<
float
>>
probs_mat
);
class
Decoder
{
public:
Decoder
(
std
::
string
word_syms_filename
,
std
::
string
fst_in_filename
,
std
::
string
logprior_rxfilename
);
~
Decoder
();
// Interface to accept the scores read from specifier and return
// the batch decoding results
std
::
vector
<
std
::
string
>
decode
(
std
::
string
posterior_rspecifier
);
// Accept the scores of one utterance and return the decoding result
std
::
string
decode
(
std
::
string
key
,
const
std
::
vector
<
std
::
vector
<
kaldi
::
BaseFloat
>>
&
log_probs
);
private:
// For decoding one utterance
std
::
string
decode
(
std
::
string
key
,
kaldi
::
Matrix
<
kaldi
::
BaseFloat
>
&
loglikes
);
fst
::
SymbolTable
*
word_syms
;
fst
::
VectorFst
<
fst
::
StdArc
>
*
decode_fst
;
kaldi
::
FasterDecoder
*
decoder
;
kaldi
::
Vector
<
kaldi
::
BaseFloat
>
logprior
;
bool
binary
;
kaldi
::
BaseFloat
acoustic_scale
;
bool
allow_partial
;
};
fluid/DeepASR/decoder/pybind.cc
浏览文件 @
4d9d1413
/* Copyright (c) 201
6
PaddlePaddle Authors. All Rights Reserved.
/* Copyright (c) 201
8
PaddlePaddle Authors. All Rights Reserved.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
...
...
@@ -15,15 +15,25 @@ limitations under the License. */
#include <pybind11/pybind11.h>
#include <pybind11/stl.h>
#include "
decod
er.h"
#include "
post_decode_fast
er.h"
namespace
py
=
pybind11
;
PYBIND11_MODULE
(
decoder
,
m
)
{
m
.
doc
()
=
"Decode function for Deep ASR model"
;
m
.
def
(
"decode"
,
&
decode
,
PYBIND11_MODULE
(
post_decode_faster
,
m
)
{
m
.
doc
()
=
"Decoder for Deep ASR model"
;
py
::
class_
<
Decoder
>
(
m
,
"Decoder"
)
.
def
(
py
::
init
<
std
::
string
,
std
::
string
,
std
::
string
>
())
.
def
(
"decode"
,
(
std
::
vector
<
std
::
string
>
(
Decoder
::*
)(
std
::
string
))
&
Decoder
::
decode
,
"Decode for the probability matrices in specifier "
"and return the transcriptions."
)
.
def
(
"decode"
,
(
std
::
string
(
Decoder
::*
)(
std
::
string
,
const
std
::
vector
<
std
::
vector
<
kaldi
::
BaseFloat
>>&
))
&
Decoder
::
decode
,
"Decode one input probability matrix "
"and return the transcription
"
);
"and return the transcription.
"
);
}
fluid/DeepASR/decoder/setup.py
浏览文件 @
4d9d1413
# Copyright (c) 201
6
PaddlePaddle Authors. All Rights Reserved.
# Copyright (c) 201
8
PaddlePaddle Authors. All Rights Reserved.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
...
...
@@ -13,27 +13,57 @@
# limitations under the License.
import
os
import
glob
from
distutils.core
import
setup
,
Extension
from
distutils.sysconfig
import
get_config_vars
args
=
[
'-std=c++11'
]
try
:
kaldi_root
=
os
.
environ
[
'KALDI_ROOT'
]
except
:
raise
ValueError
(
"Enviroment variable 'KALDI_ROOT' is not defined. Please "
"install kaldi and export KALDI_ROOT=<kaldi's root dir> ."
)
args
=
[
'-std=c++11'
,
'-Wno-sign-compare'
,
'-Wno-unused-variable'
,
'-Wno-unused-local-typedefs'
,
'-Wno-unused-but-set-variable'
,
'-Wno-deprecated-declarations'
,
'-Wno-unused-function'
]
# remove warning about -Wstrict-prototypes
(
opt
,
)
=
get_config_vars
(
'OPT'
)
os
.
environ
[
'OPT'
]
=
" "
.
join
(
flag
for
flag
in
opt
.
split
()
if
flag
!=
'-Wstrict-prototypes'
)
os
.
environ
[
'CC'
]
=
'g++'
LIBS
=
[
'fst'
,
'kaldi-base'
,
'kaldi-util'
,
'kaldi-matrix'
,
'kaldi-tree'
,
'kaldi-hmm'
,
'kaldi-fstext'
,
'kaldi-decoder'
,
'kaldi-lat'
]
LIB_DIRS
=
[
'tools/openfst/lib'
,
'src/base'
,
'src/matrix'
,
'src/util'
,
'src/tree'
,
'src/hmm'
,
'src/fstext'
,
'src/decoder'
,
'src/lat'
]
LIB_DIRS
=
[
os
.
path
.
join
(
kaldi_root
,
path
)
for
path
in
LIB_DIRS
]
LIB_DIRS
=
[
os
.
path
.
abspath
(
path
)
for
path
in
LIB_DIRS
]
ext_modules
=
[
Extension
(
'decoder'
,
[
'pybind.cc'
,
'decoder.cc'
],
include_dirs
=
[
'pybind11/include'
,
'.'
],
'post_decode_faster'
,
[
'pybind.cc'
,
'post_decode_faster.cc'
],
include_dirs
=
[
'pybind11/include'
,
'.'
,
os
.
path
.
join
(
kaldi_root
,
'src'
),
os
.
path
.
join
(
kaldi_root
,
'tools/openfst/src/include'
)
],
language
=
'c++'
,
libraries
=
LIBS
,
library_dirs
=
LIB_DIRS
,
runtime_library_dirs
=
LIB_DIRS
,
extra_compile_args
=
args
,
),
]
setup
(
name
=
'
decod
er'
,
name
=
'
post_decode_fast
er'
,
version
=
'0.0.1'
,
author
=
'Paddle'
,
author_email
=
''
,
...
...
fluid/DeepASR/decoder/setup.sh
浏览文件 @
4d9d1413
set
-e
if
[
!
-d
pybind11
]
;
then
git clone https://github.com/pybind/pybind11.git
...
...
fluid/DeepASR/infer_by_ckpt.py
浏览文件 @
4d9d1413
...
...
@@ -13,7 +13,7 @@ import data_utils.augmentor.trans_mean_variance_norm as trans_mean_variance_norm
import
data_utils.augmentor.trans_add_delta
as
trans_add_delta
import
data_utils.augmentor.trans_splice
as
trans_splice
import
data_utils.async_data_reader
as
reader
import
decoder.decoder
as
d
ecoder
from
decoder.post_decode_faster
import
D
ecoder
from
data_utils.util
import
lodtensor_to_ndarray
from
model_utils.model
import
stacked_lstmp_model
from
data_utils.util
import
split_infer_result
...
...
@@ -91,6 +91,21 @@ def parse_args():
type
=
str
,
default
=
'./checkpoint'
,
help
=
"The checkpoint path to init model. (default: %(default)s)"
)
parser
.
add_argument
(
'--vocabulary'
,
type
=
str
,
default
=
'./decoder/graph/words.txt'
,
help
=
"The path to vocabulary. (default: %(default)s)"
)
parser
.
add_argument
(
'--graphs'
,
type
=
str
,
default
=
'./decoder/graph/TLG.fst'
,
help
=
"The path to TLG graphs for decoding. (default: %(default)s)"
)
parser
.
add_argument
(
'--log_prior'
,
type
=
str
,
default
=
"./decoder/logprior"
,
help
=
"The log prior probs for training data. (default: %(default)s)"
)
args
=
parser
.
parse_args
()
return
args
...
...
@@ -165,8 +180,9 @@ def infer_from_ckpt(args):
probs
,
lod
=
lodtensor_to_ndarray
(
results
[
0
])
infer_batch
=
split_infer_result
(
probs
,
lod
)
for
index
,
sample
in
enumerate
(
infer_batch
):
print
(
"Decoding %d: "
%
(
batch_id
*
args
.
batch_size
+
index
),
decoder
.
decode
(
sample
))
key
=
"utter#%d"
%
(
batch_id
*
args
.
batch_size
+
index
)
print
(
key
,
": "
,
decoder
.
decode
(
key
,
sample
),
"
\n
"
)
print
(
np
.
mean
(
infer_costs
),
np
.
mean
(
infer_accs
))
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录