From 7fa89c77e2b10ecbecf5d691dd7c77348349fc17 Mon Sep 17 00:00:00 2001
From: Jacob Alber <jalber@fernir.com>
Date: Wed, 6 Feb 2019 12:58:14 -0500
Subject: [PATCH] Update vowpal_wabbit submodule (#37)

* Update vowpal_wabbit submodule

* Pulls in these fixes
- fac3c061 ("Fix crash when empty multi_ex is supplied for --cb_explore_adf (#1679)")
- f085178d ("bugfix:  cb_adf is not including some examples in stats calculation (#1686)")
- c9d9af7c ("Fix memory leak in cb_explore_adf (#1698)")
- 1e8742b4 ("Fix some VW initialization memory leaks (#1697)")
- 75423e32 ("Fix best constant and best constant's loss calculation when using ksvm (#1704)")
- 2b64c3c0 ("Use std::exp instead of exp free function (#1709)")
- 6b7b1605 ("Fix unused params warnings plus incomplete struct init (done to default values). (#1710)")
- 2e1602d6 ("Compile fixes (#1713)")
- b50fb597 ("Make cbify reduction respect is_learn parameter (#1722)")

This also includes the option parsing changes
- b8ab3969 ("`options_i` command line parsing refactor  (#1706)"
- 5b020c4d ("Ataymano/mac options types fix (#1718)")

There are other small or non-rl-consumable changes

* Enable injection of msbuild path in Windows command-line build

* Update vowpal_wabbit submodule

* This pulls in the additional fix made to address the bug discovered in
  the previous attempt to update this.

  Fixed in VowpalWabbit/vowpal_wabbit#1742

* Updates safe_vw.cc to get rid of a no-longer-necessary cleanup step
---
 build-windows.cmd               | 19 ++++++++++---------
 ext_libs/vowpal_wabbit          |  2 +-
 rlclientlib/vw_model/safe_vw.cc |  2 +-
 3 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/build-windows.cmd b/build-windows.cmd
index 1af63a34ead..0fa0ae1d31b 100644
--- a/build-windows.cmd
+++ b/build-windows.cmd
@@ -5,14 +5,16 @@ for /f "usebackq tokens=*" %%i in (`"%ProgramFiles(x86)%\Microsoft Visual Studio
   set InstallDir=%%i
 )
 
-if not exist "%InstallDir%\MSBuild\15.0\Bin\MSBuild.exe" (
-  echo ERROR: MsBuild couldn't be found
-  exit /b 1
-)
-
-if not defined VcpkgInstallRoot (
-  echo ERROR: VcpkgInstallRoot must be set
-  exit /b 1
+REM Enable injecting of msbuild path (rather than relying on an installed version of Visual Studio),
+REM but fallback to detection path if not provided.
+if not defined msBuildPath (
+  if not exist "%InstallDir%\MSBuild\15.0\Bin\MSBuild.exe" (
+    echo ERROR: MsBuild couldn't be found
+    exit /b 1
+  )
+  else (
+    SET "msBuildPath=%InstallDir%\MSBuild\15.0\Bin\MSBuild.exe"
+  )
 )
 
 call "%InstallDir%\Common7\Tools\VsDevCmd.bat"
@@ -30,7 +32,6 @@ nuget install -o packages bindings\cs\rl.net.native\packages.config
 nuget install -o packages rlclientlib\packages.config
 nuget install -o packages unit_tests\packages.config
 
-
 dotnet restore rl.sln
 
 "%InstallDir%\MSBuild\15.0\Bin\MSBuild.exe" "rl.sln" /m /verbosity:normal /p:Configuration=Release;Platform=x64
diff --git a/ext_libs/vowpal_wabbit b/ext_libs/vowpal_wabbit
index fdc14769939..6dd314d20df 160000
--- a/ext_libs/vowpal_wabbit
+++ b/ext_libs/vowpal_wabbit
@@ -1 +1 @@
-Subproject commit fdc14769939a81ca393575b477df72fbb6681912
+Subproject commit 6dd314d20dfde9211b2d614a8b13d387fd93778d
diff --git a/rlclientlib/vw_model/safe_vw.cc b/rlclientlib/vw_model/safe_vw.cc
index 6350887ba65..a7b4c3be9f2 100644
--- a/rlclientlib/vw_model/safe_vw.cc
+++ b/rlclientlib/vw_model/safe_vw.cc
@@ -3,6 +3,7 @@
 // VW headers
 #include "example.h"
 #include "parse_example_json.h"
+#include "parser.h"
 
 namespace reinforcement_learning {
 
@@ -85,7 +86,6 @@ namespace reinforcement_learning {
 
     // cleanup VW instance
     reset_source(*_vw, _vw->num_bits);
-    release_parser_datastructures(*_vw);
 
     VW::finish(*_vw);
   }