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.

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

fix: suggested fixes for FMT #4702

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 4 additions & 4 deletions .github/workflows/backward_model_load_check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ jobs:
cd ..
auditwheel repair vowpal_wabbit/wheel_last_commit/*whl -w audit_last_commit/
- name: Upload built wheel
uses: actions/upload-artifact@v1
uses: actions/upload-artifact@v4
with:
name: test_manylinux_amd64_3.10
path: audit_last_commit/
Expand All @@ -50,7 +50,7 @@ jobs:
with:
python-version: '3.10'
- name: Download artifact
uses: actions/download-artifact@v1
uses: actions/download-artifact@v4
with:
name: test_manylinux_amd64_3.10
path: built_wheel
Expand All @@ -60,7 +60,7 @@ jobs:
pip install built_wheel/*.whl
python ./test/run_tests_model_gen_and_load.py --generate_models --skip_missing_args --skip_pr_tests "${{ github.event.pull_request.title }}"
- name: Upload generated file
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v4
with:
name: vw_generated_models
path: ~/.vw_runtests_model_gen_working_dir/*
Expand All @@ -75,7 +75,7 @@ jobs:
- uses: actions/checkout@v1
with:
submodules: recursive
- uses: actions/download-artifact@v1
- uses: actions/download-artifact@v4
with:
name: vw_generated_models
path: .vw_runtests_model_gen_working_dir
Expand Down
16 changes: 8 additions & 8 deletions .github/workflows/build_docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ jobs:
- name: Build docs
run: nix build --print-build-logs .#vw-cpp-docs
- name: Upload built docs
uses: actions/upload-artifact@v1
uses: actions/upload-artifact@v4
with:
name: cxx_docs
path: result/html/
Expand All @@ -49,7 +49,7 @@ jobs:
- name: Build dump options
run: cmake --build build -t vw-dump-options
- name: Upload vw-dump-options
uses: actions/upload-artifact@v1
uses: actions/upload-artifact@v4
with:
name: vw-dump-options
path: build/utl/dump_options/vw-dump-options
Expand All @@ -68,7 +68,7 @@ jobs:
pip wheel . -w wheel_output/ --global-option --cmake-options="-DSTATIC_LINK_VW_JAVA=On;-DPython_INCLUDE_DIR='/opt/python/cp310-cp310/include/python3.10/'" --verbose
auditwheel repair wheel_output/*whl -w audit_output/
- name: Upload built wheel
uses: actions/upload-artifact@v1
uses: actions/upload-artifact@v4
with:
name: python_wheel
path: audit_output/
Expand All @@ -87,11 +87,11 @@ jobs:
if: ${{ github.event_name == 'push' }}
run: echo "VW_SPHINX_VERSION_OVERRIDE=latest" >> $GITHUB_ENV
- name: Download Wheel
uses: actions/download-artifact@v1
uses: actions/download-artifact@v4
with:
name: python_wheel
- name: Download vw-dump-options
uses: actions/download-artifact@v1
uses: actions/download-artifact@v4
with:
name: vw-dump-options
- name: Change permissions to rvw-dump-options
Expand Down Expand Up @@ -120,7 +120,7 @@ jobs:
cd python/docs
make html
- name: Upload built docs
uses: actions/upload-artifact@v1
uses: actions/upload-artifact@v4
with:
name: python_docs
path: python/docs/build/
Expand All @@ -137,11 +137,11 @@ jobs:
if: ${{ github.event_name == 'release' || github.event_name == 'workflow_dispatch' }}
run: echo "FOLDER_NAME=$(echo ${GITHUB_REF:10})" >> $GITHUB_ENV
- name: Download c++ Docs
uses: actions/download-artifact@v1
uses: actions/download-artifact@v4
with:
name: cxx_docs
- name: Download Python Docs
uses: actions/download-artifact@v1
uses: actions/download-artifact@v4
with:
name: python_docs
- name: Print contents of directory
Expand Down
28 changes: 14 additions & 14 deletions .github/workflows/dotnet_nugets.yml
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ jobs:
echo "NugetFileName=$NugetFileName" >> $GITHUB_OUTPUT
- name: Upload Combined
if: ${{ startsWith(matrix.config.os, 'windows') }}
uses: actions/upload-artifact@v1
uses: actions/upload-artifact@v4
with:
name: VowpalWabbit.${{steps.get_version.outputs.version}}.nupkg
path: nuget_staging/${{ steps.generate-nuget.outputs.NugetFileName }}
Expand All @@ -130,7 +130,7 @@ jobs:
NugetFileName=(*runtime*.nupkg)
echo "NugetFileName=${NugetFileName[0]}" >> $GITHUB_OUTPUT
- name: Upload .NET Core Runtime
uses: actions/upload-artifact@v1
uses: actions/upload-artifact@v4
with:
name: VowpalWabbit.runtime.${{matrix.config.runtime_id}}.${{steps.get_version.outputs.version}}.nupkg
path: nuget_staging/${{ steps.generate-runtime-nuget.outputs.NugetFileName }}
Expand Down Expand Up @@ -167,19 +167,19 @@ jobs:
# Download the previously built Nuget packages
- name: Clear nuget cache
run: dotnet nuget locals all --clear
- uses: actions/download-artifact@v1
- uses: actions/download-artifact@v4
with:
name: VowpalWabbit.${{steps.get_version.outputs.version}}.nupkg
path: downloaded_nugets
- uses: actions/download-artifact@v1
- uses: actions/download-artifact@v4
with:
name: VowpalWabbit.runtime.win-x64.${{steps.get_version.outputs.version}}.nupkg
path: downloaded_nugets
- uses: actions/download-artifact@v1
- uses: actions/download-artifact@v4
with:
name: VowpalWabbit.runtime.linux-x64.${{steps.get_version.outputs.version}}.nupkg
path: downloaded_nugets
- uses: actions/download-artifact@v1
- uses: actions/download-artifact@v4
with:
name: VowpalWabbit.runtime.osx-x64.${{steps.get_version.outputs.version}}.nupkg
path: downloaded_nugets
Expand Down Expand Up @@ -226,19 +226,19 @@ jobs:
# Download the previously built Nuget packages
- name: Clear nuget cache
run: dotnet nuget locals all --clear
- uses: actions/download-artifact@v1
- uses: actions/download-artifact@v4
with:
name: VowpalWabbit.${{steps.get_version.outputs.version}}.nupkg
path: downloaded_nugets
- uses: actions/download-artifact@v1
- uses: actions/download-artifact@v4
with:
name: VowpalWabbit.runtime.win-x64.${{steps.get_version.outputs.version}}.nupkg
path: downloaded_nugets
- uses: actions/download-artifact@v1
- uses: actions/download-artifact@v4
with:
name: VowpalWabbit.runtime.linux-x64.${{steps.get_version.outputs.version}}.nupkg
path: downloaded_nugets
- uses: actions/download-artifact@v1
- uses: actions/download-artifact@v4
with:
name: VowpalWabbit.runtime.osx-x64.${{steps.get_version.outputs.version}}.nupkg
path: downloaded_nugets
Expand Down Expand Up @@ -291,19 +291,19 @@ jobs:
# Download the previously built Nuget packages
- name: Clear nuget cache
run: dotnet nuget locals all --clear
- uses: actions/download-artifact@v1
- uses: actions/download-artifact@v4
with:
name: VowpalWabbit.${{steps.get_version.outputs.version}}.nupkg
path: downloaded_nugets
- uses: actions/download-artifact@v1
- uses: actions/download-artifact@v4
with:
name: VowpalWabbit.runtime.win-x64.${{steps.get_version.outputs.version}}.nupkg
path: downloaded_nugets
- uses: actions/download-artifact@v1
- uses: actions/download-artifact@v4
with:
name: VowpalWabbit.runtime.linux-x64.${{steps.get_version.outputs.version}}.nupkg
path: downloaded_nugets
- uses: actions/download-artifact@v1
- uses: actions/download-artifact@v4
with:
name: VowpalWabbit.runtime.osx-x64.${{steps.get_version.outputs.version}}.nupkg
path: downloaded_nugets
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/forward_model_load_check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ jobs:
/opt/python/cp310-cp310/bin/pip wheel . -w wheel_output/ --global-option --cmake-options="-DSTATIC_LINK_VW_JAVA=On;-DPython_INCLUDE_DIR='/opt/python/cp310-cp310/include/python3.10/'" --verbose
auditwheel repair wheel_output/*whl -w audit_output/
- name: Upload built wheel
uses: actions/upload-artifact@v1
uses: actions/upload-artifact@v4
with:
name: test_manylinux_amd64_3.10
path: audit_output/
Expand All @@ -47,7 +47,7 @@ jobs:
with:
python-version: '3.10'
- name: Download artifact
uses: actions/download-artifact@v1
uses: actions/download-artifact@v4
with:
name: test_manylinux_amd64_3.10
path: built_wheel
Expand All @@ -57,7 +57,7 @@ jobs:
pip install built_wheel/*.whl
python ./test/run_tests_model_gen_and_load.py --generate_models --skip_pr_tests "${{ github.event.pull_request.title }}"
- name: Upload generated file
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v4
with:
name: vw_generated_models
path: ~/.vw_runtests_model_gen_working_dir/*
Expand All @@ -72,7 +72,7 @@ jobs:
- uses: actions/checkout@v1
with:
submodules: recursive
- uses: actions/download-artifact@v1
- uses: actions/download-artifact@v4
with:
name: vw_generated_models
path: .vw_runtests_model_gen_working_dir
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ jobs:
${{ matrix.config.base_path }}bin/pip wheel . -w wheel_output/ --global-option --cmake-options="-DSTATIC_LINK_VW_JAVA=On;-DPython_INCLUDE_DIR='${{ matrix.config.base_path }}include/${{ matrix.config.include_dir_name }}'" --verbose
auditwheel repair wheel_output/*whl -w audit_output/
- name: Upload built wheel
uses: actions/upload-artifact@v1
uses: actions/upload-artifact@v4
with:
name: wheel_${{ matrix.config.version }}
path: audit_output/
Expand All @@ -53,7 +53,7 @@ jobs:
with:
submodules: recursive
- name: Download Wheel
uses: actions/download-artifact@v1
uses: actions/download-artifact@v4
with:
name: wheel_${{ matrix.config.version }}
- name: Install dependencies
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/native_nugets.yml
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ jobs:
$NugetFileName = Get-ChildItem *.nupkg -name
echo "NugetFileName=$NugetFileName" >> $GITHUB_OUTPUT
- name: Upload
uses: actions/upload-artifact@v1
uses: actions/upload-artifact@v4
with:
name: VowpalWabbitNative-${{matrix.toolset}}-x64.${{ steps.get_version.outputs.version }}.nupkg
path: nuget_staging/${{ steps.generate-nuget.outputs.NugetFileName }}
Expand Down Expand Up @@ -115,7 +115,7 @@ jobs:
echo "version=$version" >> $GITHUB_OUTPUT

# Download and install nuget
- uses: actions/download-artifact@v1
- uses: actions/download-artifact@v4
with:
name: VowpalWabbitNative-${{matrix.toolset}}-x64.${{ steps.get_version.outputs.version }}.nupkg
path: downloaded_nugets
Expand Down
20 changes: 10 additions & 10 deletions .github/workflows/python_wheels.yml
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ jobs:
${{ matrix.config.base_path }}bin/pip wheel . -w wheel_output/ --global-option --cmake-options="-DSTATIC_LINK_VW_JAVA=On;-DPython_INCLUDE_DIR='${{ matrix.config.base_path }}include/${{ matrix.config.include_dir_name }}'" --verbose
auditwheel repair wheel_output/*whl -w audit_output/
- name: Upload built wheel
uses: actions/upload-artifact@v1
uses: actions/upload-artifact@v4
with:
name: manylinux_amd64_${{ matrix.config.version }}
path: audit_output/
Expand All @@ -64,7 +64,7 @@ jobs:
- uses: actions/checkout@v1
with:
submodules: recursive
- uses: actions/download-artifact@v1
- uses: actions/download-artifact@v4
with:
name: manylinux_amd64_${{ matrix.version }}
path: built_wheel
Expand Down Expand Up @@ -103,7 +103,7 @@ jobs:
shell: bash
run: python setup.py sdist
- name: Upload built wheel
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v4
with:
name: python_source_distribution
path: dist/*.tar.gz
Expand All @@ -117,7 +117,7 @@ jobs:
with:
python-version: '3.10'
architecture: 'x64'
- uses: actions/download-artifact@v1
- uses: actions/download-artifact@v4
with:
name: python_source_distribution
- name: Install dependencies
Expand Down Expand Up @@ -169,7 +169,7 @@ jobs:
bash -exc '${{ matrix.config.base_path }}bin/pip wheel . -w wheel_output/ --global-option --cmake-options="-DSTATIC_LINK_VW_JAVA=On;-DPython_INCLUDE_DIR='${{ matrix.config.base_path }}include/${{ matrix.config.include_dir_name }}'" --verbose && \
auditwheel repair wheel_output/*whl -w audit_output/'
- name: Upload built wheel
uses: actions/upload-artifact@v1
uses: actions/upload-artifact@v4
with:
name: manylinux_aarch64_${{ matrix.config.version }}
path: audit_output/
Expand All @@ -196,7 +196,7 @@ jobs:
- name: Set up QEMU
id: qemu
uses: docker/setup-qemu-action@v1
- uses: actions/download-artifact@v1
- uses: actions/download-artifact@v4
with:
name: manylinux_aarch64_${{ matrix.config.version }}
path: built_wheel
Expand Down Expand Up @@ -247,7 +247,7 @@ jobs:
conda install python=${{ matrix.config.version }} wheel zlib boost py-boost flatbuffers
pip wheel . -w wheel_output/ --global-option --cmake-options="-DSTATIC_LINK_VW_JAVA=On;-DPython_INCLUDE_DIR=\"$CONDA_PREFIX/include/${{ matrix.config.include_dir_name }}\"" --verbose
- name: Upload built wheel
uses: actions/upload-artifact@v1
uses: actions/upload-artifact@v4
with:
name: macos_amd64_${{ matrix.config.version }}
path: wheel_output/
Expand All @@ -266,7 +266,7 @@ jobs:
- uses: actions/setup-python@v2
with:
python-version: ${{ matrix.version }}
- uses: actions/download-artifact@v1
- uses: actions/download-artifact@v4
with:
name: macos_amd64_${{ matrix.version }}
path: built_wheel
Expand Down Expand Up @@ -332,7 +332,7 @@ jobs:
pip install wheel
pip wheel . -w ${{github.workspace}}\\wheel_output --global-option --vcpkg-root="${{ env.VCPKG_ROOT }}" --global-option --cmake-generator="Visual Studio 16 2019" --global-option --cmake-options="-DVCPKG_OVERLAY_PORTS=${{github.workspace}}\\vowpal_wabbit\\${{ matrix.config.overlay_ports }}" --verbose
- name: Upload built wheel
uses: actions/upload-artifact@v1
uses: actions/upload-artifact@v4
with:
name: windows_amd64_${{ matrix.config.version }}
path: wheel_output
Expand All @@ -352,7 +352,7 @@ jobs:
- uses: actions/setup-python@v2
with:
python-version: ${{ matrix.version }}
- uses: actions/download-artifact@v1
- uses: actions/download-artifact@v4
with:
name: windows_amd64_${{ matrix.version }}
path: built_wheel
Expand Down
Loading
Loading