diff options
| author | Kenneth Heafield <github@kheafield.com> | 2012-10-22 12:07:20 +0100 |
|---|---|---|
| committer | Kenneth Heafield <github@kheafield.com> | 2012-10-22 12:07:20 +0100 |
| commit | ac586bc9b156b4ae687cd5961ba1fe7b20ec57d6 (patch) | |
| tree | 052473b46d7fa18d51f897cdb9e7c93a7186dafd /training/mpi_batch_optimize.cc | |
| parent | 97b85c082b3e55c28a8b0c0eb762483ac84a1577 (diff) | |
| parent | ad6d4a1b2519896f2b16a282699ce4e64041fab8 (diff) | |
Merge remote branch 'upstream/master'
Conflicts:
Jamroot
bjam
decoder/Jamfile
decoder/cdec.cc
dpmert/Jamfile
jam-files/sanity.jam
klm/lm/Jamfile
klm/util/Jamfile
mira/Jamfile
Diffstat (limited to 'training/mpi_batch_optimize.cc')
| -rw-r--r-- | training/mpi_batch_optimize.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/training/mpi_batch_optimize.cc b/training/mpi_batch_optimize.cc index 6432f4a2..2eff07e4 100644 --- a/training/mpi_batch_optimize.cc +++ b/training/mpi_batch_optimize.cc @@ -142,7 +142,7 @@ struct TrainingObserver : public DecoderObserver { cerr << "DIFF. ERR! log_model_z < log_ref_z: " << cur_obj << " " << log_ref_z << endl; exit(1); } - assert(!isnan(log_ref_z)); + assert(!std::isnan(log_ref_z)); ref_exp -= cur_model_exp; acc_grad -= ref_exp; acc_obj += (cur_obj - log_ref_z); |