diff options
| author | Chris Dyer <cdyer@allegro.clab.cs.cmu.edu> | 2013-01-19 19:46:46 -0500 |
|---|---|---|
| committer | Chris Dyer <cdyer@allegro.clab.cs.cmu.edu> | 2013-01-19 19:46:46 -0500 |
| commit | 333afa9a19a812ad0945fa3edaeb3f4314e57d42 (patch) | |
| tree | a39f61a0b58d4e1b940a01f897616374c35ae591 | |
| parent | 12ad52c39cb5bbe2082da5bd7c620c94a7fad4ca (diff) | |
deal with chrono/timer
| -rw-r--r-- | .travis.yml | 1 | ||||
| -rw-r--r-- | configure.ac | 8 | ||||
| -rw-r--r-- | python/setup.py.in | 4 |
3 files changed, 8 insertions, 5 deletions
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', |