Move language model ifdefs to Factory.cpp

This commit is contained in:
Kenneth Heafield 2011-11-18 11:31:07 +00:00
parent 5d9bdaa93a
commit 1192e6f2b0
2 changed files with 31 additions and 30 deletions

View File

@ -26,6 +26,37 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
#include "TypeDef.h"
#include "FactorCollection.h"
/////////////////////////////////////////////////
// for those using autoconf/automake
#if HAVE_CONFIG_H
#include "config.h"
#define LM_REMOTE 1
# ifdef HAVE_SRILM
# define LM_SRI 1
# else
# undef LM_SRI
# endif
# ifdef HAVE_IRSTLM
# define LM_IRST 1
# endif
# ifdef HAVE_RANDLM
# define LM_RAND 1
# endif
# ifdef HAVE_ORLM
# define LM_ORLM 1
# endif
# define LM_KEN 1
# ifdef HAVE_DMAPLM
# define LM_DMAP
# endif
#endif
// include appropriate header
#ifdef LM_SRI
# include "LM/SRI.h"

View File

@ -72,36 +72,6 @@ const size_t DEFAULT_VERBOSE_LEVEL = 1;
// for those using autoconf/automake
#if HAVE_CONFIG_H
#include "config.h"
//#define TRACE_ENABLE 1 // REMOVE after we figure this out
#define LM_INTERNAL 1
#define LM_REMOTE 1
# ifdef HAVE_SRILM
# define LM_SRI 1
# else
# undef LM_SRI
# endif
# ifdef HAVE_IRSTLM
# define LM_IRST 1
# endif
# ifdef HAVE_RANDLM
# define LM_RAND 1
# endif
# ifdef HAVE_ORLM
# define LM_ORLM 1
# endif
# define LM_KEN 1
# ifdef HAVE_DMAPLM
# define LM_DMAP
# endif
#endif
/////////////////////////////////////////////////