refactor: pull in latest vw (#601)

* refactor: pull in latest vw * update vcpkg * add name for payload type, fmt * more fmt fixes * try commend out some log warnings * readd id * readd more * readd more * readd and change loop_typew * lint * temporarily remove asan windows
VowpalWabbit · Jan 19, 2024 · 4ed7401 · 4ed7401
1 parent 98a4b65
commit 4ed7401
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 9 deletions.
diff --git a/.github/workflows/asan.yml b/.github/workflows/asan.yml
@@ -18,7 +18,8 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [windows-latest, ubuntu-latest, macos-latest]
+        #os: [windows-latest, ubuntu-latest, macos-latest]
+        os: [ubuntu-latest, macos-latest] # Temporarily remove windows asan
         preset: [vcpkg-asan-debug, vcpkg-ubsan-debug]
         exclude:
           # UBSan not supported by MSVC on Windows

diff --git a/ext_libs/vcpkg b/ext_libs/vcpkg
diff --git a/ext_libs/vowpal_wabbit b/ext_libs/vowpal_wabbit
diff --git a/external_parser/event_processors/typed_events.h b/external_parser/event_processors/typed_events.h
@@ -198,7 +198,7 @@ bool process_compression(const uint8_t* data, size_t size, const v2::Metadata& m
           "Received ZSTD_CONTENTSIZE_ERROR while "
           "decompressing event with id: "
           "[{}] of type: [{}]",
-          metadata.id()->c_str(), metadata.payload_type());
+          metadata.id()->c_str(), EnumNamePayloadType(metadata.payload_type()));
       return false;
     }
     if (buff_size == ZSTD_CONTENTSIZE_UNKNOWN)
@@ -207,7 +207,7 @@ bool process_compression(const uint8_t* data, size_t size, const v2::Metadata& m
           "Received ZSTD_CONTENTSIZE_UNKNOWN while "
           "decompressing event with id: "
           "[{}] of type: [{}]",
-          metadata.id()->c_str(), metadata.payload_type());
+          metadata.id()->c_str(), EnumNamePayloadType(metadata.payload_type()));
       return false;
     }
 
@@ -219,7 +219,7 @@ bool process_compression(const uint8_t* data, size_t size, const v2::Metadata& m
       logger.out_warn(
           "Received [{}] error while decompressing event with id: "
           "[{}] of type: [{}]",
-          ZSTD_getErrorName(res), metadata.id()->c_str(), metadata.payload_type());
+          ZSTD_getErrorName(res), metadata.id()->c_str(), EnumNamePayloadType(metadata.payload_type()));
       return false;
     }
 

diff --git a/external_parser/joiners/example_joiner.cc b/external_parser/joiners/example_joiner.cc
@@ -232,8 +232,7 @@ bool example_joiner::process_interaction(
         "and Interaction event type [{}] "
         "don't match. Skipping interaction from processing. "
         "EventId: [{}]",
-        EnumNameProblemType(_loop_info.problem_type_config), EnumNamePayloadType(metadata.payload_type()),
-        metadata.id()->c_str());
+        loop_type, EnumNamePayloadType(metadata.payload_type()), metadata.id()->c_str());
     return false;
   }
 
@@ -312,7 +311,7 @@ bool example_joiner::process_interaction(
         "Interaction event learning mode [{}] not "
         "currently supported, skipping interaction "
         "EventId: [{}]",
-        metadata.payload_type(), metadata.id()->c_str());
+        EnumNamePayloadType(metadata.payload_type()), metadata.id()->c_str());
     return false;
   }