Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

refactor: pull in latest vw #601

Merged
merged 11 commits into from
Jan 19, 2024
Merged

refactor: pull in latest vw #601

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
ecf6e77
refactor: pull in latest vw
bassmang Jan 18, 2024
16fc643
update vcpkg
bassmang Jan 18, 2024
0c64d46
add name for payload type, fmt
bassmang Jan 18, 2024
5a17258
more fmt fixes
bassmang Jan 18, 2024
d712fbe
try commend out some log warnings
bassmang Jan 18, 2024
21d465c
readd id
bassmang Jan 18, 2024
d9123e9
readd more
bassmang Jan 18, 2024
22a57ec
readd more
bassmang Jan 18, 2024
b10488f
readd and change loop_typew
bassmang Jan 18, 2024
9e83abc
lint
bassmang Jan 18, 2024
b841d24
temporarily remove asan windows
bassmang Jan 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion .github/workflows/asan.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion ext_libs/vcpkg
Open in desktop
Submodule vcpkg updated 7063 files
2 changes: 1 addition & 1 deletion ext_libs/vowpal_wabbit
Open in desktop
Submodule vowpal_wabbit updated 68 files
+2 −1 .github/workflows/asan.yml
+1 −1 .github/workflows/build_windows_cmake.yml
+1 −1 .github/workflows/python_wheels.yml
+1 −1 .github/workflows/vendor_build.yml
+29 −29 CMakeLists.txt
+1 −1 CMakePresets.json
+1 −1 cmake/VowpalWabbitUtils.cmake
+328 −0 demo/cmd_getting_started/vw_intro.ipynb
+1 −1 ext_libs/vcpkg
+121 −0 python/tests/e2e_v2/assert_job.py
+67 −0 python/tests/e2e_v2/cb/data_generation.py
+6 −0 python/tests/e2e_v2/cb/logging_policies.py
+18 −0 python/tests/e2e_v2/cb/reward_functions.py
+62 −0 python/tests/e2e_v2/cb_cont/data_generation.py
+6 −0 python/tests/e2e_v2/cb_cont/logging_policies.py
+18 −0 python/tests/e2e_v2/cb_cont/reward_functions.py
+19 −0 python/tests/e2e_v2/classification/classification_functions.py
+29 −0 python/tests/e2e_v2/classification/data_generation.py
+16 −0 python/tests/e2e_v2/conftest.py
+13 −0 python/tests/e2e_v2/regression/data_generation.py
+5 −0 python/tests/e2e_v2/slate/action_space.py
+42 −0 python/tests/e2e_v2/slate/assert_job.py
+69 −0 python/tests/e2e_v2/slate/data_generation.py
+2 −0 python/tests/e2e_v2/slate/logging_policies.py
+10 −0 python/tests/e2e_v2/slate/reward_functions.py
+270 −0 python/tests/e2e_v2/test_configs/cb.json
+195 −0 python/tests/e2e_v2/test_configs/cb_cont.json
+102 −0 python/tests/e2e_v2/test_configs/classification.json
+107 −0 python/tests/e2e_v2/test_configs/regression.json
+145 −0 python/tests/e2e_v2/test_configs/slate.json
+129 −0 python/tests/e2e_v2/test_core.py
+140 −0 python/tests/e2e_v2/test_helper.py
+6 −6 python/vowpalwabbit/sklearn.py
+47 −0 test/benchmarks/standalone/benchmark_text_input.cc
+30 −2 test/core.vwtest.json
+99 −99 test/pred-sets/ref/poisson.train.predict
+8 −0 test/run_tests_model_gen_and_load.py
+1,378 −1,378 test/train-sets/ref/automl_readable.txt
+9,939 −9,939 test/train-sets/ref/automl_readable_cubic.txt
+1,425 −1,425 test/train-sets/ref/automl_readable_qc.txt
+1 −1 test/train-sets/ref/cb_adf_dm.stderr
+1,378 −1,378 test/train-sets/ref/cbadf_automl_readable.txt
+1 −1 test/train-sets/ref/sparse.stderr
+5 −4 test/train-sets/ref/sparse_load_check.stderr
+3 −0 test/train-sets/ref/sparse_load_check.stdout
+23 −0 test/train-sets/ref/sparse_load_check_random.stderr
+3 −0 test/train-sets/ref/sparse_load_check_random.stdout
+5 −4 test/train-sets/ref/sparse_save_check.stderr
+2 −0 test/train-sets/ref/sparse_save_check.stdout
+24 −0 test/train-sets/ref/sparse_save_check_random.stderr
+2 −0 test/train-sets/ref/sparse_save_check_random.stdout
+6 −0 vowpalwabbit/core/include/vw/core/array_parameters.h
+4 −0 vowpalwabbit/core/include/vw/core/array_parameters_dense.h
+6 −1 vowpalwabbit/core/include/vw/core/array_parameters_sparse.h
+2 −2 vowpalwabbit/core/include/vw/core/gd_predict.h
+1 −1 vowpalwabbit/core/include/vw/core/interactions_predict.h
+1 −0 vowpalwabbit/core/include/vw/core/named_labels.h
+10 −2 vowpalwabbit/core/include/vw/core/reductions/active.h
+3 −5 vowpalwabbit/core/include/vw/core/reductions/epsilon_decay.h
+3 −0 vowpalwabbit/core/include/vw/core/vw_versions.h
+26 −0 vowpalwabbit/core/src/array_parameters_sparse.cc
+6 −9 vowpalwabbit/core/src/parse_regressor.cc
+14 −8 vowpalwabbit/core/src/reductions/active.cc
+2 −0 vowpalwabbit/core/src/reductions/cb/cb_explore_adf_rnd.cc
+7 −9 vowpalwabbit/core/src/reductions/epsilon_decay.cc
+1 −44 vowpalwabbit/core/src/reductions/gd.cc
+2 −2 vowpalwabbit/core/tests/epsilon_decay_test.cc
+2 −2 vowpalwabbit/test_common/CMakeLists.txt
6 changes: 3 additions & 3 deletions external_parser/event_processors/typed_events.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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;
}

Expand All @@ -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;
}

Expand Down
5 changes: 2 additions & 3 deletions external_parser/joiners/example_joiner.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

Expand Down Expand Up @@ -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;
}

Expand Down
Loading