mirror of
https://github.com/moses-smt/mosesdecoder.git
synced 2024-09-11 11:25:40 +03:00
Avoid naming conflict with glibc's libutil
This commit is contained in:
parent
a0efeb5e6e
commit
f564876e5e
10
lm/Jamfile
10
lm/Jamfile
@ -1,12 +1,12 @@
|
||||
lib lm : 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 virtual_interface.cc vocab.cc ../util//util : <include>.. : : <include>.. ;
|
||||
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 virtual_interface.cc vocab.cc ../util//kenutil : <include>.. : : <include>.. ;
|
||||
|
||||
import testing ;
|
||||
|
||||
run left_test.cc lm ..//boost_unit_test_framework : : test.arpa ;
|
||||
run model_test.cc lm ..//boost_unit_test_framework : : test.arpa test_nounk.arpa ;
|
||||
run left_test.cc kenlm ..//boost_unit_test_framework : : test.arpa ;
|
||||
run model_test.cc kenlm ..//boost_unit_test_framework : : test.arpa test_nounk.arpa ;
|
||||
|
||||
exe query : ngram_query.cc lm ;
|
||||
exe build_binary : build_binary.cc lm ;
|
||||
exe query : ngram_query.cc kenlm ;
|
||||
exe build_binary : build_binary.cc kenlm ;
|
||||
|
||||
install legacy : build_binary query
|
||||
: <location>$(TOP)/lm <install-type>EXE <install-dependencies>on <link>shared:<dll-path>$(TOP)/lm <link>shared:<install-type>LIB ;
|
||||
|
@ -29,7 +29,7 @@ TERsrc/tools.cpp
|
||||
TerScorer.cpp
|
||||
CderScorer.cpp
|
||||
MergeScorer.cpp
|
||||
../util//util m ..//z ;
|
||||
../util//kenutil m ..//z ;
|
||||
|
||||
exe mert : mert.cpp mert_lib ../moses/src//ThreadPool ;
|
||||
|
||||
|
@ -1,4 +1,4 @@
|
||||
alias headers : ../../util//util : : : <include>. ;
|
||||
alias headers : ../../util//kenutil : : : <include>. ;
|
||||
|
||||
alias ThreadPool : ThreadPool.cpp ;
|
||||
|
||||
|
@ -52,4 +52,4 @@ if $(with-randlm) != ""
|
||||
}
|
||||
|
||||
lib LM : Base.cpp Factory.cpp Implementation.cpp Joint.cpp Ken.cpp MultiFactor.cpp Remote.cpp SingleFactor.cpp
|
||||
../../../lm//lm irst sri rand ..//headers ;
|
||||
../../../lm//kenlm irst sri rand ..//headers ;
|
||||
|
14
util/Jamfile
14
util/Jamfile
@ -1,10 +1,10 @@
|
||||
lib util : bit_packing.cc ersatz_progress.cc exception.cc file.cc file_piece.cc mmap.cc murmur_hash.cc ..//z : <include>.. : : <include>.. ;
|
||||
lib kenutil : bit_packing.cc ersatz_progress.cc exception.cc file.cc file_piece.cc mmap.cc murmur_hash.cc ..//z : <include>.. : : <include>.. ;
|
||||
|
||||
import testing ;
|
||||
|
||||
unit-test bit_packing_test : bit_packing_test.cc util ..//boost_unit_test_framework ;
|
||||
run file_piece_test.cc util ..//boost_unit_test_framework : : file_piece.cc ;
|
||||
unit-test joint_sort_test : joint_sort_test.cc util ..//boost_unit_test_framework ;
|
||||
unit-test probing_hash_table_test : probing_hash_table_test.cc util ..//boost_unit_test_framework ;
|
||||
unit-test sorted_uniform_test : sorted_uniform_test.cc util ..//boost_unit_test_framework ;
|
||||
unit-test tokenize_piece_test : tokenize_piece_test.cc util ..//boost_unit_test_framework ;
|
||||
unit-test bit_packing_test : bit_packing_test.cc kenutil ..//boost_unit_test_framework ;
|
||||
run file_piece_test.cc kenutil ..//boost_unit_test_framework : : file_piece.cc ;
|
||||
unit-test joint_sort_test : joint_sort_test.cc kenutil ..//boost_unit_test_framework ;
|
||||
unit-test probing_hash_table_test : probing_hash_table_test.cc kenutil ..//boost_unit_test_framework ;
|
||||
unit-test sorted_uniform_test : sorted_uniform_test.cc kenutil ..//boost_unit_test_framework ;
|
||||
unit-test tokenize_piece_test : tokenize_piece_test.cc kenutil ..//boost_unit_test_framework ;
|
||||
|
Loading…
Reference in New Issue
Block a user