Skip to content

Fix compilation errors for modern kaldi/openfst #354

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
gianjaeger wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix compilation errors for modern kaldi/openfst #354

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions ext/k3.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,9 @@
#include "cudamatrix/cu-device.h"
#endif

#include <string>
using std::string;

const int arate = 8000;

void ConfigFeatureInfo(kaldi::OnlineNnet2FeaturePipelineInfo& info,
Expand Down Expand Up @@ -96,10 +99,7 @@ int main(int argc, char *argv[]) {

#ifdef HAVE_CUDA
fprintf(stdout, "Cuda enabled\n");
CuDevice &cu_device = CuDevice::Instantiate();
cu_device.SetVerbose(true);
cu_device.SelectGpuId("yes");
fprintf(stdout, "active gpu: %d\n", cu_device.ActiveGpuId());
CuDevice::Instantiate().SelectGpuId("yes");
#endif
const std::string ivector_model_dir = nnet_dir + "/ivector_extractor";
const std::string nnet3_rxfilename = nnet_dir + "/final.mdl";
Expand Down
2 changes: 1 addition & 1 deletion ext/kaldi
Open in desktop
Submodule kaldi updated 126 files
8 changes: 4 additions & 4 deletions ext/m3.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
#include "util/common-utils.h"
#include <fst/script/arcsort.h>
#include <fst/script/compile.h>
#include <fst/symbol-table.h>

int main(int argc, char *argv[]) {
using namespace kaldi;
Expand Down Expand Up @@ -65,11 +66,10 @@ int main(int argc, char *argv[]) {
}

// fstcompile
const SymbolTable *ssyms = 0;
fst::SymbolTableTextOptions opts;
const SymbolTable *isyms = SymbolTable::ReadText(words_filename, opts);
SymbolTable *ssyms = 0;
fst::SymbolTable *isyms = fst::SymbolTable::ReadText(words_filename);
if (!isyms) { return 1; }
const SymbolTable *osyms = SymbolTable::ReadText(words_filename, opts);
fst::SymbolTable *osyms = fst::SymbolTable::ReadText(words_filename);
if (!osyms) { return 1; }
std::ifstream grammar_fst_file(grammar_fst_filename.c_str());
FstCompiler<StdArc> fstcompiler(grammar_fst_file, "", isyms,
Expand Down