diff options
-rw-r--r-- | .gitignore | 2 | ||||
-rw-r--r-- | Makefile.am | 2 | ||||
-rw-r--r-- | configure.ac | 2 | ||||
-rw-r--r-- | decoder/Makefile.am | 2 | ||||
-rw-r--r-- | decoder/ff_const_reorder.cc | 8 | ||||
-rw-r--r-- | utils/Makefile.am | 18 | ||||
-rw-r--r-- | utils/alignment.h (renamed from utils/synutils/alignment.h) | 2 | ||||
-rw-r--r-- | utils/argument_reorder_model.cc (renamed from utils/synutils/argument_reorder_model.cc) | 2 | ||||
-rw-r--r-- | utils/argument_reorder_model.h (renamed from utils/synutils/argument_reorder_model.h) | 0 | ||||
-rw-r--r-- | utils/constituent_reorder_model.cc (renamed from utils/synutils/constituent_reorder_model.cc) | 2 | ||||
-rw-r--r-- | utils/lbfgs.cpp (renamed from utils/synutils/maxent-3.0/lbfgs.cpp) | 0 | ||||
-rw-r--r-- | utils/lbfgs.h (renamed from utils/synutils/maxent-3.0/lbfgs.h) | 0 | ||||
-rw-r--r-- | utils/mathvec.h (renamed from utils/synutils/maxent-3.0/mathvec.h) | 0 | ||||
-rw-r--r-- | utils/maxent.cpp (renamed from utils/synutils/maxent-3.0/maxent.cpp) | 0 | ||||
-rw-r--r-- | utils/maxent.h (renamed from utils/synutils/maxent-3.0/maxent.h) | 0 | ||||
-rw-r--r-- | utils/owlqn.cpp (renamed from utils/synutils/maxent-3.0/owlqn.cpp) | 0 | ||||
-rw-r--r-- | utils/sgd.cpp (renamed from utils/synutils/maxent-3.0/sgd.cpp) | 0 | ||||
-rw-r--r-- | utils/srl_sentence.h (renamed from utils/synutils/srl_sentence.h) | 2 | ||||
-rw-r--r-- | utils/synutils.h (renamed from utils/synutils/utility.h) | 0 | ||||
-rw-r--r-- | utils/synutils/Makefile.am | 6 | ||||
-rw-r--r-- | utils/synutils/maxent-3.0/Makefile.am | 10 | ||||
-rw-r--r-- | utils/tree.h (renamed from utils/synutils/tree.h) | 0 | ||||
-rw-r--r-- | utils/tsuruoka_maxent.h (renamed from utils/synutils/tsuruoka_maxent.h) | 6 |
23 files changed, 29 insertions, 35 deletions
@@ -183,6 +183,7 @@ training/plftools training/test_ngram utils/atools utils/bin/ +utils/const_reorder_model_trainer utils/crp_test utils/dict_test utils/logval_test @@ -192,7 +193,6 @@ utils/phmt utils/reconstruct_weights utils/small_vector_test utils/sv_test -utils/synutils/const_reorder_model_trainer utils/ts utils/weights_test training/crf/mpi_adagrad_optimize diff --git a/Makefile.am b/Makefile.am index ce49799a..a2d2f332 100644 --- a/Makefile.am +++ b/Makefile.am @@ -3,8 +3,6 @@ # cyclic dependencies between these directories! SUBDIRS = \ utils \ - utils/synutils/maxent-3.0 \ - utils/synutils \ klm/util/double-conversion \ klm/util \ klm/util/stream \ diff --git a/configure.ac b/configure.ac index e1ec47ee..0b1f04f0 100644 --- a/configure.ac +++ b/configure.ac @@ -208,8 +208,6 @@ fi # core cdec stuff AC_CONFIG_FILES([Makefile]) AC_CONFIG_FILES([utils/Makefile]) -AC_CONFIG_FILES([utils/synutils/maxent-3.0/Makefile]) -AC_CONFIG_FILES([utils/synutils/Makefile]) AC_CONFIG_FILES([mteval/Makefile]) AC_CONFIG_FILES([mteval/meteor_jar.cc]) AC_CONFIG_FILES([decoder/Makefile]) diff --git a/decoder/Makefile.am b/decoder/Makefile.am index 6577cc12..cc52ccd4 100644 --- a/decoder/Makefile.am +++ b/decoder/Makefile.am @@ -21,7 +21,7 @@ trule_test_LDADD = $(BOOST_UNIT_TEST_FRAMEWORK_LDFLAGS) $(BOOST_UNIT_TEST_FRAMEW cdec_SOURCES = cdec.cc cdec_LDFLAGS= -rdynamic $(STATIC_FLAGS) -cdec_LDADD = libcdec.a ../mteval/libmteval.a ../utils/libutils.a ../utils/synutils/maxent-3.0/libtsuruoka_maxent.a ../klm/search/libksearch.a ../klm/lm/libklm.a ../klm/util/libklm_util.a ../klm/util/double-conversion/libklm_util_double.a +cdec_LDADD = libcdec.a ../mteval/libmteval.a ../utils/libutils.a ../klm/search/libksearch.a ../klm/lm/libklm.a ../klm/util/libklm_util.a ../klm/util/double-conversion/libklm_util_double.a AM_CPPFLAGS = -DTEST_DATA=\"$(top_srcdir)/decoder/test_data\" -DBOOST_TEST_DYN_LINK -W -Wno-sign-compare -I$(top_srcdir) -I$(top_srcdir)/mteval -I$(top_srcdir)/utils -I$(top_srcdir)/klm diff --git a/decoder/ff_const_reorder.cc b/decoder/ff_const_reorder.cc index 77582b7c..97b76f7f 100644 --- a/decoder/ff_const_reorder.cc +++ b/decoder/ff_const_reorder.cc @@ -3,11 +3,11 @@ #include "stringlib.h" #include "hg.h" #include "sentence_metadata.h" -#include "synutils/tree.h" -#include "synutils/srl_sentence.h" -#include "synutils/tsuruoka_maxent.h" +#include "tree.h" +#include "srl_sentence.h" +#include "tsuruoka_maxent.h" #include "hash.h" -#include "synutils/argument_reorder_model.h" +#include "argument_reorder_model.h" #include <string> #include <vector> diff --git a/utils/Makefile.am b/utils/Makefile.am index 727fa8a5..0bd21b2b 100644 --- a/utils/Makefile.am +++ b/utils/Makefile.am @@ -1,4 +1,4 @@ -bin_PROGRAMS = reconstruct_weights atools +bin_PROGRAMS = reconstruct_weights atools const_reorder_model_trainer noinst_PROGRAMS = \ ts \ @@ -20,7 +20,9 @@ noinst_LIBRARIES = libutils.a libutils_a_SOURCES = \ test_data \ alias_sampler.h \ + alignment.h \ alignment_io.h \ + argument_reorder_model.h \ array2d.h \ b64tools.h \ batched_append.h \ @@ -38,13 +40,20 @@ libutils_a_SOURCES = \ have_64_bits.h \ indices_after.h \ kernel_string_subseq.h \ + lbfgs.h \ + lbfgs.cpp \ logval.h \ m.h \ + mathvec.h \ + maxent.h \ + maxent.cpp \ murmur_hash3.h \ murmur_hash3.cc \ named_enum.h \ null_deleter.h \ null_traits.h \ + owlqn.cpp \ + sgd.cpp \ perfect_hash.h \ prob.h \ sampler.h \ @@ -52,12 +61,15 @@ libutils_a_SOURCES = \ show.h \ small_vector.h \ sparse_vector.h \ + srl_sentence.h \ star.h \ static_utoa.h \ stringlib.h \ string_piece.hh \ tdict.h \ timing_stats.h \ + tree.h \ + tsuruoka_maxent.h \ utoa.h \ value_array.h \ verbose.h \ @@ -79,6 +91,7 @@ libutils_a_SOURCES = \ filelib.cc \ stringlib.cc \ string_piece.cc \ + synutils.h \ sparse_vector.cc \ timing_stats.cc \ verbose.cc \ @@ -93,6 +106,8 @@ reconstruct_weights_LDADD = libutils.a atools_SOURCES = atools.cc atools_LDADD = libutils.a atools_LDFLAGS = $(STATIC_FLAGS) +const_reorder_model_trainer_SOURCES = constituent_reorder_model.cc +const_reorder_model_trainer_LDADD = libutils.a phmt_SOURCES = phmt.cc phmt_LDADD = libutils.a $(BOOST_UNIT_TEST_FRAMEWORK_LDFLAGS) $(BOOST_UNIT_TEST_FRAMEWORK_LIBS) @@ -117,4 +132,3 @@ stringlib_test_LDADD = libutils.a $(BOOST_UNIT_TEST_FRAMEWORK_LDFLAGS) $(BOOST_U # do NOT NOT NOT add any other -I includes NO NO NO NO NO ###### AM_CPPFLAGS = -DBOOST_TEST_DYN_LINK -W -Wall -I. -I$(top_srcdir) -DTEST_DATA=\"$(top_srcdir)/utils/test_data\" ################################################################ - diff --git a/utils/synutils/alignment.h b/utils/alignment.h index 6abd12bc..c0648aab 100644 --- a/utils/synutils/alignment.h +++ b/utils/alignment.h @@ -13,7 +13,7 @@ #include <stdio.h> #include <string.h> -#include "utils/stringlib.h" +#include "stringlib.h" using namespace std; diff --git a/utils/synutils/argument_reorder_model.cc b/utils/argument_reorder_model.cc index 2b6bcda1..58886251 100644 --- a/utils/synutils/argument_reorder_model.cc +++ b/utils/argument_reorder_model.cc @@ -9,7 +9,7 @@ #include <fstream> #include "argument_reorder_model.h" -#include "utility.h" +#include "synutils.h" #include "tsuruoka_maxent.h" inline void fnPreparingTrainingdata(const char* pszFName, int iCutoff, diff --git a/utils/synutils/argument_reorder_model.h b/utils/argument_reorder_model.h index 062b8841..062b8841 100644 --- a/utils/synutils/argument_reorder_model.h +++ b/utils/argument_reorder_model.h diff --git a/utils/synutils/constituent_reorder_model.cc b/utils/constituent_reorder_model.cc index 78d61b90..042c751b 100644 --- a/utils/synutils/constituent_reorder_model.cc +++ b/utils/constituent_reorder_model.cc @@ -9,7 +9,7 @@ #include "alignment.h" #include "tree.h" -#include "utility.h" +#include "synutils.h" #include "tsuruoka_maxent.h" #include <unordered_map> diff --git a/utils/synutils/maxent-3.0/lbfgs.cpp b/utils/lbfgs.cpp index bd26f048..bd26f048 100644 --- a/utils/synutils/maxent-3.0/lbfgs.cpp +++ b/utils/lbfgs.cpp diff --git a/utils/synutils/maxent-3.0/lbfgs.h b/utils/lbfgs.h index ed5cd944..ed5cd944 100644 --- a/utils/synutils/maxent-3.0/lbfgs.h +++ b/utils/lbfgs.h diff --git a/utils/synutils/maxent-3.0/mathvec.h b/utils/mathvec.h index f8c60e5d..f8c60e5d 100644 --- a/utils/synutils/maxent-3.0/mathvec.h +++ b/utils/mathvec.h diff --git a/utils/synutils/maxent-3.0/maxent.cpp b/utils/maxent.cpp index 8d00ac1d..8d00ac1d 100644 --- a/utils/synutils/maxent-3.0/maxent.cpp +++ b/utils/maxent.cpp diff --git a/utils/synutils/maxent-3.0/maxent.h b/utils/maxent.h index 88a04e25..88a04e25 100644 --- a/utils/synutils/maxent-3.0/maxent.h +++ b/utils/maxent.h diff --git a/utils/synutils/maxent-3.0/owlqn.cpp b/utils/owlqn.cpp index c3a0f0da..c3a0f0da 100644 --- a/utils/synutils/maxent-3.0/owlqn.cpp +++ b/utils/owlqn.cpp diff --git a/utils/synutils/maxent-3.0/sgd.cpp b/utils/sgd.cpp index 8613edca..8613edca 100644 --- a/utils/synutils/maxent-3.0/sgd.cpp +++ b/utils/sgd.cpp diff --git a/utils/synutils/srl_sentence.h b/utils/srl_sentence.h index 1afdec45..61532fb2 100644 --- a/utils/synutils/srl_sentence.h +++ b/utils/srl_sentence.h @@ -13,7 +13,7 @@ #include <vector> #include "tree.h" -#include "utils/stringlib.h" +#include "stringlib.h" using namespace std; diff --git a/utils/synutils/utility.h b/utils/synutils.h index ef7b78b7..ef7b78b7 100644 --- a/utils/synutils/utility.h +++ b/utils/synutils.h diff --git a/utils/synutils/Makefile.am b/utils/synutils/Makefile.am deleted file mode 100644 index ac76be40..00000000 --- a/utils/synutils/Makefile.am +++ /dev/null @@ -1,6 +0,0 @@ -bin_PROGRAMS = const_reorder_model_trainer - -const_reorder_model_trainer_SOURCES = constituent_reorder_model.cc -const_reorder_model_trainer_LDADD = maxent-3.0/libtsuruoka_maxent.a - -AM_CPPFLAGS = -W -Wall -I$(top_srcdir) diff --git a/utils/synutils/maxent-3.0/Makefile.am b/utils/synutils/maxent-3.0/Makefile.am deleted file mode 100644 index 64bb038c..00000000 --- a/utils/synutils/maxent-3.0/Makefile.am +++ /dev/null @@ -1,10 +0,0 @@ -noinst_LIBRARIES = libtsuruoka_maxent.a - -libtsuruoka_maxent_a_SOURCES = \ - lbfgs.cpp \ - maxent.cpp \ - owlqn.cpp \ - sgd.cpp - -AM_CPPFLAGS = -W -Wall - diff --git a/utils/synutils/tree.h b/utils/tree.h index 8070f828..8070f828 100644 --- a/utils/synutils/tree.h +++ b/utils/tree.h diff --git a/utils/synutils/tsuruoka_maxent.h b/utils/tsuruoka_maxent.h index 89b06b97..e6bef232 100644 --- a/utils/synutils/tsuruoka_maxent.h +++ b/utils/tsuruoka_maxent.h @@ -6,9 +6,9 @@ #ifndef TSURUOKA_MAXENT_H_ #define TSURUOKA_MAXENT_H_ -#include "utility.h" -#include "utils/stringlib.h" -#include "utils/synutils/maxent-3.0/maxent.h" +#include "synutils.h" +#include "stringlib.h" +#include "maxent.h" #include <assert.h> #include <vector> |