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 /.gitignore | |
| parent | e59cdac5253df7ab57296d347245d1a8f4d8b287 (diff) | |
| parent | 407b100cd3e4ae987504b53101151fba287ad999 (diff) | |
fix merge conflict
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 4 |
1 files changed, 4 insertions, 0 deletions
@@ -72,6 +72,7 @@ extools/score_grammar extools/sg_lexer.cc extractor/*_test extractor/compile +extractor/extract extractor/run_extractor gi/clda/src/clda gi/markov_al/ml @@ -104,6 +105,7 @@ jam-files/bjam jam-files/engine/bin.* jam-files/engine/bootstrap/ klm/lm/bin/ +klm/lm/builder/builder klm/lm/builder/lmplz klm/lm/build_binary klm/lm/ngram_query @@ -187,8 +189,10 @@ utils/mfcr_test utils/phmt utils/reconstruct_weights utils/small_vector_test +utils/sv_test utils/ts utils/weights_test +training/crf/mpi_adagrad_optimize training/crf/mpi_batch_optimize training/crf/mpi_baum_welch training/crf/mpi_compute_cllh |