moses-smt/mosesdecoder
1
1
Fork 0
mirror of https://github.com/moses-smt/mosesdecoder.git synced 2024-09-11 11:25:40 +03:00
Code Issues Packages Projects Releases Wiki Activity

resolved merge conflicts

Browse Source
This commit is contained in:
Hieu Hoang 2012-11-12 20:35:32 +00:00
commit 44f24bd673
10 changed files with 27 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
OnDiskPt/Jamfile
View File

@ -1,4 +1,4 @@
lib OnDiskPt : OnDiskWrapper.cpp SourcePhrase.cpp TargetPhrase.cpp Word.cpp Phrase.cpp PhraseNode.cpp TargetPhraseCollection.cpp Vocab.cpp ../moses//headers ;
fakelib OnDiskPt : OnDiskWrapper.cpp SourcePhrase.cpp TargetPhrase.cpp Word.cpp Phrase.cpp PhraseNode.cpp TargetPhraseCollection.cpp Vocab.cpp ../moses//headers ;
exe CreateOnDiskPt : Main.cpp ../moses//moses OnDiskPt ;
exe queryOnDiskPt : queryOnDiskPt.cpp ../moses//moses OnDiskPt ;

18
jam-files/sanity.jam
View File

@ -265,4 +265,22 @@ if [ option.get "sanity-test" : : "yes" ] {
}
}
#Hack to act like alias in the sense that no lib is built, but only build cpp files once.
import type ;
rule fakelib ( name : deps * : requirements * : default-build * : usage-requirements * ) {
local c-files = ;
local real-deps = ;
for local c in $(deps) {
if [ type.type $(c) ] = CPP {
c-files += $(c) ;
} else {
real-deps += $(c) ;
}
}
for local c in $(c-files) {
obj $(c:B).o : $(c) $(real-deps) : $(requirements) : $(default-build) : $(usage_requirements) ;
}
alias $(name) : $(c-files:B).o $(real-deps) : $(requirements) : $(default-build) : $(usage-requirements) ;
}
use-project /top : . ;

2
lm/Jamfile
View File

@ -13,7 +13,7 @@ update-if-changed $(ORDER-LOG) $(max-order) ;
max-order += <dependency>$(ORDER-LOG) ;
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) ;
fakelib 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>.. $(max-order) ;
import testing ;

1
mira/Decoder.cpp
View File

@ -27,7 +27,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
#include "TrellisPathList.h"
#include "ChartTrellisPathList.h"
#include "ChartTrellisPath.h"
#include "IOWrapper.h"
using namespace std;
using namespace Moses;

2
mira/Jamfile
View File

@ -1,6 +1,6 @@
lib mira_lib :
[ glob *.cpp : *Test.cpp Main.cpp ]
../moses-cmd/src//IOWrapper_lib ../mert//mert_lib ../moses//moses ../OnDiskPt//OnDiskPt ..//boost_program_options ;
../mert//mert_lib ../moses//moses ../OnDiskPt//OnDiskPt ..//boost_program_options ;
exe mira : Main.cpp mira_lib ;

8
moses-cmd/src/Jamfile
View File

@ -1,10 +1,6 @@
alias deps : ../../moses//moses ;
exe moses : Main.cpp mbr.cpp TranslationAnalysis.cpp LatticeMBR.cpp IOWrapper_lib ;
exe lmbrgrid : LatticeMBRGrid.cpp LatticeMBR.cpp IOWrapper_lib ;
exe moses : Main.cpp mbr.cpp TranslationAnalysis.cpp deps : <include>. ;
exe lmbrgrid : LatticeMBRGrid.cpp deps : <include>. ;
alias programs : moses lmbrgrid ;
install legacy-install : programs : <location>. <install-type>EXE <install-dependencies>on <link>shared:<dll-path>$(TOP)/moses-cmd/src <link>shared:<install-type>LIB ;
lib IOWrapper_lib : IOWrapper.cpp deps : : : <include>. ;

2
moses/CompactPT/Jamfile
View File

@ -13,4 +13,4 @@ else {
path-constant PT-LOG : bin/pt.log ;
update-if-changed $(PT-LOG) $(current) ;
lib CompactPT : [ glob *.cpp ] ..//headers cmph : $(includes) <dependency>$(PT-LOG) : : $(includes) ;
fakelib CompactPT : [ glob *.cpp ] ..//headers cmph : $(includes) <dependency>$(PT-LOG) : : $(includes) ;

1
moses/src/DynSAInclude/Jamfile Normal file
View File

@ -0,0 +1 @@
alias dynsa : ../../../util//kenutil ..//headers : : : <include>. ;

2
search/Jamfile
View File

@ -1,4 +1,4 @@
lib search : weights.cc vertex.cc vertex_generator.cc edge_generator.cc rule.cc ../lm//kenlm ../util//kenutil /top//boost_system : : : <include>.. ;
fakelib search : weights.cc vertex.cc vertex_generator.cc edge_generator.cc rule.cc ../lm//kenlm ../util//kenutil /top//boost_system : : : <include>.. ;
import testing ;

2
util/Jamfile
View File

@ -16,7 +16,7 @@ alias read_compressed : read_compressed.o $(compressed_deps) ;
obj read_compressed_test.o : read_compressed_test.cc /top//boost_unit_test_framework : $(compressed_flags) ;
obj file_piece_test.o : file_piece_test.cc /top//boost_unit_test_framework : $(compressed_flags) ;
lib kenutil : bit_packing.cc ersatz_progress.cc exception.cc file.cc file_piece.cc mmap.cc murmur_hash.cc pool.cc read_compressed string_piece.cc usage.cc : <include>.. : : <include>.. ;
fakelib kenutil : bit_packing.cc ersatz_progress.cc exception.cc file.cc file_piece.cc mmap.cc murmur_hash.cc pool.cc read_compressed string_piece.cc usage.cc : <include>.. : : <include>.. ;
import testing ;