merge with upstream

1 files changed, 66 insertions, 28 deletions

diff --git a/.gitignore b/.gitignore
index 10ff79a5..638ad83f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,48 @@
+mira/kbest_mira
+utils/m_test
+sa-extract/calignment.c
+sa-extract/calignment.so
+sa-extract/cdat.c
+sa-extract/cdat.so
+sa-extract/cfloatlist.c
+sa-extract/cfloatlist.so
+sa-extract/cintlist.c
+sa-extract/cintlist.so
+sa-extract/clex.c
+sa-extract/clex.so
+sa-extract/cn.pyc
+sa-extract/context_model.pyc
+sa-extract/cstrmap.c
+sa-extract/cstrmap.so
+sa-extract/csuf.c
+sa-extract/csuf.so
+sa-extract/cveb.c
+sa-extract/cveb.so
+sa-extract/lcp.c
+sa-extract/lcp.so
+sa-extract/log.pyc
+sa-extract/manager.pyc
+sa-extract/model.pyc
+sa-extract/monitor.pyc
+sa-extract/precomputation.c
+sa-extract/precomputation.so
+sa-extract/rule.c
+sa-extract/rule.so
+sa-extract/rulefactory.c
+sa-extract/rulefactory.so
+sa-extract/sgml.pyc
+sa-extract/sym.c
+sa-extract/sym.so
+training/lbl_model
+training/mpi_flex_optimize
+training/test_ngram
+utils/dict_test
+utils/logval_test
+utils/mfcr_test
+utils/phmt
+utils/small_vector_test
+utils/ts
+utils/weights_test
 pro-train/.deps
 pro-train/mr_pro_map
 pro-train/mr_pro_reduce
@@ -12,6 +57,7 @@ training/mpi_extract_reachable
 klm/lm/build_binary
 extools/extractor_monolingual
 gi/pf/.deps
+gi/pf/learn_cfg
 gi/pf/brat
 gi/pf/cbgi
 gi/pf/dpnaive
@@ -38,8 +84,8 @@ utils/.deps/
 utils/libutils.a
 *swp
 *.o
-vest/sentserver
-vest/sentclient
+dpmert/sentserver
+dpmert/sentclient
 gi/pyp-topics/src/contexts_lexer.cc
 config.guess
 config.sub
@@ -61,12 +107,12 @@ training/mr_em_map_adapter
 training/mr_reduce_to_weights
 training/optimize_test
 training/plftools
-vest/fast_score
-vest/lo_test
-vest/mr_vest_map
-vest/mr_vest_reduce
-vest/scorer_test
-vest/union_forests
+dpmert/fast_score
+dpmert/lo_test
+dpmert/mr_dpmert_map
+dpmert/mr_dpmert_reduce
+dpmert/scorer_test
+dpmert/union_forests
 Makefile
 Makefile.in
 aclocal.m4
@@ -99,12 +145,14 @@ training/Makefile.in
 training/*.o
 training/grammar_convert
 training/model1
-vest/.deps/
-vest/Makefile
-vest/Makefile.in
-vest/mr_vest_generate_mapper_input
-vest/*.o
+dpmert/.deps/
+dpmert/Makefile
+dpmert/Makefile.in
+dpmert/mr_dpmert_generate_mapper_input
+dpmert/*.o
 decoder/logval_test
+dtrain/dtrain
+dtrain/*.o
 extools/build_lexical_translation
 extools/filter_grammar
 extools/score_grammar
@@ -124,7 +172,6 @@ m4/ltoptions.m4
 m4/ltsugar.m4
 m4/ltversion.m4
 m4/lt~obsolete.m4
-vest/mbr_kbest
 extools/featurize_grammar
 extools/filter_score_grammar
 gi/posterior-regularisation/prjava/build/
@@ -143,19 +190,10 @@ gi/posterior-regularisation/prjava/lib/prjava-20100715.jar
 *.ps
 *.toc
 *~
-*/.deps/
-mira/kbest_mira
+gi/pf/align-lexonly
+gi/pf/align-lexonly-pyp
+gi/pf/condnaive
+mteval/scorer_test
 phrasinator/gibbs_train_plm
-training/augment_grammar
-training/mpi_batch_optimize
-training/mpi_em_optimize
-training/test_ngram
-utils/ts
-training/compute_cllh
-dtrain/dtrain
-weights.gz
-dtrain/test/eval/
 phrasinator/gibbs_train_plm_notables
-training/mpi_flex_optimize
-utils/phmt
-dtrain/thesis
+.*