diff options
| -rw-r--r-- | lm/Jamfile | 5 | ||||
| -rw-r--r-- | moses/src/DynSAInclude/Jamfile | 2 | ||||
| -rw-r--r-- | moses/src/Jamfile | 6 | ||||
| -rw-r--r-- | moses/src/TypeDef.h | 2 |
4 files changed, 11 insertions, 4 deletions
diff --git a/lm/Jamfile b/lm/Jamfile index c537d93d4..ef45a6a50 100644 --- a/lm/Jamfile +++ b/lm/Jamfile @@ -8,7 +8,10 @@ if ( $(max-order) != 6 ) { } max-order = <define>KENLM_MAX_ORDER=$(max-order) ; -lib kenlm : bhiksha.cc binary_format.cc config.cc lm_exception.cc model.cc quantize.cc read_arpa.cc search_hashed.cc search_trie.cc trie.cc trie_sort.cc value_build.cc virtual_interface.cc vocab.cc ../util//kenutil : <include>.. $(max-order) : : <include>.. <library>../util//kenutil $(max-order) ; +path-constant ORDER-LOG : bin/order.log ; +update-if-changed $(ORDER-LOG) $(max-order) ; + +lib kenlm : bhiksha.cc binary_format.cc config.cc lm_exception.cc model.cc quantize.cc read_arpa.cc search_hashed.cc search_trie.cc trie.cc trie_sort.cc value_build.cc virtual_interface.cc vocab.cc ../util//kenutil : <include>.. $(max-order) : : <include>.. <library>../util//kenutil $(max-order) <dependency>$(ORDER-LOG) ; import testing ; diff --git a/moses/src/DynSAInclude/Jamfile b/moses/src/DynSAInclude/Jamfile index ff4bd6f76..616d19bb6 100644 --- a/moses/src/DynSAInclude/Jamfile +++ b/moses/src/DynSAInclude/Jamfile @@ -1 +1 @@ -lib dynsa : [ glob *.cpp ] ../../../util//kenutil : : : <include>. ; +lib dynsa : [ glob *.cpp ] ../../../util//kenutil ..//headers : : : <include>. ; diff --git a/moses/src/Jamfile b/moses/src/Jamfile index 4dcfc7437..cdc7c0395 100644 --- a/moses/src/Jamfile +++ b/moses/src/Jamfile @@ -1,4 +1,8 @@ -alias headers : ../../util//kenutil : : : <include>. ; +max-factors = [ option.get "max-factors" : 4 : 4 ] ; +path-constant FACTOR-LOG : bin/factor.log ; +update-if-changed $(FACTOR-LOG) $(max-factors) ; + +alias headers : ../../util//kenutil : : : <include>. <define>MAX_NUM_FACTORS=$(max-factors) <dependency>$(FACTOR-LOG) ; alias ThreadPool : ThreadPool.cpp ; diff --git a/moses/src/TypeDef.h b/moses/src/TypeDef.h index 450cb410b..faf98c448 100644 --- a/moses/src/TypeDef.h +++ b/moses/src/TypeDef.h @@ -74,7 +74,7 @@ const size_t DEFAULT_VERBOSE_LEVEL = 1; // can only be 2 at the moment const int NUM_LANGUAGES = 2; -const size_t MAX_NUM_FACTORS = 4; +// Looking for MAX_NUM_FACTORS? It's defined by the build system: bjam --max-factors=4 enum FactorDirection { Input, //! Source factors |