Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
PaddlePaddle
DeepSpeech
提交
a9f4ce47
D
DeepSpeech
项目概览
PaddlePaddle
/
DeepSpeech
大约 2 年 前同步成功
通知
210
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看板
提交
a9f4ce47
编写于
4月 01, 2022
作者:
H
Hui Zhang
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
frontend itf
上级
36df70cb
变更
15
隐藏空白更改
内联
并排
Showing
15 changed file
with
36 addition
and
62 deletion
+36
-62
speechx/examples/feat/linear_spectrogram_main.cc
speechx/examples/feat/linear_spectrogram_main.cc
+6
-6
speechx/speechx/frontend/audio_cache.h
speechx/speechx/frontend/audio_cache.h
+2
-2
speechx/speechx/frontend/data_cache.h
speechx/speechx/frontend/data_cache.h
+2
-2
speechx/speechx/frontend/fbank.h
speechx/speechx/frontend/fbank.h
+2
-2
speechx/speechx/frontend/feature_cache.cc
speechx/speechx/frontend/feature_cache.cc
+1
-1
speechx/speechx/frontend/feature_cache.h
speechx/speechx/frontend/feature_cache.h
+4
-4
speechx/speechx/frontend/feature_extractor_controller.h
speechx/speechx/frontend/feature_extractor_controller.h
+0
-13
speechx/speechx/frontend/feature_extractor_controller_impl.h
speechx/speechx/frontend/feature_extractor_controller_impl.h
+0
-13
speechx/speechx/frontend/frontend_itf.h
speechx/speechx/frontend/frontend_itf.h
+1
-1
speechx/speechx/frontend/linear_spectrogram.cc
speechx/speechx/frontend/linear_spectrogram.cc
+1
-1
speechx/speechx/frontend/linear_spectrogram.h
speechx/speechx/frontend/linear_spectrogram.h
+4
-4
speechx/speechx/frontend/normalizer.cc
speechx/speechx/frontend/normalizer.cc
+2
-2
speechx/speechx/frontend/normalizer.h
speechx/speechx/frontend/normalizer.h
+7
-7
speechx/speechx/nnet/decodable.cc
speechx/speechx/nnet/decodable.cc
+1
-1
speechx/speechx/nnet/decodable.h
speechx/speechx/nnet/decodable.h
+3
-3
未找到文件。
speechx/examples/feat/linear_spectrogram_main.cc
浏览文件 @
a9f4ce47
...
@@ -20,7 +20,7 @@
...
@@ -20,7 +20,7 @@
#include "frontend/audio_cache.h"
#include "frontend/audio_cache.h"
#include "frontend/data_cache.h"
#include "frontend/data_cache.h"
#include "frontend/feature_cache.h"
#include "frontend/feature_cache.h"
#include "frontend/f
eature_extractor_interface
.h"
#include "frontend/f
rontend_itf
.h"
#include "frontend/normalizer.h"
#include "frontend/normalizer.h"
#include "kaldi/feat/wave-reader.h"
#include "kaldi/feat/wave-reader.h"
#include "kaldi/util/kaldi-io.h"
#include "kaldi/util/kaldi-io.h"
...
@@ -170,13 +170,13 @@ int main(int argc, char* argv[]) {
...
@@ -170,13 +170,13 @@ int main(int argc, char* argv[]) {
// feature pipeline: wave cache --> decibel_normalizer --> hanning
// feature pipeline: wave cache --> decibel_normalizer --> hanning
// window -->linear_spectrogram --> global cmvn -> feat cache
// window -->linear_spectrogram --> global cmvn -> feat cache
// std::unique_ptr<ppspeech::F
eatureExtractor
Interface> data_source(new
// std::unique_ptr<ppspeech::F
rontend
Interface> data_source(new
// ppspeech::DataCache());
// ppspeech::DataCache());
std
::
unique_ptr
<
ppspeech
::
F
eatureExtractor
Interface
>
data_source
(
std
::
unique_ptr
<
ppspeech
::
F
rontend
Interface
>
data_source
(
new
ppspeech
::
AudioCache
());
new
ppspeech
::
AudioCache
());
ppspeech
::
DecibelNormalizerOptions
db_norm_opt
;
ppspeech
::
DecibelNormalizerOptions
db_norm_opt
;
std
::
unique_ptr
<
ppspeech
::
F
eatureExtractor
Interface
>
db_norm
(
std
::
unique_ptr
<
ppspeech
::
F
rontend
Interface
>
db_norm
(
new
ppspeech
::
DecibelNormalizer
(
db_norm_opt
,
std
::
move
(
data_source
)));
new
ppspeech
::
DecibelNormalizer
(
db_norm_opt
,
std
::
move
(
data_source
)));
ppspeech
::
LinearSpectrogramOptions
opt
;
ppspeech
::
LinearSpectrogramOptions
opt
;
...
@@ -185,10 +185,10 @@ int main(int argc, char* argv[]) {
...
@@ -185,10 +185,10 @@ int main(int argc, char* argv[]) {
LOG
(
INFO
)
<<
"frame length (ms): "
<<
opt
.
frame_opts
.
frame_length_ms
;
LOG
(
INFO
)
<<
"frame length (ms): "
<<
opt
.
frame_opts
.
frame_length_ms
;
LOG
(
INFO
)
<<
"frame shift (ms): "
<<
opt
.
frame_opts
.
frame_shift_ms
;
LOG
(
INFO
)
<<
"frame shift (ms): "
<<
opt
.
frame_opts
.
frame_shift_ms
;
std
::
unique_ptr
<
ppspeech
::
F
eatureExtractor
Interface
>
linear_spectrogram
(
std
::
unique_ptr
<
ppspeech
::
F
rontend
Interface
>
linear_spectrogram
(
new
ppspeech
::
LinearSpectrogram
(
opt
,
std
::
move
(
db_norm
)));
new
ppspeech
::
LinearSpectrogram
(
opt
,
std
::
move
(
db_norm
)));
std
::
unique_ptr
<
ppspeech
::
F
eatureExtractor
Interface
>
cmvn
(
std
::
unique_ptr
<
ppspeech
::
F
rontend
Interface
>
cmvn
(
new
ppspeech
::
CMVN
(
FLAGS_cmvn_write_path
,
new
ppspeech
::
CMVN
(
FLAGS_cmvn_write_path
,
std
::
move
(
linear_spectrogram
)));
std
::
move
(
linear_spectrogram
)));
...
...
speechx/speechx/frontend/audio_cache.h
浏览文件 @
a9f4ce47
...
@@ -16,12 +16,12 @@
...
@@ -16,12 +16,12 @@
#pragma once
#pragma once
#include "base/common.h"
#include "base/common.h"
#include "frontend/f
eature_extractor_interface
.h"
#include "frontend/f
rontend_itf
.h"
namespace
ppspeech
{
namespace
ppspeech
{
// waves cache
// waves cache
class
AudioCache
:
public
F
eatureExtractor
Interface
{
class
AudioCache
:
public
F
rontend
Interface
{
public:
public:
explicit
AudioCache
(
int
buffer_size
=
kint16max
);
explicit
AudioCache
(
int
buffer_size
=
kint16max
);
...
...
speechx/speechx/frontend/data_cache.h
浏览文件 @
a9f4ce47
...
@@ -17,13 +17,13 @@
...
@@ -17,13 +17,13 @@
#include "base/common.h"
#include "base/common.h"
#include "frontend/f
eature_extractor_interface
.h"
#include "frontend/f
rontend_itf
.h"
namespace
ppspeech
{
namespace
ppspeech
{
// A data source for testing different frontend module.
// A data source for testing different frontend module.
// It accepts waves or feats.
// It accepts waves or feats.
class
DataCache
:
public
F
eatureExtractor
Interface
{
class
DataCache
:
public
F
rontend
Interface
{
public:
public:
explicit
DataCache
()
{
finished_
=
false
;
}
explicit
DataCache
()
{
finished_
=
false
;
}
...
...
speechx/speechx/frontend/fbank.h
浏览文件 @
a9f4ce47
...
@@ -20,10 +20,10 @@
...
@@ -20,10 +20,10 @@
namespace
ppspeech
{
namespace
ppspeech
{
class
FbankExtractor
:
F
eatureExtractor
Interface
{
class
FbankExtractor
:
F
rontend
Interface
{
public:
public:
explicit
FbankExtractor
(
const
FbankOptions
&
opts
,
explicit
FbankExtractor
(
const
FbankOptions
&
opts
,
share_ptr
<
F
eatureExtractor
Interface
>
pre_extractor
);
share_ptr
<
F
rontend
Interface
>
pre_extractor
);
virtual
void
AcceptWaveform
(
virtual
void
AcceptWaveform
(
const
kaldi
::
Vector
<
kaldi
::
BaseFloat
>&
input
)
=
0
;
const
kaldi
::
Vector
<
kaldi
::
BaseFloat
>&
input
)
=
0
;
virtual
void
Read
(
kaldi
::
Vector
<
kaldi
::
BaseFloat
>*
feat
)
=
0
;
virtual
void
Read
(
kaldi
::
Vector
<
kaldi
::
BaseFloat
>*
feat
)
=
0
;
...
...
speechx/speechx/frontend/feature_cache.cc
浏览文件 @
a9f4ce47
...
@@ -24,7 +24,7 @@ using kaldi::SubVector;
...
@@ -24,7 +24,7 @@ using kaldi::SubVector;
using
std
::
unique_ptr
;
using
std
::
unique_ptr
;
FeatureCache
::
FeatureCache
(
FeatureCache
::
FeatureCache
(
int
max_size
,
unique_ptr
<
F
eatureExtractor
Interface
>
base_extractor
)
{
int
max_size
,
unique_ptr
<
F
rontend
Interface
>
base_extractor
)
{
max_size_
=
max_size
;
max_size_
=
max_size
;
base_extractor_
=
std
::
move
(
base_extractor
);
base_extractor_
=
std
::
move
(
base_extractor
);
}
}
...
...
speechx/speechx/frontend/feature_cache.h
浏览文件 @
a9f4ce47
...
@@ -15,15 +15,15 @@
...
@@ -15,15 +15,15 @@
#pragma once
#pragma once
#include "base/common.h"
#include "base/common.h"
#include "frontend/f
eature_extractor_interface
.h"
#include "frontend/f
rontend_itf
.h"
namespace
ppspeech
{
namespace
ppspeech
{
class
FeatureCache
:
public
F
eatureExtractor
Interface
{
class
FeatureCache
:
public
F
rontend
Interface
{
public:
public:
explicit
FeatureCache
(
explicit
FeatureCache
(
int32
max_size
=
kint16max
,
int32
max_size
=
kint16max
,
std
::
unique_ptr
<
F
eatureExtractor
Interface
>
base_extractor
=
NULL
);
std
::
unique_ptr
<
F
rontend
Interface
>
base_extractor
=
NULL
);
// Feed feats or waves
// Feed feats or waves
virtual
void
Accept
(
const
kaldi
::
VectorBase
<
kaldi
::
BaseFloat
>&
inputs
);
virtual
void
Accept
(
const
kaldi
::
VectorBase
<
kaldi
::
BaseFloat
>&
inputs
);
...
@@ -53,7 +53,7 @@ class FeatureCache : public FeatureExtractorInterface {
...
@@ -53,7 +53,7 @@ class FeatureCache : public FeatureExtractorInterface {
bool
Compute
();
bool
Compute
();
size_t
max_size_
;
size_t
max_size_
;
std
::
unique_ptr
<
F
eatureExtractor
Interface
>
base_extractor_
;
std
::
unique_ptr
<
F
rontend
Interface
>
base_extractor_
;
std
::
mutex
mutex_
;
std
::
mutex
mutex_
;
std
::
queue
<
kaldi
::
Vector
<
BaseFloat
>>
cache_
;
std
::
queue
<
kaldi
::
Vector
<
BaseFloat
>>
cache_
;
...
...
speechx/speechx/frontend/feature_extractor_controller.h
已删除
100644 → 0
浏览文件 @
36df70cb
// Copyright (c) 2022 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.
speechx/speechx/frontend/feature_extractor_controller_impl.h
已删除
100644 → 0
浏览文件 @
36df70cb
// Copyright (c) 2022 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.
speechx/speechx/frontend/f
eature_extractor_interface
.h
→
speechx/speechx/frontend/f
rontend_itf
.h
浏览文件 @
a9f4ce47
...
@@ -19,7 +19,7 @@
...
@@ -19,7 +19,7 @@
namespace
ppspeech
{
namespace
ppspeech
{
class
F
eatureExtractor
Interface
{
class
F
rontend
Interface
{
public:
public:
// Feed inputs: features(2D saved in 1D) or waveforms(1D).
// Feed inputs: features(2D saved in 1D) or waveforms(1D).
virtual
void
Accept
(
const
kaldi
::
VectorBase
<
kaldi
::
BaseFloat
>&
inputs
)
=
0
;
virtual
void
Accept
(
const
kaldi
::
VectorBase
<
kaldi
::
BaseFloat
>&
inputs
)
=
0
;
...
...
speechx/speechx/frontend/linear_spectrogram.cc
浏览文件 @
a9f4ce47
...
@@ -27,7 +27,7 @@ using std::vector;
...
@@ -27,7 +27,7 @@ using std::vector;
LinearSpectrogram
::
LinearSpectrogram
(
LinearSpectrogram
::
LinearSpectrogram
(
const
LinearSpectrogramOptions
&
opts
,
const
LinearSpectrogramOptions
&
opts
,
std
::
unique_ptr
<
F
eatureExtractor
Interface
>
base_extractor
)
{
std
::
unique_ptr
<
F
rontend
Interface
>
base_extractor
)
{
opts_
=
opts
;
opts_
=
opts
;
base_extractor_
=
std
::
move
(
base_extractor
);
base_extractor_
=
std
::
move
(
base_extractor
);
int32
window_size
=
opts
.
frame_opts
.
WindowSize
();
int32
window_size
=
opts
.
frame_opts
.
WindowSize
();
...
...
speechx/speechx/frontend/linear_spectrogram.h
浏览文件 @
a9f4ce47
...
@@ -16,7 +16,7 @@
...
@@ -16,7 +16,7 @@
#pragma once
#pragma once
#include "base/common.h"
#include "base/common.h"
#include "frontend/f
eature_extractor_interface
.h"
#include "frontend/f
rontend_itf
.h"
#include "kaldi/feat/feature-window.h"
#include "kaldi/feat/feature-window.h"
namespace
ppspeech
{
namespace
ppspeech
{
...
@@ -35,11 +35,11 @@ struct LinearSpectrogramOptions {
...
@@ -35,11 +35,11 @@ struct LinearSpectrogramOptions {
}
}
};
};
class
LinearSpectrogram
:
public
F
eatureExtractor
Interface
{
class
LinearSpectrogram
:
public
F
rontend
Interface
{
public:
public:
explicit
LinearSpectrogram
(
explicit
LinearSpectrogram
(
const
LinearSpectrogramOptions
&
opts
,
const
LinearSpectrogramOptions
&
opts
,
std
::
unique_ptr
<
F
eatureExtractor
Interface
>
base_extractor
);
std
::
unique_ptr
<
F
rontend
Interface
>
base_extractor
);
virtual
void
Accept
(
const
kaldi
::
VectorBase
<
kaldi
::
BaseFloat
>&
inputs
);
virtual
void
Accept
(
const
kaldi
::
VectorBase
<
kaldi
::
BaseFloat
>&
inputs
);
virtual
bool
Read
(
kaldi
::
Vector
<
kaldi
::
BaseFloat
>*
feats
);
virtual
bool
Read
(
kaldi
::
Vector
<
kaldi
::
BaseFloat
>*
feats
);
// the dim_ is the dim of single frame feature
// the dim_ is the dim of single frame feature
...
@@ -61,7 +61,7 @@ class LinearSpectrogram : public FeatureExtractorInterface {
...
@@ -61,7 +61,7 @@ class LinearSpectrogram : public FeatureExtractorInterface {
std
::
vector
<
kaldi
::
BaseFloat
>
hanning_window_
;
std
::
vector
<
kaldi
::
BaseFloat
>
hanning_window_
;
kaldi
::
BaseFloat
hanning_window_energy_
;
kaldi
::
BaseFloat
hanning_window_energy_
;
LinearSpectrogramOptions
opts_
;
LinearSpectrogramOptions
opts_
;
std
::
unique_ptr
<
F
eatureExtractor
Interface
>
base_extractor_
;
std
::
unique_ptr
<
F
rontend
Interface
>
base_extractor_
;
int
chunk_sample_size_
;
int
chunk_sample_size_
;
DISALLOW_COPY_AND_ASSIGN
(
LinearSpectrogram
);
DISALLOW_COPY_AND_ASSIGN
(
LinearSpectrogram
);
};
};
...
...
speechx/speechx/frontend/normalizer.cc
浏览文件 @
a9f4ce47
...
@@ -28,7 +28,7 @@ using std::unique_ptr;
...
@@ -28,7 +28,7 @@ using std::unique_ptr;
DecibelNormalizer
::
DecibelNormalizer
(
DecibelNormalizer
::
DecibelNormalizer
(
const
DecibelNormalizerOptions
&
opts
,
const
DecibelNormalizerOptions
&
opts
,
std
::
unique_ptr
<
F
eatureExtractor
Interface
>
base_extractor
)
{
std
::
unique_ptr
<
F
rontend
Interface
>
base_extractor
)
{
base_extractor_
=
std
::
move
(
base_extractor
);
base_extractor_
=
std
::
move
(
base_extractor
);
opts_
=
opts
;
opts_
=
opts
;
dim_
=
1
;
dim_
=
1
;
...
@@ -92,7 +92,7 @@ bool DecibelNormalizer::Compute(VectorBase<BaseFloat>* waves) const {
...
@@ -92,7 +92,7 @@ bool DecibelNormalizer::Compute(VectorBase<BaseFloat>* waves) const {
}
}
CMVN
::
CMVN
(
std
::
string
cmvn_file
,
CMVN
::
CMVN
(
std
::
string
cmvn_file
,
unique_ptr
<
F
eatureExtractor
Interface
>
base_extractor
)
unique_ptr
<
F
rontend
Interface
>
base_extractor
)
:
var_norm_
(
true
)
{
:
var_norm_
(
true
)
{
base_extractor_
=
std
::
move
(
base_extractor
);
base_extractor_
=
std
::
move
(
base_extractor
);
bool
binary
;
bool
binary
;
...
...
speechx/speechx/frontend/normalizer.h
浏览文件 @
a9f4ce47
...
@@ -16,7 +16,7 @@
...
@@ -16,7 +16,7 @@
#pragma once
#pragma once
#include "base/common.h"
#include "base/common.h"
#include "frontend/f
eature_extractor_interface
.h"
#include "frontend/f
rontend_itf
.h"
#include "kaldi/matrix/kaldi-matrix.h"
#include "kaldi/matrix/kaldi-matrix.h"
#include "kaldi/util/options-itf.h"
#include "kaldi/util/options-itf.h"
...
@@ -40,11 +40,11 @@ struct DecibelNormalizerOptions {
...
@@ -40,11 +40,11 @@ struct DecibelNormalizerOptions {
}
}
};
};
class
DecibelNormalizer
:
public
F
eatureExtractor
Interface
{
class
DecibelNormalizer
:
public
F
rontend
Interface
{
public:
public:
explicit
DecibelNormalizer
(
explicit
DecibelNormalizer
(
const
DecibelNormalizerOptions
&
opts
,
const
DecibelNormalizerOptions
&
opts
,
std
::
unique_ptr
<
F
eatureExtractor
Interface
>
base_extractor
);
std
::
unique_ptr
<
F
rontend
Interface
>
base_extractor
);
virtual
void
Accept
(
const
kaldi
::
VectorBase
<
kaldi
::
BaseFloat
>&
waves
);
virtual
void
Accept
(
const
kaldi
::
VectorBase
<
kaldi
::
BaseFloat
>&
waves
);
virtual
bool
Read
(
kaldi
::
Vector
<
kaldi
::
BaseFloat
>*
waves
);
virtual
bool
Read
(
kaldi
::
Vector
<
kaldi
::
BaseFloat
>*
waves
);
// noramlize audio, the dim is 1.
// noramlize audio, the dim is 1.
...
@@ -57,15 +57,15 @@ class DecibelNormalizer : public FeatureExtractorInterface {
...
@@ -57,15 +57,15 @@ class DecibelNormalizer : public FeatureExtractorInterface {
bool
Compute
(
kaldi
::
VectorBase
<
kaldi
::
BaseFloat
>*
waves
)
const
;
bool
Compute
(
kaldi
::
VectorBase
<
kaldi
::
BaseFloat
>*
waves
)
const
;
DecibelNormalizerOptions
opts_
;
DecibelNormalizerOptions
opts_
;
size_t
dim_
;
size_t
dim_
;
std
::
unique_ptr
<
F
eatureExtractor
Interface
>
base_extractor_
;
std
::
unique_ptr
<
F
rontend
Interface
>
base_extractor_
;
kaldi
::
Vector
<
kaldi
::
BaseFloat
>
waveform_
;
kaldi
::
Vector
<
kaldi
::
BaseFloat
>
waveform_
;
};
};
class
CMVN
:
public
F
eatureExtractor
Interface
{
class
CMVN
:
public
F
rontend
Interface
{
public:
public:
explicit
CMVN
(
std
::
string
cmvn_file
,
explicit
CMVN
(
std
::
string
cmvn_file
,
std
::
unique_ptr
<
F
eatureExtractor
Interface
>
base_extractor
);
std
::
unique_ptr
<
F
rontend
Interface
>
base_extractor
);
virtual
void
Accept
(
const
kaldi
::
VectorBase
<
kaldi
::
BaseFloat
>&
inputs
);
virtual
void
Accept
(
const
kaldi
::
VectorBase
<
kaldi
::
BaseFloat
>&
inputs
);
// the length of feats = feature_row * feature_dim,
// the length of feats = feature_row * feature_dim,
...
@@ -81,7 +81,7 @@ class CMVN : public FeatureExtractorInterface {
...
@@ -81,7 +81,7 @@ class CMVN : public FeatureExtractorInterface {
void
Compute
(
kaldi
::
VectorBase
<
kaldi
::
BaseFloat
>*
feats
)
const
;
void
Compute
(
kaldi
::
VectorBase
<
kaldi
::
BaseFloat
>*
feats
)
const
;
void
ApplyCMVN
(
kaldi
::
MatrixBase
<
BaseFloat
>*
feats
);
void
ApplyCMVN
(
kaldi
::
MatrixBase
<
BaseFloat
>*
feats
);
kaldi
::
Matrix
<
double
>
stats_
;
kaldi
::
Matrix
<
double
>
stats_
;
std
::
unique_ptr
<
F
eatureExtractor
Interface
>
base_extractor_
;
std
::
unique_ptr
<
F
rontend
Interface
>
base_extractor_
;
size_t
dim_
;
size_t
dim_
;
bool
var_norm_
;
bool
var_norm_
;
};
};
...
...
speechx/speechx/nnet/decodable.cc
浏览文件 @
a9f4ce47
...
@@ -22,7 +22,7 @@ using std::vector;
...
@@ -22,7 +22,7 @@ using std::vector;
using
kaldi
::
Vector
;
using
kaldi
::
Vector
;
Decodable
::
Decodable
(
const
std
::
shared_ptr
<
NnetInterface
>&
nnet
,
Decodable
::
Decodable
(
const
std
::
shared_ptr
<
NnetInterface
>&
nnet
,
const
std
::
shared_ptr
<
F
eatureExtractor
Interface
>&
frontend
)
const
std
::
shared_ptr
<
F
rontend
Interface
>&
frontend
)
:
frontend_
(
frontend
),
nnet_
(
nnet
),
frame_offset_
(
0
),
frames_ready_
(
0
)
{}
:
frontend_
(
frontend
),
nnet_
(
nnet
),
frame_offset_
(
0
),
frames_ready_
(
0
)
{}
void
Decodable
::
Acceptlikelihood
(
const
Matrix
<
BaseFloat
>&
likelihood
)
{
void
Decodable
::
Acceptlikelihood
(
const
Matrix
<
BaseFloat
>&
likelihood
)
{
...
...
speechx/speechx/nnet/decodable.h
浏览文件 @
a9f4ce47
...
@@ -13,7 +13,7 @@
...
@@ -13,7 +13,7 @@
// limitations under the License.
// limitations under the License.
#include "base/common.h"
#include "base/common.h"
#include "frontend/f
eature_extractor_interface
.h"
#include "frontend/f
rontend_itf
.h"
#include "kaldi/matrix/kaldi-matrix.h"
#include "kaldi/matrix/kaldi-matrix.h"
#include "nnet/decodable-itf.h"
#include "nnet/decodable-itf.h"
#include "nnet/nnet_interface.h"
#include "nnet/nnet_interface.h"
...
@@ -26,7 +26,7 @@ class Decodable : public kaldi::DecodableInterface {
...
@@ -26,7 +26,7 @@ class Decodable : public kaldi::DecodableInterface {
public:
public:
explicit
Decodable
(
explicit
Decodable
(
const
std
::
shared_ptr
<
NnetInterface
>&
nnet
,
const
std
::
shared_ptr
<
NnetInterface
>&
nnet
,
const
std
::
shared_ptr
<
F
eatureExtractor
Interface
>&
frontend
);
const
std
::
shared_ptr
<
F
rontend
Interface
>&
frontend
);
// void Init(DecodableOpts config);
// void Init(DecodableOpts config);
virtual
kaldi
::
BaseFloat
LogLikelihood
(
int32
frame
,
int32
index
);
virtual
kaldi
::
BaseFloat
LogLikelihood
(
int32
frame
,
int32
index
);
virtual
bool
IsLastFrame
(
int32
frame
)
const
;
virtual
bool
IsLastFrame
(
int32
frame
)
const
;
...
@@ -41,7 +41,7 @@ class Decodable : public kaldi::DecodableInterface {
...
@@ -41,7 +41,7 @@ class Decodable : public kaldi::DecodableInterface {
private:
private:
bool
AdvanceChunk
();
bool
AdvanceChunk
();
std
::
shared_ptr
<
F
eatureExtractor
Interface
>
frontend_
;
std
::
shared_ptr
<
F
rontend
Interface
>
frontend_
;
std
::
shared_ptr
<
NnetInterface
>
nnet_
;
std
::
shared_ptr
<
NnetInterface
>
nnet_
;
kaldi
::
Matrix
<
kaldi
::
BaseFloat
>
nnet_cache_
;
kaldi
::
Matrix
<
kaldi
::
BaseFloat
>
nnet_cache_
;
// std::vector<std::vector<kaldi::BaseFloat>> nnet_cache_;
// std::vector<std::vector<kaldi::BaseFloat>> nnet_cache_;
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录