From 38e6f00dcaaa09edfa156eb74bb19b8e1c474f8f Mon Sep 17 00:00:00 2001 From: Chris Dyer Date: Sat, 19 Jan 2013 19:21:24 -0500 Subject: new deps --- .travis.yml | 3 +++ 1 file changed, 3 insertions(+) (limited to '.travis.yml') diff --git a/.travis.yml b/.travis.yml index f3c418b5..14b625ab 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,6 +7,9 @@ before_script: - sudo apt-get install libboost-regex-dev - sudo apt-get install libboost-test-dev - sudo apt-get install libboost-system-dev + - sudo apt-get install libboost-timer-dev + - sudo apt-get install libboost-chrono-dev + - sudo apt-get install libboost-thread-dev - sudo apt-get install flex - autoreconf -ifv - ./configure -- cgit v1.2.3 From eccb84332d9765a0c6afedc77ebdca60c83b249f Mon Sep 17 00:00:00 2001 From: Chris Dyer Date: Sat, 19 Jan 2013 19:46:46 -0500 Subject: deal with chrono/timer --- .travis.yml | 1 + configure.ac | 8 +++++--- python/setup.py.in | 4 ++-- 3 files changed, 8 insertions(+), 5 deletions(-) (limited to '.travis.yml') diff --git a/.travis.yml b/.travis.yml index 14b625ab..38dbd2fa 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,6 +3,7 @@ python: - "2.7" before_script: - sudo apt-get install libboost-program-options-dev + - sudo apt-cache search boost - sudo apt-get install libboost-serialization-dev - sudo apt-get install libboost-regex-dev - sudo apt-get install libboost-test-dev diff --git a/configure.ac b/configure.ac index a1e5ad84..c3e3251c 100644 --- a/configure.ac +++ b/configure.ac @@ -15,8 +15,10 @@ BOOST_REQUIRE([1.44]) BOOST_PROGRAM_OPTIONS BOOST_SYSTEM BOOST_SERIALIZATION -BOOST_CHRONO -BOOST_TIMER +if test $boost_major_version -ge 148; then + BOOST_CHRONO + BOOST_TIMER +fi BOOST_TEST BOOST_THREADS AM_PATH_PYTHON @@ -117,8 +119,8 @@ AC_CONFIG_FILES([klm/util/double-conversion/Makefile]) AC_CONFIG_FILES([klm/util/stream/Makefile]) AC_CONFIG_FILES([klm/util/Makefile]) AC_CONFIG_FILES([klm/lm/Makefile]) -AC_CONFIG_FILES([klm/lm/builder/Makefile]) AC_CONFIG_FILES([klm/search/Makefile]) +AC_CONFIG_FILES([klm/lm/builder/Makefile]) # training stuff AC_CONFIG_FILES([training/Makefile]) diff --git a/python/setup.py.in b/python/setup.py.in index fa8a9f5e..925cb196 100644 --- a/python/setup.py.in +++ b/python/setup.py.in @@ -3,7 +3,7 @@ from distutils.extension import Extension import re INC = ['..', 'src/', '../decoder', '../utils', '../mteval'] -LIB = ['../decoder', '../utils', '../mteval', '../training/utils', '../klm/lm', '../klm/util', '../klm/search'] +LIB = ['../decoder', '../utils', '../mteval', '../training/utils', '../klm/lm', '../klm/util', '../klm/util/double-conversion', '../klm/search'] # Set automatically by configure LIBS = re.findall('-l([^\s]+)', '@LIBS@') @@ -17,7 +17,7 @@ ext_modules = [ sources=['src/_cdec.cpp'], include_dirs=INC, library_dirs=LIB, - libraries=['cdec', 'utils', 'mteval', 'training_utils', 'klm', 'klm_util', 'ksearch'] + LIBS, + libraries=['cdec', 'utils', 'mteval', 'training_utils', 'klm', 'klm_util', 'klm_util_double', 'ksearch'] + LIBS, extra_compile_args=CPPFLAGS, extra_link_args=LDFLAGS), Extension(name='cdec.sa._sa', -- cgit v1.2.3 From d89ea1e829d5f5cd5bee092091739907c642181c Mon Sep 17 00:00:00 2001 From: Chris Dyer Date: Sat, 19 Jan 2013 19:49:56 -0500 Subject: newer versions of boost libs --- .travis.yml | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) (limited to '.travis.yml') diff --git a/.travis.yml b/.travis.yml index 38dbd2fa..c67c5b43 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,15 +2,14 @@ language: python python: - "2.7" before_script: - - sudo apt-get install libboost-program-options-dev - - sudo apt-cache search boost - - sudo apt-get install libboost-serialization-dev - - sudo apt-get install libboost-regex-dev - - sudo apt-get install libboost-test-dev - - sudo apt-get install libboost-system-dev - - sudo apt-get install libboost-timer-dev - - sudo apt-get install libboost-chrono-dev - - sudo apt-get install libboost-thread-dev + - sudo apt-get install libboost-program-options1.48-dev + - sudo apt-get install libboost-serialization1.48-dev + - sudo apt-get install libboost-regex1.48-dev + - sudo apt-get install libboost-test1.48-dev + - sudo apt-get install libboost-system1.48-dev + - sudo apt-get install libboost-timer1.48-dev + - sudo apt-get install libboost-chrono1.48-dev + - sudo apt-get install libboost-thread1.48-dev - sudo apt-get install flex - autoreconf -ifv - ./configure -- cgit v1.2.3 From 7cac43b858f3b681555bf0578f54b1f822c43207 Mon Sep 17 00:00:00 2001 From: Chris Dyer Date: Sun, 20 Jan 2013 10:08:57 -0500 Subject: remove dependency on timer/chrono --- .travis.yml | 2 -- configure.ac | 4 ---- klm/lm/builder/Makefile.am | 2 +- 3 files changed, 1 insertion(+), 7 deletions(-) (limited to '.travis.yml') diff --git a/.travis.yml b/.travis.yml index c67c5b43..d2d25903 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,8 +7,6 @@ before_script: - sudo apt-get install libboost-regex1.48-dev - sudo apt-get install libboost-test1.48-dev - sudo apt-get install libboost-system1.48-dev - - sudo apt-get install libboost-timer1.48-dev - - sudo apt-get install libboost-chrono1.48-dev - sudo apt-get install libboost-thread1.48-dev - sudo apt-get install flex - autoreconf -ifv diff --git a/configure.ac b/configure.ac index c474c050..402ddd0a 100644 --- a/configure.ac +++ b/configure.ac @@ -15,10 +15,6 @@ BOOST_REQUIRE([1.44]) BOOST_PROGRAM_OPTIONS BOOST_SYSTEM BOOST_SERIALIZATION -if test $boost_major_version -ge 148; then - BOOST_CHRONO - BOOST_TIMER -fi BOOST_TEST BOOST_THREADS AM_PATH_PYTHON diff --git a/klm/lm/builder/Makefile.am b/klm/lm/builder/Makefile.am index 00444256..b5c147fd 100644 --- a/klm/lm/builder/Makefile.am +++ b/klm/lm/builder/Makefile.am @@ -22,7 +22,7 @@ builder_SOURCES = \ print.hh \ sort.hh -builder_LDADD = ../libklm.a ../../util/double-conversion/libklm_util_double.a ../../util/stream/libklm_util_stream.a ../../util/libklm_util.a $(BOOST_TIMER_LIBS) $(BOOST_CHRONO_LIBS) $(BOOST_THREAD_LIBS) +builder_LDADD = ../libklm.a ../../util/double-conversion/libklm_util_double.a ../../util/stream/libklm_util_stream.a ../../util/libklm_util.a $(BOOST_THREAD_LIBS) AM_CPPFLAGS = -W -Wall -I$(top_srcdir)/klm -- cgit v1.2.3