Merge branch 'master' of github.com:JohnLangford/vowpal_wabbit

codepie · Jan 22, 2013 · 3cc0cbe · 3cc0cbe
2 parents 40361b5 + 278be7c
commit 3cc0cbe
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 4 deletions.
diff --git a/vowpalwabbit/gd.cc b/vowpalwabbit/gd.cc
@@ -372,8 +372,7 @@ void print_features(vw& all, example* &ec)
 
 void print_audit_features(vw& all, example* ec)
 {
-  fflush(stdout);
-  print_result(fileno(stdout),ec->final_prediction,-1,ec->tag);
+  print_result(all.stdout_fileno,ec->final_prediction,-1,ec->tag);
   fflush(stdout);
   print_features(all, ec);
 }

diff --git a/vowpalwabbit/gd_mf.cc b/vowpalwabbit/gd_mf.cc
@@ -177,7 +177,7 @@ void mf_print_offset_features(vw& all, example* &ec, size_t offset)
 
 void mf_print_audit_features(vw& all, example* ec, size_t offset)
 {
-  print_result(fileno(stdout),ec->final_prediction,-1,ec->tag);
+  print_result(all.stdout_fileno,ec->final_prediction,-1,ec->tag);
   mf_print_offset_features(all, ec, offset);
 }
 

diff --git a/vowpalwabbit/global_data.cc b/vowpalwabbit/global_data.cc
@@ -233,6 +233,12 @@ vw::vw()
 
   options_from_file = "";
 
+  #ifdef _WIN32
+  stdout_fileno = _fileno(stdout);
+  #else
+  stdout_fileno = fileno(stdout);
+  #endif
+
   searn = false;
 
   nonormalize = false;

diff --git a/vowpalwabbit/global_data.h b/vowpalwabbit/global_data.h
@@ -153,6 +153,7 @@ struct vw {
   uint32_t base_learner_nb_w; //this stores the current number of "weight vector" required by the based learner, which is used to compute offsets when composing reductions
 
   uint32_t stride;
+  int stdout_fileno;
 
   std::string per_feature_regularizer_input;
   std::string per_feature_regularizer_output;

diff --git a/vowpalwabbit/parser.cc b/vowpalwabbit/parser.cc
@@ -304,7 +304,12 @@ void reset_source(vw& all, size_t numbits)
 
 void finalize_source(parser* p)
 {
-  while (!p->input->files.empty() && p->input->files.last() == fileno(stdin))
+#ifdef _WIN32
+  int f = _fileno(stdin);
+#else
+  int f = fileno(stdin);
+#endif
+  while (!p->input->files.empty() && p->input->files.last() == f)
     p->input->files.pop();
   p->input->close_files();