From 46a3de2e317497e206de636890c52c643402b415 Mon Sep 17 00:00:00 2001 From: Griffin Bassman Date: Fri, 2 Jun 2023 15:56:10 -0400 Subject: [PATCH 1/6] fix: [epsilon_decay] save_load weight indices --- vowpalwabbit/core/src/reductions/epsilon_decay.cc | 3 +++ 1 file changed, 3 insertions(+) diff --git a/vowpalwabbit/core/src/reductions/epsilon_decay.cc b/vowpalwabbit/core/src/reductions/epsilon_decay.cc index 22427930c18..817236e2b81 100644 --- a/vowpalwabbit/core/src/reductions/epsilon_decay.cc +++ b/vowpalwabbit/core/src/reductions/epsilon_decay.cc @@ -246,7 +246,9 @@ size_t read_model_field(io_buf& io, VW::reductions::epsilon_decay::epsilon_decay { size_t bytes = 0; epsilon_decay.conf_seq_estimators.clear(); + epsilon_decay._weight_indices.clear(); bytes += read_model_field(io, epsilon_decay.conf_seq_estimators); + bytes += read_model_field(io, epsilon_decay._weight_indices); bytes += read_model_field(io, epsilon_decay._global_counter); return bytes; } @@ -256,6 +258,7 @@ size_t write_model_field(io_buf& io, const VW::reductions::epsilon_decay::epsilo { size_t bytes = 0; bytes += write_model_field(io, epsilon_decay.conf_seq_estimators, upstream_name + "conf_seq_estimators", text); + bytes += write_model_field(io, epsilon_decay._weight_indices, upstream_name + "_weight_indices", text); bytes += write_model_field(io, epsilon_decay._global_counter, upstream_name + "_global_counter", text); return bytes; } From 17abfa5b2381bfd0ee95e562c1762425019e166c Mon Sep 17 00:00:00 2001 From: Griffin Bassman Date: Mon, 5 Jun 2023 11:55:34 -0400 Subject: [PATCH 2/6] try fix path --- .github/workflows/build_windows_cmake.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build_windows_cmake.yml b/.github/workflows/build_windows_cmake.yml index 7088c810e10..53d60bb0f83 100644 --- a/.github/workflows/build_windows_cmake.yml +++ b/.github/workflows/build_windows_cmake.yml @@ -50,7 +50,7 @@ jobs: ${{ env.VCPKG_REF }}-${{ matrix.os }}-vcpkg-cache-invalidate-0 - uses: ilammy/msvc-dev-cmd@v1 - name: Bootstrap vcpkg - run: ${{ env.VCPKG_ROOT }}/bootstrap-vcpkg.bat + run: \&${{ env.VCPKG_ROOT }}/bootstrap-vcpkg.bat - name: Install vcpkg dependencies run: ${{ env.VCPKG_ROOT }}/vcpkg.exe --triplet x64-windows install zlib flatbuffers - name: Generate project files From fed2099e4f682a073de76a263b805651d179d24b Mon Sep 17 00:00:00 2001 From: Griffin Bassman Date: Mon, 5 Jun 2023 11:58:11 -0400 Subject: [PATCH 3/6] fix apth --- .github/workflows/build_windows_cmake.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build_windows_cmake.yml b/.github/workflows/build_windows_cmake.yml index 53d60bb0f83..e3ad7b3414e 100644 --- a/.github/workflows/build_windows_cmake.yml +++ b/.github/workflows/build_windows_cmake.yml @@ -50,7 +50,7 @@ jobs: ${{ env.VCPKG_REF }}-${{ matrix.os }}-vcpkg-cache-invalidate-0 - uses: ilammy/msvc-dev-cmd@v1 - name: Bootstrap vcpkg - run: \&${{ env.VCPKG_ROOT }}/bootstrap-vcpkg.bat + run: "${{ env.VCPKG_ROOT }}"/bootstrap-vcpkg.bat - name: Install vcpkg dependencies run: ${{ env.VCPKG_ROOT }}/vcpkg.exe --triplet x64-windows install zlib flatbuffers - name: Generate project files From 572080fdb59d7cef5d5ec514a24bb26430d1e86d Mon Sep 17 00:00:00 2001 From: Griffin Bassman Date: Mon, 5 Jun 2023 12:01:57 -0400 Subject: [PATCH 4/6] call --- .github/workflows/build_windows_cmake.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build_windows_cmake.yml b/.github/workflows/build_windows_cmake.yml index e3ad7b3414e..91ac1ddf4e7 100644 --- a/.github/workflows/build_windows_cmake.yml +++ b/.github/workflows/build_windows_cmake.yml @@ -50,7 +50,7 @@ jobs: ${{ env.VCPKG_REF }}-${{ matrix.os }}-vcpkg-cache-invalidate-0 - uses: ilammy/msvc-dev-cmd@v1 - name: Bootstrap vcpkg - run: "${{ env.VCPKG_ROOT }}"/bootstrap-vcpkg.bat + run: call "${{ env.VCPKG_ROOT }}\bootstrap-vcpkg.bat" - name: Install vcpkg dependencies run: ${{ env.VCPKG_ROOT }}/vcpkg.exe --triplet x64-windows install zlib flatbuffers - name: Generate project files From 330d14b92e61cc64c4f29a6dff4db724bc16b658 Mon Sep 17 00:00:00 2001 From: Griffin Bassman Date: Mon, 5 Jun 2023 12:06:08 -0400 Subject: [PATCH 5/6] quotes --- .github/workflows/build_windows_cmake.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build_windows_cmake.yml b/.github/workflows/build_windows_cmake.yml index 91ac1ddf4e7..62d25d17bd8 100644 --- a/.github/workflows/build_windows_cmake.yml +++ b/.github/workflows/build_windows_cmake.yml @@ -50,7 +50,7 @@ jobs: ${{ env.VCPKG_REF }}-${{ matrix.os }}-vcpkg-cache-invalidate-0 - uses: ilammy/msvc-dev-cmd@v1 - name: Bootstrap vcpkg - run: call "${{ env.VCPKG_ROOT }}\bootstrap-vcpkg.bat" + run: "${{ env.VCPKG_ROOT }}\bootstrap-vcpkg.bat" - name: Install vcpkg dependencies run: ${{ env.VCPKG_ROOT }}/vcpkg.exe --triplet x64-windows install zlib flatbuffers - name: Generate project files From dd5e5afe8103498f0eaaaecb8b54c1c135ee7685 Mon Sep 17 00:00:00 2001 From: Griffin Bassman Date: Mon, 5 Jun 2023 12:08:37 -0400 Subject: [PATCH 6/6] & --- .github/workflows/build_windows_cmake.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build_windows_cmake.yml b/.github/workflows/build_windows_cmake.yml index 62d25d17bd8..d843a957785 100644 --- a/.github/workflows/build_windows_cmake.yml +++ b/.github/workflows/build_windows_cmake.yml @@ -50,7 +50,7 @@ jobs: ${{ env.VCPKG_REF }}-${{ matrix.os }}-vcpkg-cache-invalidate-0 - uses: ilammy/msvc-dev-cmd@v1 - name: Bootstrap vcpkg - run: "${{ env.VCPKG_ROOT }}\bootstrap-vcpkg.bat" + run: & "${{ env.VCPKG_ROOT }}\bootstrap-vcpkg.bat" - name: Install vcpkg dependencies run: ${{ env.VCPKG_ROOT }}/vcpkg.exe --triplet x64-windows install zlib flatbuffers - name: Generate project files