mirror of
https://github.com/moses-smt/mosesdecoder.git
synced 2024-09-11 19:27:11 +03:00
Merge branch 'master' of github.com:moses-smt/mosesdecoder
This commit is contained in:
commit
a8fe122e4b
@ -596,13 +596,6 @@ local rule should-clean-project ( project )
|
||||
}
|
||||
}
|
||||
|
||||
ECHO "warning: No toolsets are configured." ;
|
||||
ECHO "warning: Configuring default toolset" \"$(default-toolset)\". ;
|
||||
ECHO "warning: If the default is wrong, your build may not work correctly." ;
|
||||
ECHO "warning: Use the \"toolset=xxxxx\" option to override our guess." ;
|
||||
ECHO "warning: For more configuration options, please consult" ;
|
||||
ECHO "warning: http://boost.org/boost-build2/doc/html/bbv2/advanced/configuration.html" ;
|
||||
|
||||
toolset.using $(default-toolset) : $(default-toolset-version) ;
|
||||
}
|
||||
|
||||
|
@ -265,6 +265,26 @@ rule add-post-hook ( names * ) {
|
||||
post-hooks += $(names) ;
|
||||
}
|
||||
|
||||
rule failure-message ( ok ? ) {
|
||||
if $(ok) != "ok" {
|
||||
local args = [ modules.peek : ARGV ] ;
|
||||
local args = $(args:J=" ") ;
|
||||
if --debug-configuration in [ modules.peek : ARGV ] {
|
||||
echo "The build failed with command line: " ;
|
||||
echo " $(args)" ;
|
||||
echo "If you need support, attach the full output to your e-mail." ;
|
||||
} else {
|
||||
echo "The build failed. If you need support, run:" ;
|
||||
echo " $(args) --debug-configuration -d2 >build.log" ;
|
||||
echo "then attach build.log to your e-mail." ;
|
||||
}
|
||||
echo "ERROR" ;
|
||||
} else {
|
||||
echo "SUCCESS" ;
|
||||
}
|
||||
}
|
||||
add-post-hook failure-message ;
|
||||
|
||||
import feature : feature ;
|
||||
feature options-to-write : : free ;
|
||||
import toolset : flags ;
|
||||
|
@ -259,7 +259,6 @@ void OutputAlignment(ostream &out, const vector<const Hypothesis *> &edges)
|
||||
|
||||
targetOffset += tp.GetSize();
|
||||
}
|
||||
out << std::endl;
|
||||
}
|
||||
|
||||
void OutputAlignment(std::ostream &out, const Moses::Hypothesis *hypo)
|
||||
@ -279,7 +278,8 @@ void OutputAlignment(OutputCollector* collector, size_t lineNo , const vector<co
|
||||
{
|
||||
ostringstream out;
|
||||
OutputAlignment(out, edges);
|
||||
|
||||
out << std::endl;
|
||||
|
||||
collector->Write(lineNo,out.str());
|
||||
}
|
||||
|
||||
|
@ -180,7 +180,7 @@ Parameter::Parameter()
|
||||
AddParam("minlexr-memory", "Load lexical reordering table in minlexr format into memory");
|
||||
AddParam("minphr-memory", "Load phrase table in minphr format into memory");
|
||||
|
||||
AddParam("print-alignment-info", "Output word-to-word alignment into the log file. Word-to-word alignments are takne from the phrase table if any. Default is false");
|
||||
AddParam("print-alignment-info", "Output word-to-word alignment to standard out, separated from translation by |||. Word-to-word alignments are takne from the phrase table if any. Default is false");
|
||||
AddParam("include-segmentation-in-n-best", "include phrasal segmentation in the n-best list. default is false");
|
||||
AddParam("print-alignment-info-in-n-best", "Include word-to-word alignment in the n-best list. Word-to-word alignments are takne from the phrase table if any. Default is false");
|
||||
AddParam("alignment-output-file", "print output word alignments into given file");
|
||||
|
Loading…
Reference in New Issue
Block a user