Skip to content

Write all output to a single lattice writer instead of one per #3666

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

Merged
danpovey merged 1 commit into from
Oct 19, 2019
Merged

Write all output to a single lattice writer instead of one per #3666

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
34 changes: 15 additions & 19 deletions src/cudadecoderbin/batched-wav-nnet3-cuda.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,13 +90,13 @@ void FinishOneDecode(const std::string &utt, const std::string &key,
int64 *num_frames, double *tot_like,
CompactLatticeWriter *clat_writer,
std::mutex *clat_writer_mutex, std::mutex *stdout_mutex,
CompactLattice &clat) {
const bool write_lattice, CompactLattice &clat) {
nvtxRangePushA("FinishOneDecode");
GetDiagnosticsAndPrintOutput(utt, word_syms, clat, stdout_mutex, num_frames,
tot_like);
{
if (write_lattice) {
std::lock_guard<std::mutex> lk(*clat_writer_mutex);
clat_writer->Write(utt, clat);
clat_writer->Write(key, clat);
}

nvtxRangePop();
Expand Down Expand Up @@ -178,8 +178,8 @@ int main(int argc, char *argv[]) {
SetDropoutTestMode(true, &(am_nnet.GetNnet()));
nnet3::CollapseModel(nnet3::CollapseModelConfig(), &(am_nnet.GetNnet()));

std::vector<CompactLatticeWriter> clat_writers(iterations);
std::vector<std::mutex> clat_write_mutexs(iterations);
CompactLatticeWriter clat_writer;
std::mutex clat_write_mutex;

fst::Fst<fst::StdArc> *decode_fst =
fst::ReadFstKaldiGeneric(fst_rxfilename);
Expand All @@ -203,6 +203,7 @@ int main(int argc, char *argv[]) {

int num_groups_done = 0;

clat_writer.Open(clat_wspecifier);
// starting timer here so we
// can measure throughput
// without allocation
Expand All @@ -215,13 +216,6 @@ int main(int argc, char *argv[]) {
num_task_submitted = 0;
SequentialTableReader<WaveHolder> wav_reader(wav_rspecifier);

std::mutex *clat_writer_mutex = &clat_write_mutexs[iter];
CompactLatticeWriter *clat_writer = &clat_writers[iter];

stringstream filename;
filename << clat_wspecifier << "-" << iter;
clat_writer->Open(filename.str());

for (; !wav_reader.Done(); wav_reader.Next()) {
nvtxRangePushA("Utterance Iteration");

Expand All @@ -232,8 +226,10 @@ int main(int argc, char *argv[]) {
std::string utt = wav_reader.Key();
std::string key = utt;

// make key unique for each iteration
key = key + "-" + std::to_string(iter);
if (iterations > 0) {
// make key unique for each iteration
key = std::to_string(iter) + "-" + key;
}

const WaveData &wave_data = wav_reader.Value();

Expand All @@ -247,9 +243,10 @@ int main(int argc, char *argv[]) {
auto finish_one_decode_lamba =
[
// Capturing the arguments that will change by copy
utt, key, clat_writer_mutex, clat_writer,
utt, key,
// Capturing the const/global args by reference
&word_syms, &cuda_pipeline, &stdout_mutex, &num_frames,
&clat_write_mutex, &clat_writer, &write_lattice,
&tot_like]
// The callback function receive the compact lattice as argument
// if determinize_lattice is true, it is a determinized lattice
Expand All @@ -262,7 +259,8 @@ int main(int argc, char *argv[]) {
// Captured arguments used to specialize FinishOneDecode for
// this task
utt, key, word_syms, &cuda_pipeline, &num_frames, &tot_like,
clat_writer, clat_writer_mutex, &stdout_mutex,
&clat_writer, &clat_write_mutex, &stdout_mutex,
write_lattice,
// Generated lattice that will be passed once the task is
// complete
clat_in);
Expand Down Expand Up @@ -292,7 +290,6 @@ int main(int argc, char *argv[]) {
<< " Audio: " << total_audio * (iter + 1)
<< " RealTimeX: " << total_audio * (iter + 1) / total_time;
num_groups_done++;
clat_writers[iter].Close();
}
} // end iterations loop

Expand All @@ -309,7 +306,6 @@ int main(int argc, char *argv[]) {
<< " Audio: " << total_audio * (iter + 1)
<< " RealTimeX: " << total_audio * (iter + 1) / total_time;
num_groups_done++;
clat_writers[iter].Close();
}

// number of seconds elapsed since the creation of timer
Expand All @@ -328,7 +324,7 @@ int main(int argc, char *argv[]) {

cuda_pipeline.Finalize();
cudaDeviceSynchronize();

delete word_syms; // will delete if non-NULL.

return 0;
Expand Down