[irstlm] 95/126: some changes

[Giulio Paci]

This is an automated email from the git hooks/post-receive script.

giuliopaci-guest pushed a commit to annotated tag adaptiveLM.v0.1
in repository irstlm.

commit 3fbf7e6ce7d16473880dfe8de074eae98a57362b
Merge: 6f4f6f5 8bf3fd9
Author: nicolabertoldi <bertoldi at fbk.eu>
Date:   Mon Sep 21 14:11:16 2015 +0200

    some changes

 src/CMakeLists.txt     | 27 ++-------------------------
 src/Makefile.am        |  8 +-------
 src/cmd.c              | 22 +++++++++++++++++-----
 src/n_gram.cpp         |  2 +-
 src/n_gram.h           |  2 +-
 src/verify-caching.cpp |  2 +-
 6 files changed, 23 insertions(+), 40 deletions(-)

diff --cc src/CMakeLists.txt
index 5e1509d,7655c0d..a23784e
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@@ -6,20 -6,11 +6,7 @@@ ADD_DEFINITIONS("-D_LARGE_FILES"
  ADD_DEFINITIONS("-D_FILE_OFFSET_BITS=64")
  ADD_DEFINITIONS("-DMYCODESIZE=3")
  ADD_DEFINITIONS("-DDEBUG")
- #ADD_DEFINITIONS("-DTRACE_LEVEL=1")
 -##ADD_DEFINITIONS("-DTRACE_LEVEL=1")
--
--if (TRACE_LEVEL)
--  ADD_DEFINITIONS("-DTRACE_LEVEL=${TRACE_LEVEL}")
- endif()
- 
- if (OPTION)
-   ADD_DEFINITIONS("-DOPTION_${OPTION}")
- endif()
- 
- if (SOLUTION)
-   ADD_DEFINITIONS("-DSOLUTION_${SOLUTION}")
--endif()
- 
++ADD_DEFINITIONS("-DTRACE_LEVEL=1")
  
  if (CXX0)
    MESSAGE( STATUS "HAVE_CXX0=true; hence, variable HAVE_CXX0 is set" )
@@@ -79,7 -60,7 +56,7 @@@ SET( LIB_IRSTLM_SR
  ADD_LIBRARY(irstlm STATIC ${LIB_IRSTLM_SRC})
  LINK_DIRECTORIES (${LIBRARY_OUTPUT_PATH})
  
- FOREACH(CMD dict ngt tlm dtsel plsa cswa compile-lm interpolate-lm prune-lm quantize-lm score-lm context-dependent-evaluation)
 -FOREACH(CMD dict ngt tlm dtsel plsa cswa compile-lm interpolate-lm prune-lm quantize-lm score-lm verify-caching test-multithreading)
++FOREACH(CMD dict ngt tlm dtsel plsa cswa compile-lm interpolate-lm prune-lm quantize-lm score-lm)
  
  ADD_EXECUTABLE(${CMD} ${CMD}.cpp)
  TARGET_LINK_LIBRARIES (${CMD} irstlm -lm -lz -lpthread)
diff --cc src/Makefile.am
index 63e2107,873f7b7..1f8a065
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@@ -73,7 -69,7 +69,7 @@@ libirstlm_la_LIBADD = $(BOOST_LDFLAGS) 
  LDADD = -lirstlm -lpthread
  DEPENDENCIES = libirstlm.la
  
- bin_PROGRAMS = dict ngt dtsel compile-lm interpolate-lm prune-lm quantize-lm prune-lm score-lm tlm plsa verify-caching cswa context-dependent-evaluation
 -bin_PROGRAMS = dict ngt dtsel compile-lm interpolate-lm prune-lm quantize-lm prune-lm score-lm tlm plsa verify-caching cswa test-multithreading
++bin_PROGRAMS = dict ngt dtsel compile-lm interpolate-lm prune-lm quantize-lm prune-lm score-lm tlm plsa verify-caching cswa
  
  dict_SOURCES = dict.cpp
  dict_DEPENDENCIES = $(DEPENDENCIES)
@@@ -99,5 -95,5 +95,3 @@@ verify_caching_SOURCES = verify-caching
  verify_caching_DEPENDENCIES = $(DEPENDENCIES)
  cswa_SOURCES = cswa.cpp
  cswa_DEPENDENCIES = $(DEPENDENCIES)
- context_dependent_evaluation_SOURCES = context-dependent-evaluation.cpp
- context_dependent_evaluation_DEPENDENCIES = $(DEPENDENCIES)
 -test_multithreading_SOURCES = test-multithreading.cpp
 -test_multithreading_DEPENDENCIES = $(DEPENDENCIES)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/irstlm.git