diff options
| author | Patrick Simianer <p@simianer.de> | 2013-12-04 20:13:07 +0100 |
|---|---|---|
| committer | Patrick Simianer <p@simianer.de> | 2013-12-04 20:13:07 +0100 |
| commit | 9ff43d7c8e076aaa8790bacbd4b2cfe636a55a97 (patch) | |
| tree | e1e0265b18ffc854f24209cb36b2c836100f099b /training/crf/mpi_compute_cllh.cc | |
| parent | e59cdac5253df7ab57296d347245d1a8f4d8b287 (diff) | |
| parent | 407b100cd3e4ae987504b53101151fba287ad999 (diff) | |
fix merge conflict
Diffstat (limited to 'training/crf/mpi_compute_cllh.cc')
| -rw-r--r-- | training/crf/mpi_compute_cllh.cc | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/training/crf/mpi_compute_cllh.cc b/training/crf/mpi_compute_cllh.cc index 066389d0..7e38da3a 100644 --- a/training/crf/mpi_compute_cllh.cc +++ b/training/crf/mpi_compute_cllh.cc @@ -120,6 +120,7 @@ int main(int argc, char** argv) { reduce(world, observer.trg_words, total_words, std::plus<unsigned>(), 0); #else objective = observer.acc_obj; + total_words = observer.trg_words; #endif if (rank == 0) { |