From c67fceb6d047f33d6bd450a086d7240cf0bad6ce Mon Sep 17 00:00:00 2001 From: Chris Dyer Date: Mon, 20 Jan 2014 20:00:16 -0500 Subject: fix for build --- extractor/Makefile.am | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) (limited to 'extractor/Makefile.am') diff --git a/extractor/Makefile.am b/extractor/Makefile.am index e5b439f9..40112e5e 100644 --- a/extractor/Makefile.am +++ b/extractor/Makefile.am @@ -1,7 +1,5 @@ -bin_PROGRAMS = compile run_extractor extract - -if HAVE_CXX11 +bin_PROGRAMS = sacompile run_extractor extract EXTRA_PROGRAMS = alignment_test \ data_array_test \ @@ -114,8 +112,8 @@ vocabulary_test_LDADD = $(GTEST_LDFLAGS) $(GTEST_LIBS) libextractor.a noinst_LIBRARIES = libextractor.a -compile_SOURCES = compile.cc -compile_LDADD = libextractor.a +sacompile_SOURCES = sacompile.cc +sacompile_LDADD = libextractor.a run_extractor_SOURCES = run_extractor.cc run_extractor_LDADD = libextractor.a extract_SOURCES = extract.cc @@ -156,6 +154,5 @@ libextractor_a_SOURCES = \ translation_table.cc \ vocabulary.cc -AM_CPPFLAGS = -W -Wall -Wno-sign-compare $(CXX11_SWITCH) -fopenmp $(GTEST_CPPFLAGS) $(GMOCK_CPPFLAGS) +AM_CPPFLAGS = -W -Wall -Wno-sign-compare -fopenmp $(GTEST_CPPFLAGS) $(GMOCK_CPPFLAGS) AM_LDFLAGS = -fopenmp -endif -- cgit v1.2.3 From d3e4130fd182a71f986c3baa00c2453d672bbc12 Mon Sep 17 00:00:00 2001 From: Chris Dyer Date: Mon, 20 Jan 2014 20:25:00 -0500 Subject: update date, copyright --- configure.ac | 2 +- decoder/decoder.cc | 2 +- extractor/Makefile.am | 36 +++++++++++++++++++++++++++++++++++- training/liblbfgs/Makefile.am | 7 +++---- 4 files changed, 40 insertions(+), 7 deletions(-) (limited to 'extractor/Makefile.am') diff --git a/configure.ac b/configure.ac index d5261b8e..e5d2dadb 100644 --- a/configure.ac +++ b/configure.ac @@ -1,5 +1,5 @@ AC_CONFIG_MACRO_DIR([m4]) -AC_INIT([cdec],[2014-01-19]) +AC_INIT([cdec],[2014-01-20]) AC_CONFIG_SRCDIR([decoder/cdec.cc]) AM_INIT_AUTOMAKE AC_CONFIG_HEADERS(config.h) diff --git a/decoder/decoder.cc b/decoder/decoder.cc index 5bb62710..e02c7730 100644 --- a/decoder/decoder.cc +++ b/decoder/decoder.cc @@ -86,7 +86,7 @@ struct ELengthWeightFunction { } }; inline void ShowBanner() { - cerr << "cdec (c) 2009--2013 by Chris Dyer\n"; + cerr << "cdec (c) 2009--2014 by Chris Dyer\n"; } inline string str(char const* name,po::variables_map const& conf) { diff --git a/extractor/Makefile.am b/extractor/Makefile.am index 40112e5e..a4ffac11 100644 --- a/extractor/Makefile.am +++ b/extractor/Makefile.am @@ -132,6 +132,14 @@ libextractor_a_SOURCES = \ features/max_lex_target_given_source.cc \ features/sample_source_count.cc \ features/target_given_source_coherent.cc \ + features/count_source_target.h \ + features/feature.h \ + features/is_source_singleton.h \ + features/is_source_target_singleton.h \ + features/max_lex_source_given_target.h \ + features/max_lex_target_given_source.h \ + features/sample_source_count.h \ + features/target_given_source_coherent.h \ grammar.cc \ grammar_extractor.cc \ matchings_finder.cc \ @@ -152,7 +160,33 @@ libextractor_a_SOURCES = \ target_phrase_extractor.cc \ time_util.cc \ translation_table.cc \ - vocabulary.cc + vocabulary.cc \ + alignment.h \ + backoff_sampler.h \ + data_array.h \ + fast_intersector.h \ + grammar.h \ + grammar_extractor.h \ + matchings_finder.h \ + matchings_sampler.h \ + matchings_trie.h \ + phrase.h \ + phrase_builder.h \ + phrase_location.h \ + phrase_location_sampler.h \ + precomputation.h \ + rule.h \ + rule_extractor.h \ + rule_extractor_helper.h \ + rule_factory.h \ + sampler.h \ + scorer.h \ + suffix_array.h \ + suffix_array_sampler.h \ + target_phrase_extractor.h \ + time_util.h \ + translation_table.h \ + vocabulary.h AM_CPPFLAGS = -W -Wall -Wno-sign-compare -fopenmp $(GTEST_CPPFLAGS) $(GMOCK_CPPFLAGS) AM_LDFLAGS = -fopenmp diff --git a/training/liblbfgs/Makefile.am b/training/liblbfgs/Makefile.am index 272d6f56..aa3af377 100644 --- a/training/liblbfgs/Makefile.am +++ b/training/liblbfgs/Makefile.am @@ -1,10 +1,9 @@ -TESTS = ll_test -noinst_PROGRAMS = ll_test +noinst_LIBRARIES = liblbfgs.a +noinst_PROGRAMS = ll_test ll_test_SOURCES = ll_test.cc ll_test_LDADD = liblbfgs.a -lz - -noinst_LIBRARIES = liblbfgs.a +TESTS = ll_test liblbfgs_a_SOURCES = \ lbfgs.c \ -- cgit v1.2.3 From e18b8392f632d2dd69b74b8df3a42308e625f294 Mon Sep 17 00:00:00 2001 From: Chris Dyer Date: Mon, 20 Jan 2014 20:35:10 -0500 Subject: fix openmp flag usage --- extractor/Makefile.am | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'extractor/Makefile.am') diff --git a/extractor/Makefile.am b/extractor/Makefile.am index a4ffac11..a406d9dc 100644 --- a/extractor/Makefile.am +++ b/extractor/Makefile.am @@ -188,5 +188,5 @@ libextractor_a_SOURCES = \ translation_table.h \ vocabulary.h -AM_CPPFLAGS = -W -Wall -Wno-sign-compare -fopenmp $(GTEST_CPPFLAGS) $(GMOCK_CPPFLAGS) -AM_LDFLAGS = -fopenmp +AM_CPPFLAGS = -W -Wall -Wno-sign-compare $(OPENMP_CXXFLAGS) $(GTEST_CPPFLAGS) $(GMOCK_CPPFLAGS) +AM_LDFLAGS = $(OPENMP_CXXFLAGS) -- cgit v1.2.3