mirrors/kaldifeat
1
0
Fork 0
mirror of https://github.com/csukuangfj/kaldifeat.git synced 2025-08-12 19:42:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add pickle support.

Browse Source
This commit is contained in:
Fangjun Kuang 2021-11-04 11:32:57 +08:00
parent 6eb7a3b243
commit 5aff49ce82
12 changed files with 208 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
kaldifeat/python/csrc/feature-fbank.cc
View File

@ -37,9 +37,12 @@ static void PybindFbankOptions(py::module &m) {
[](const PyClass &self) -> std::string { return self.ToString(); })
.def("as_dict",
[](const PyClass &self) -> py::dict { return AsDict(self); })
.def_static("from_dict", [](py::dict dict) -> PyClass {
return FbankOptionsFromDict(dict);
});
.def_static(
"from_dict",
[](py::dict dict) -> PyClass { return FbankOptionsFromDict(dict); })
.def(py::pickle(
[](const PyClass &self) -> py::dict { return AsDict(self); },
[](py::dict dict) -> PyClass { return FbankOptionsFromDict(dict); }));
}
static void PybindFbank(py::module &m) {
@ -49,7 +52,14 @@ static void PybindFbank(py::module &m) {
.def("dim", &PyClass::Dim)
.def_property_readonly("options", &PyClass::GetOptions)
.def("compute_features", &PyClass::ComputeFeatures, py::arg("wave"),
py::arg("vtln_warp"));
py::arg("vtln_warp"))
.def(py::pickle(
[](const PyClass &self) -> py::dict {
return AsDict(self.GetOptions());
},
[](py::dict dict) -> std::unique_ptr<PyClass> {
return std::make_unique<PyClass>(FbankOptionsFromDict(dict));
}));
}
void PybindFeatureFbank(py::module &m) {

18
kaldifeat/python/csrc/feature-mfcc.cc
View File

@ -37,9 +37,12 @@ void PybindMfccOptions(py::module &m) {
[](const PyClass &self) -> std::string { return self.ToString(); })
.def("as_dict",
[](const PyClass &self) -> py::dict { return AsDict(self); })
.def_static("from_dict", [](py::dict dict) -> PyClass {
return MfccOptionsFromDict(dict);
});
.def_static(
"from_dict",
[](py::dict dict) -> PyClass { return MfccOptionsFromDict(dict); })
.def(py::pickle(
[](const PyClass &self) -> py::dict { return AsDict(self); },
[](py::dict dict) -> PyClass { return MfccOptionsFromDict(dict); }));
}
static void PybindMfcc(py::module &m) {
@ -49,7 +52,14 @@ static void PybindMfcc(py::module &m) {
.def("dim", &PyClass::Dim)
.def_property_readonly("options", &PyClass::GetOptions)
.def("compute_features", &PyClass::ComputeFeatures, py::arg("wave"),
py::arg("vtln_warp"));
py::arg("vtln_warp"))
.def(py::pickle(
[](const PyClass &self) -> py::dict {
return AsDict(self.GetOptions());
},
[](py::dict dict) -> std::unique_ptr<PyClass> {
return std::make_unique<PyClass>(MfccOptionsFromDict(dict));
}));
}
void PybindFeatureMfcc(py::module &m) {

18
kaldifeat/python/csrc/feature-plp.cc
View File

@ -40,9 +40,12 @@ void PybindPlpOptions(py::module &m) {
[](const PyClass &self) -> std::string { return self.ToString(); })
.def("as_dict",
[](const PyClass &self) -> py::dict { return AsDict(self); })
.def_static("from_dict", [](py::dict dict) -> PyClass {
return PlpOptionsFromDict(dict);
});
.def_static(
"from_dict",
[](py::dict dict) -> PyClass { return PlpOptionsFromDict(dict); })
.def(py::pickle(
[](const PyClass &self) -> py::dict { return AsDict(self); },
[](py::dict dict) -> PyClass { return PlpOptionsFromDict(dict); }));
}
static void PybindPlp(py::module &m) {
@ -52,7 +55,14 @@ static void PybindPlp(py::module &m) {
.def("dim", &PyClass::Dim)
.def_property_readonly("options", &PyClass::GetOptions)
.def("compute_features", &PyClass::ComputeFeatures, py::arg("wave"),
py::arg("vtln_warp"));
py::arg("vtln_warp"))
.def(py::pickle(
[](const PyClass &self) -> py::dict {
return AsDict(self.GetOptions());
},
[](py::dict dict) -> std::unique_ptr<PyClass> {
return std::make_unique<PyClass>(PlpOptionsFromDict(dict));
}));
}
void PybindFeaturePlp(py::module &m) {

19
kaldifeat/python/csrc/feature-spectrogram.cc
View File

@ -34,9 +34,15 @@ static void PybindSpectrogramOptions(py::module &m) {
[](const PyClass &self) -> std::string { return self.ToString(); })
.def("as_dict",
[](const PyClass &self) -> py::dict { return AsDict(self); })
.def_static("from_dict", [](py::dict dict) -> PyClass {
.def_static("from_dict",
[](py::dict dict) -> PyClass {
return SpectrogramOptionsFromDict(dict);
});
})
.def(py::pickle(
[](const PyClass &self) -> py::dict { return AsDict(self); },
[](py::dict dict) -> PyClass {
return SpectrogramOptionsFromDict(dict);
}));
}
static void PybindSpectrogram(py::module &m) {
@ -46,7 +52,14 @@ static void PybindSpectrogram(py::module &m) {
.def("dim", &PyClass::Dim)
.def_property_readonly("options", &PyClass::GetOptions)
.def("compute_features", &PyClass::ComputeFeatures, py::arg("wave"),
py::arg("vtln_warp"));
py::arg("vtln_warp"))
.def(py::pickle(
[](const PyClass &self) -> py::dict {
return AsDict(self.GetOptions());
},
[](py::dict dict) -> std::unique_ptr<PyClass> {
return std::make_unique<PyClass>(SpectrogramOptionsFromDict(dict));
}));
}
void PybindFeatureSpectrogram(py::module &m) {

16
kaldifeat/python/tests/test_fbank.py
View File

@ -2,6 +2,7 @@
# Copyright 2021 Xiaomi Corporation (authors: Fangjun Kuang)
import pickle
from pathlib import Path
import torch
@ -156,6 +157,20 @@ def test_fbank_batch():
assert torch.allclose(features[1], features1)
def test_pickle():
for device in get_devices():
opts = kaldifeat.FbankOptions()
opts.use_energy = True
opts.use_power = False
opts.device = device
fbank = kaldifeat.Fbank(opts)
data = pickle.dumps(fbank)
fbank2 = pickle.loads(data)
assert str(fbank.opts) == str(fbank2.opts)
if __name__ == "__main__":
test_fbank_default()
test_fbank_htk()
@ -164,3 +179,4 @@ if __name__ == "__main__":
test_fbank_40_bins_no_snip_edges()
test_fbank_chunk()
test_fbank_batch()
test_pickle()

18
kaldifeat/python/tests/test_fbank_options.py
View File

@ -3,6 +3,8 @@
# Copyright (c) 2021 Xiaomi Corporation (authors: Fangjun Kuang)
import pickle
import torch
import kaldifeat
@ -176,6 +178,21 @@ def test_from_dict_full_and_as_dict():
assert opts3.device == torch.device("cuda", 2)
def test_pickle():
opts = kaldifeat.FbankOptions()
opts.use_energy = True
opts.use_power = False
opts.device = torch.device("cuda", 1)
opts.frame_opts.samp_freq = 44100
opts.mel_opts.num_bins = 100
data = pickle.dumps(opts)
opts2 = pickle.loads(data)
assert str(opts) == str(opts2)
def main():
test_default()
test_set_get()
@ -184,6 +201,7 @@ def main():
test_from_empty_dict()
test_from_dict_partial()
test_from_dict_full_and_as_dict()
test_pickle()
if __name__ == "__main__":

16
kaldifeat/python/tests/test_mfcc.py
View File

@ -2,6 +2,7 @@
# Copyright 2021 Xiaomi Corporation (authors: Fangjun Kuang)
import pickle
from pathlib import Path
import torch
@ -46,6 +47,21 @@ def test_mfcc_no_snip_edges():
assert torch.allclose(features.cpu(), gt, rtol=1e-1)
def test_pickle():
for device in get_devices():
opts = kaldifeat.MfccOptions()
opts.device = device
opts.frame_opts.dither = 0
opts.frame_opts.snip_edges = False
mfcc = kaldifeat.Mfcc(opts)
data = pickle.dumps(mfcc)
mfcc2 = pickle.loads(data)
assert str(mfcc.opts) == str(mfcc2.opts)
if __name__ == "__main__":
test_mfcc_default()
test_mfcc_no_snip_edges()
test_pickle()

25
kaldifeat/python/tests/test_mfcc_options.py
View File

@ -3,6 +3,8 @@
# Copyright (c) 2021 Xiaomi Corporation (authors: Fangjun Kuang)
import pickle
import torch
import kaldifeat
@ -180,6 +182,28 @@ def test_from_dict_full_and_as_dict():
assert opts3.device == torch.device("cuda", 10)
def test_pickle():
opts = kaldifeat.MfccOptions()
opts.num_ceps = 222
opts.use_energy = False
opts.cepstral_lifter = 21
opts.htk_compat = True
opts.device = torch.device("cuda", 3)
opts.frame_opts.samp_freq = 44100
opts.frame_opts.frame_length_ms = 1
opts.frame_opts.dither = 0.5
opts.mel_opts.num_bins = 100
opts.mel_opts.low_freq = 22
opts.mel_opts.vtln_high = -100
data = pickle.dumps(opts)
opts2 = pickle.loads(data)
assert str(opts) == str(opts2)
def main():
test_default()
test_set_get()
@ -188,6 +212,7 @@ def main():
test_from_empty_dict()
test_from_dict_partial()
test_from_dict_full_and_as_dict()
test_pickle()
if __name__ == "__main__":

16
kaldifeat/python/tests/test_plp.py
View File

@ -2,6 +2,7 @@
# Copyright 2021 Xiaomi Corporation (authors: Fangjun Kuang)
import pickle
from pathlib import Path
import torch
@ -65,7 +66,22 @@ def test_plp_htk_10_ceps():
assert torch.allclose(features.cpu(), gt, atol=1e-1)
def test_pickle():
for device in get_devices():
opts = kaldifeat.PlpOptions()
opts.device = device
opts.frame_opts.dither = 0
opts.frame_opts.snip_edges = False
plp = kaldifeat.Plp(opts)
data = pickle.dumps(plp)
plp2 = pickle.loads(data)
assert str(plp.opts) == str(plp2.opts)
if __name__ == "__main__":
test_plp_default()
test_plp_no_snip_edges()
test_plp_htk_10_ceps()
test_pickle()

24
kaldifeat/python/tests/test_plp_options.py
View File

@ -3,6 +3,8 @@
# Copyright (c) 2021 Xiaomi Corporation (authors: Fangjun Kuang)
import pickle
import torch
import kaldifeat
@ -191,6 +193,27 @@ def test_from_dict_full_and_as_dict():
assert opts3.device == torch.device("cuda", 2)
def test_pickle():
opts = kaldifeat.PlpOptions()
opts.lpc_order = 11
opts.num_ceps = 1
opts.use_energy = False
opts.compress_factor = 0.5
opts.cepstral_lifter = 2
opts.device = torch.device("cuda", 1)
opts.frame_opts.samp_freq = 44100
opts.frame_opts.snip_edges = False
opts.mel_opts.num_bins = 100
opts.mel_opts.high_freq = 1
data = pickle.dumps(opts)
opts2 = pickle.loads(data)
assert str(opts) == str(opts2)
def main():
test_default()
test_set_get()
@ -199,6 +222,7 @@ def main():
test_from_empty_dict()
test_from_dict_partial()
test_from_dict_full_and_as_dict()
test_pickle()
if __name__ == "__main__":

16
kaldifeat/python/tests/test_spectrogram.py
View File

@ -2,6 +2,7 @@
# Copyright 2021 Xiaomi Corporation (authors: Fangjun Kuang)
import pickle
from pathlib import Path
from utils import get_devices, read_ark_txt, read_wave
@ -50,6 +51,21 @@ def test_spectrogram_no_snip_edges():
print(features[1, 145:148], gt[1, 145:148]) # they are different
def test_pickle():
for device in get_devices():
opts = kaldifeat.SpectrogramOptions()
opts.device = device
opts.frame_opts.dither = 0
opts.frame_opts.snip_edges = False
spec = kaldifeat.Spectrogram(opts)
data = pickle.dumps(spec)
spec2 = pickle.loads(data)
assert str(spec.opts) == str(spec2.opts)
if __name__ == "__main__":
test_spectrogram_default()
test_spectrogram_no_snip_edges()
test_pickle()

18
kaldifeat/python/tests/test_spectrogram_options.py
View File

@ -3,6 +3,8 @@
# Copyright (c) 2021 Xiaomi Corporation (authors: Fangjun Kuang)
import pickle
import torch
import kaldifeat
@ -121,6 +123,21 @@ def test_from_dict_full_and_as_dict():
assert str(opts3) == str(opts)
def test_pickle():
opts = kaldifeat.SpectrogramOptions()
opts.energy_floor = 1
opts.raw_energy = False
opts.device = torch.device("cuda", 1)
opts.frame_opts.samp_freq = 44100
opts.frame_opts.snip_edges = False
data = pickle.dumps(opts)
opts2 = pickle.loads(data)
assert str(opts) == str(opts2)
def main():
test_default()
test_set_get()
@ -128,6 +145,7 @@ def main():
test_from_empty_dict()
test_from_dict_partial()
test_from_dict_full_and_as_dict()
test_pickle()
if __name__ == "__main__":