Skip to content

[src] Fix incorrect invocation of mutex in nnet-batch-compute code #2932

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
Dec 21, 2018
Merged

[src] Fix incorrect invocation of mutex in nnet-batch-compute code #2932

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
2 changes: 1 addition & 1 deletion src/nnet3/nnet-batch-compute.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ NnetBatchComputer::GetHighestPriorityComputation(
int32 *minibatch_size_out,
std::vector<NnetInferenceTask*> *tasks) {
tasks->clear();
std::unique_lock<std::mutex>(mutex_);
std::unique_lock<std::mutex> lock(mutex_);
MapType::iterator iter = tasks_.begin(), end = tasks_.end(),
best_iter = tasks_.end();
double highest_priority = -std::numeric_limits<double>::infinity();
Expand Down
2 changes: 1 addition & 1 deletion src/nnet3/nnet-compute.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ class NnetComputer {

// Version of GetOutput that calls Swap(), destroying the output stored inside
// this object. You should probably not use this if you plan to call
// Backward() on the same NnetComputer object, or it's a recurret
// Backward() on the same NnetComputer object, or it's a recurrent
// computation-- it may lead to a crash.
void GetOutputDestructive(const std::string &output_name,
CuMatrix<BaseFloat> *output);
Expand Down