From 1b8181bf0d6e9137e6b9ccdbe414aec37377a1a9 Mon Sep 17 00:00:00 2001
From: Chris Dyer <cdyer@allegro.clab.cs.cmu.edu>
Date: Sun, 18 Nov 2012 13:35:42 -0500
Subject: major restructure of the training code

---
 .gitignore | 28 +++++++++++++++++++++++++++-
 1 file changed, 27 insertions(+), 1 deletion(-)

(limited to '.gitignore')

diff --git a/.gitignore b/.gitignore
index aa2e64eb..c6023822 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,6 @@
+example_extff/ff_example.lo
+example_extff/libff_example.la
+mteval/meteor_jar.cc
 *.a
 *.aux
 *.bbl
@@ -176,4 +179,27 @@ utils/reconstruct_weights
 utils/small_vector_test
 utils/ts
 utils/weights_test
-utils/unigram_pyp_lm
+training/crf/mpi_batch_optimize
+training/crf/mpi_compute_cllh
+training/crf/mpi_extract_features
+training/crf/mpi_extract_reachable
+training/crf/mpi_flex_optimize
+training/crf/mpi_online_optimize
+training/dpmert/lo_test
+training/dpmert/mr_dpmert_generate_mapper_input
+training/dpmert/mr_dpmert_map
+training/dpmert/mr_dpmert_reduce
+training/dpmert/sentclient
+training/dpmert/sentserver
+training/dtrain/dtrain
+training/minrisk/minrisk_optimize
+training/mira/kbest_mira
+training/pro/mr_pro_map
+training/pro/mr_pro_reduce
+training/rampion/rampion_cccp
+training/utils/Makefile.am
+training/utils/lbfgs_test
+training/utils/optimize_test
+training/utils/sentclient
+training/utils/sentserver
+word-aligner/fast_align
-- 
cgit v1.2.3


From fbe3415e35f7c16177314422a4f4e146bb4d808f Mon Sep 17 00:00:00 2001
From: Chris Dyer <cdyer@allegro.clab.cs.cmu.edu>
Date: Sun, 18 Nov 2012 13:44:44 -0500
Subject: forgotten makefile

---
 .gitignore                 |  1 -
 training/utils/Makefile.am | 33 +++++++++++++++++++++++++++++++++
 2 files changed, 33 insertions(+), 1 deletion(-)
 create mode 100644 training/utils/Makefile.am

(limited to '.gitignore')

diff --git a/.gitignore b/.gitignore
index c6023822..56372ad4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -197,7 +197,6 @@ training/mira/kbest_mira
 training/pro/mr_pro_map
 training/pro/mr_pro_reduce
 training/rampion/rampion_cccp
-training/utils/Makefile.am
 training/utils/lbfgs_test
 training/utils/optimize_test
 training/utils/sentclient
diff --git a/training/utils/Makefile.am b/training/utils/Makefile.am
new file mode 100644
index 00000000..189d9a76
--- /dev/null
+++ b/training/utils/Makefile.am
@@ -0,0 +1,33 @@
+noinst_LIBRARIES = libtraining_utils.a
+
+bin_PROGRAMS = \
+  sentserver \
+  sentclient
+
+noinst_PROGRAMS = \
+  lbfgs_test \
+  optimize_test
+
+sentserver_SOURCES = sentserver.c
+sentserver_LDFLAGS = -pthread
+
+sentclient_SOURCES = sentclient.c
+sentclient_LDFLAGS = -pthread
+
+TESTS = lbfgs_test optimize_test
+
+libtraining_utils_a_SOURCES = \
+  candidate_set.cc \
+  entropy.cc \
+  optimize.cc \
+  online_optimizer.cc \
+  risk.cc
+
+optimize_test_SOURCES = optimize_test.cc
+optimize_test_LDADD = libtraining_utils.a $(top_srcdir)/utils/libutils.a -lz
+
+lbfgs_test_SOURCES = lbfgs_test.cc
+lbfgs_test_LDADD = $(top_srcdir)/utils/libutils.a -lz
+
+AM_CPPFLAGS = -W -Wall -Wno-sign-compare -I$(top_srcdir)/decoder -I$(top_srcdir)/utils -I$(top_srcdir)/mteval -I$(top_srcdir)/klm
+
-- 
cgit v1.2.3


From 658420843fc5d9e5d75cedd54d191d70cb31ddff Mon Sep 17 00:00:00 2001
From: Chris Dyer <cdyer@Chriss-MacBook-Air.local>
Date: Sun, 20 Jan 2013 09:44:18 -0500
Subject: clean up a bit

---
 .gitignore               | 2 ++
 configure.ac             | 2 +-
 word-aligner/Makefile.am | 2 ++
 3 files changed, 5 insertions(+), 1 deletion(-)

(limited to '.gitignore')

diff --git a/.gitignore b/.gitignore
index 56372ad4..bde0f6a5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,7 +1,9 @@
 example_extff/ff_example.lo
 example_extff/libff_example.la
 mteval/meteor_jar.cc
+training/utils/grammar_convert
 *.a
+*.trs
 *.aux
 *.bbl
 *.blg
diff --git a/configure.ac b/configure.ac
index c3e3251c..c474c050 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT([cdec],[2013-01-19])
+AC_INIT([cdec],[2013-01-20])
 AC_CONFIG_SRCDIR([decoder/cdec.cc])
 AM_INIT_AUTOMAKE
 AC_CONFIG_HEADERS(config.h)
diff --git a/word-aligner/Makefile.am b/word-aligner/Makefile.am
index a195cc5a..1f7f78ae 100644
--- a/word-aligner/Makefile.am
+++ b/word-aligner/Makefile.am
@@ -3,4 +3,6 @@ bin_PROGRAMS = fast_align
 fast_align_SOURCES = fast_align.cc ttables.cc da.h ttables.h
 fast_align_LDADD = ../utils/libutils.a
 
+EXTRA_DIST = aligner.pl ortho-norm support makefiles stemmers
+
 AM_CPPFLAGS = -W -Wall -I$(top_srcdir) -I$(top_srcdir)/utils -I$(top_srcdir)/training
-- 
cgit v1.2.3