diff options
| author | Marcin Junczys-Dowmunt <junczys@amu.edu.pl> | 2015-01-08 18:45:40 +0300 |
|---|---|---|
| committer | Marcin Junczys-Dowmunt <junczys@amu.edu.pl> | 2015-01-08 18:45:40 +0300 |
| commit | c2b6da0134f4d623b6ea4961ce1ef0a47303d74c (patch) | |
| tree | fad62392756753d53833c54a6d48c08be7fe383c | |
| parent | ed43bd682600cf6aec7ce50cba857da6a0a70c55 (diff) | |
small changes
| -rw-r--r-- | moses-cmd/Jamfile | 2 | ||||
| -rw-r--r-- | moses-cmd/MainVW.cpp | 2 | ||||
| -rw-r--r-- | moses/FF/VW/VWFeatureSourceExternalFeatures.h | 4 | ||||
| -rw-r--r-- | vw/Jamfile | 3 |
4 files changed, 7 insertions, 4 deletions
diff --git a/moses-cmd/Jamfile b/moses-cmd/Jamfile index 9f5dee5e2..f705732f8 100644 --- a/moses-cmd/Jamfile +++ b/moses-cmd/Jamfile @@ -3,5 +3,5 @@ alias deps : ..//z ..//boost_iostreams ..//boost_filesystem ../moses//moses ; exe moses : Main.cpp deps ; exe vwtrainer : MainVW.cpp deps ; exe lmbrgrid : LatticeMBRGrid.cpp deps ; -alias programs : vwtrainer moses lmbrgrid ; +alias programs : moses lmbrgrid vwtrainer ; diff --git a/moses-cmd/MainVW.cpp b/moses-cmd/MainVW.cpp index 25ef114df..9663badf5 100644 --- a/moses-cmd/MainVW.cpp +++ b/moses-cmd/MainVW.cpp @@ -153,7 +153,7 @@ int main(int argc, char** argv) FeatureFunction::CallChangeSource(source); - // set up task of translating one sentence + // set up task of training one sentence TrainingTask* task = new TrainingTask(source, *ioWrapper); // execute task diff --git a/moses/FF/VW/VWFeatureSourceExternalFeatures.h b/moses/FF/VW/VWFeatureSourceExternalFeatures.h index 1f5faf344..94223b8da 100644 --- a/moses/FF/VW/VWFeatureSourceExternalFeatures.h +++ b/moses/FF/VW/VWFeatureSourceExternalFeatures.h @@ -9,7 +9,8 @@ namespace Moses { - + +// Assuming a given column of TabbedSentence contains space separated source features class VWFeatureSourceExternalFeatures : public VWFeatureSource, public ThreadLocalFeatureStorage { @@ -47,7 +48,6 @@ class VWFeatureSourceExternalFeatures : public VWFeatureSource, UTIL_THROW_IF2(source.GetType() != TabbedSentenceInput, "This feature function requires the TabbedSentence input type"); - const TabbedSentence& tabbedSentence = static_cast<const TabbedSentence&>(source); const std::string &column = tabbedSentence.GetColumn(m_column); diff --git a/vw/Jamfile b/vw/Jamfile index d7e26412f..2d130cd7e 100644 --- a/vw/Jamfile +++ b/vw/Jamfile @@ -1,4 +1,5 @@ alias headers : : : : <include>. <include>..//moses// <include>.. ; +alias deps : ..//z ..//boost_iostreams ..//boost_filesystem ../moses//moses ; boost 103600 ; @@ -11,5 +12,7 @@ if $(with-vw) { obj VWPredictor.o : VWPredictor.cpp headers : <include>$(with-vw)/include/vowpalwabbit ; alias vw_objects : VWPredictor.o VWPredictorFactory.o vw allreduce : : : <library>boost_program_options ; lib classifier : [ glob *.cpp : VWPredictor.cpp VWPredictorFactory.cpp ] vw_objects headers ; + + exe vwtrainer : MainVW deps ; echo "Linking with Vowpal Wabbit" ; } |