moses-smt/mosesdecoder
1
1
Fork 0
mirror of https://github.com/moses-smt/mosesdecoder.git synced 2024-12-30 23:42:30 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into minphr

Browse Source
This commit is contained in:
Marcin Junczys-Dowmunt 2012-08-04 16:20:31 +02:00
commit 29db131f41
2 changed files with 5 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
scripts/Jamfile
View File

@ -3,57 +3,13 @@ import option path ;
build-project training ;
with-giza = [ option.get "with-giza" ] ;
if $(with-giza) {
rule check-for-bin ( name ) {
if ! [ FILE_OPEN $(with-giza)/$(name) : "r" ] {
echo "Did not find "$(with-giza)/$(name)"." ;
echo "The with-giza directory should contain GIZA++, snt2cooc.out, and mkcls." ;
echo "These are available from http://code.google.com/p/giza-pp/ :" ;
echo " wget https://giza-pp.googlecode.com/files/giza-pp.tgz" ;
echo " tar xzf giza-pp.tgz" ;
echo " cd giza-pp" ;
echo " make" ;
echo " cp GIZA++-v2/{GIZA++,plain2snt.out,snt2cooc.out,snt2plain.out,trainGIZA++.sh} mkcls-v2/mkcls ." ;
exit "Then run bjam --with-giza=/path/to/giza-pp" : 1 ;
}
}
constant WITH-GIZA : $(with-giza) ;
check-for-bin GIZA++ ;
check-for-bin snt2cooc.out ;
check-for-bin mkcls ;
} else {
if $(CLEANING) = no {
#echo "If you want scripts/training/train-model.perl, pass --with-giza=/path/to/giza-pp" ;
}
constant WITH-GIZA : "no" ;
}
location = [ option.get "install-scripts" ] ;
if $(location) {
location = [ path.root $(location) [ path.pwd ] ] ;
location = $(location)$(GITTAG) ;
#These two used to live in a tools directory.
#install ghkm : training/phrase-extract/extract-ghkm//extract-ghkm : <location>$(location)/training/phrase-extract/extract-ghkm/tools ;
#install compactify : training/compact-rule-table//compactify : <location>$(location)/training/compact-rule-table/tools ;
#install phrase-extract : training/phrase-extract//programs : <location>$(location)/training/phrase-extract ;
#install pcfg-extract : training/phrase-extract/pcfg-extract//pcfg-extract : <location>$(location)/training/phrase-extract/pcfg-extract ;
#install pcfg-score : training/phrase-extract/pcfg-score//pcfg-score : <location>$(location)/training/phrase-extract/pcfg-score ;
#install lexical-reordering : training/lexical-reordering//score : <location>$(location)/training/lexical-reordering ;
#install symal : training/symal//symal : <location>$(location)/training/symal ;
#install biconcor : ems/biconcor//biconcor : <location>$(location)/ems/biconcor ;
if $(WITH-GIZA) != no {
install train-model : training//train-model.perl : <location>$(location)/training ;
}
install scripts :
[ glob-tree README *.js *.pl *.perl *.pm *.py *.sh *.php : tests regression-testing other bin train_model.perl ]
[ glob-tree README *.js *.pl *.perl *.pm *.py *.sh *.php : tests regression-testing other bin ]
[ glob share/nonbreaking_prefixes/* ems/example/*.* ems/example/data/* ems/web/* analysis/smtgui/* : ems/web/javascripts ]
generic/fsa-sample.fsa
ems/experiment.machines

6
util/probing_hash_table_test.cc
View File

@ -28,9 +28,11 @@ struct Entry {
typedef ProbingHashTable<Entry, boost::hash<unsigned char> > Table;
BOOST_AUTO_TEST_CASE(simple) {
boost::scoped_array<char> mem(new char[Table::Size(10, 1.2)]);
size_t size = Table::Size(10, 1.2);
boost::scoped_array<char> mem(new char[size]);
memset(mem.get(), 0, size);
Table table(mem.get(), Table::Size(10, 1.2));
Table table(mem.get(), size);
const Entry *i = NULL;
BOOST_CHECK(!table.Find(2, i));
Entry to_ins;