Merge remote-tracking branch 'upstream/master' into sse2_opt

VowpalWabbit · Jun 3, 2024 · 0959370 · 0959370
2 parents e957377 + f204897
commit 0959370
Show file tree

Hide file tree

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

diff --git a/.github/workflows/build_vw_slim.yml b/.github/workflows/build_vw_slim.yml
@@ -22,10 +22,45 @@ jobs:
       - uses: actions/checkout@v1
         with:
           submodules: recursive
-      - name: Build VW Slim
+
+      - name: Install dependencies
+        shell: bash
+        run: |
+          sudo apt update
+          sudo apt install -y xxd
+
+      - name: Configure VW Slim
         shell: bash
-        run: ./.scripts/linux/build-slim.sh
+        run: |
+          rm -rf build
+          cmake -S . -B build -G Ninja \
+              -DBUILD_TESTING=On \
+              -DVW_FEAT_FLATBUFFERS=Off \
+              -DRAPIDJSON_SYS_DEP=Off \
+              -DFMT_SYS_DEP=Off \
+              -DSPDLOG_SYS_DEP=Off \
+              -DVW_ZLIB_SYS_DEP=Off \
+              -DVW_BOOST_MATH_SYS_DEP=Off
+
+      - name: Build VW and VW Slim
+        shell: bash
+        run: cmake --build build --target vw_cli_bin vw_slim vw_slim_test
+
       - name: Test VW Slim
         shell: bash
         working-directory: build
         run: ctest --output-on-failure --no-tests=error --tests-regex "VowpalWabbitSlim|ExploreSlim|CommandLineOptionsSlim" --parallel 2
+
+      - name: Generate test data with new VW executable
+        shell: bash
+        working-directory: vowpalwabbit/slim/test/data/
+        run: ./generate-data.sh ../../../../build/vowpalwabbit/cli/vw
+
+      - name: Build VW Slim again
+        shell: bash
+        run: cmake --build build --target vw_slim vw_slim_test
+
+      - name: Test VW Slim again
+        shell: bash
+        working-directory: build
+        run: ctest --output-on-failure --no-tests=error --tests-regex "VowpalWabbitSlim|ExploreSlim|CommandLineOptionsSlim" --parallel 2
diff --git a/.github/workflows/dotnet_nugets.yml b/.github/workflows/dotnet_nugets.yml
@@ -23,7 +23,7 @@ jobs:
         config:
           - { os: "windows-latest", runtime_id: "win-x64" }
           - { os: "ubuntu-latest", runtime_id: "linux-x64" }
-          - { os: "macos-latest", runtime_id: "osx-x64" }
+          - { os: "macos-13", runtime_id: "osx-x64" }
     runs-on: ${{matrix.config.os}}
     steps:
       # Setup for build
@@ -143,7 +143,7 @@ jobs:
         config:
           - { os: "windows-latest", runtime_id: "win-x64" }
           - { os: "ubuntu-latest", runtime_id: "linux-x64" }
-          - { os: "macos-latest", runtime_id: "osx-x64" }
+          - { os: "macos-13", runtime_id: "osx-x64" }
     runs-on: ${{matrix.config.os}}
     steps:
       - uses: actions/checkout@v3

diff --git a/.github/workflows/vcpkg_build.yml b/.github/workflows/vcpkg_build.yml
@@ -23,7 +23,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-latest, macos-latest, windows-latest]
+        os: [ubuntu-latest, macos-13, windows-latest]
         preset: [vcpkg-debug, vcpkg-release]
     steps:
       - uses: actions/checkout@v3

diff --git a/.scripts/linux/build-slim.sh b/.scripts/linux/build-slim.sh
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -6,5 +6,8 @@
             ],
             "url": "./test/vwtest.schema.json"
         }
-    ]
+    ],
+    "files.associations": {
+        "limits": "cpp"
+    }
 }