From c908bda75259bcd14cf8e428f1f0ef484f057b1f Mon Sep 17 00:00:00 2001 From: Nicolas Hug Date: Wed, 14 Aug 2024 11:43:00 +0100 Subject: [PATCH] Fix windows lib name, unittests should pass. --- .github/workflows/build-conda-windows.yml | 100 ++++++++++----------- .github/workflows/build-wheels-windows.yml | 100 ++++++++++----------- setup.py | 3 +- 3 files changed, 102 insertions(+), 101 deletions(-) diff --git a/.github/workflows/build-conda-windows.yml b/.github/workflows/build-conda-windows.yml index 89f876c3363..968cb7007e5 100644 --- a/.github/workflows/build-conda-windows.yml +++ b/.github/workflows/build-conda-windows.yml @@ -1,52 +1,52 @@ -# name: Build Windows Conda +name: Build Windows Conda -# on: -# pull_request: -# push: -# branches: -# - nightly -# - main -# - release/* -# tags: -# # NOTE: Binary build pipelines should only get triggered on release candidate builds -# # Release candidate tags look like: v1.11.0-rc1 -# - v[0-9]+.[0-9]+.[0-9]+-rc[0-9]+ -# workflow_dispatch: +on: + pull_request: + push: + branches: + - nightly + - main + - release/* + tags: + # NOTE: Binary build pipelines should only get triggered on release candidate builds + # Release candidate tags look like: v1.11.0-rc1 + - v[0-9]+.[0-9]+.[0-9]+-rc[0-9]+ + workflow_dispatch: -# jobs: -# generate-matrix: -# uses: pytorch/test-infra/.github/workflows/generate_binary_build_matrix.yml@main -# with: -# package-type: conda -# os: windows -# test-infra-repository: pytorch/test-infra -# test-infra-ref: main -# build: -# needs: generate-matrix -# strategy: -# fail-fast: false -# matrix: -# include: -# - repository: pytorch/vision -# pre-script: packaging/pre_build_script.sh -# env-script: packaging/windows/internal/vc_env_helper.bat -# post-script: "" -# smoke-test-script: test/smoke_test.py -# package-name: torchvision -# name: ${{ matrix.repository }} -# uses: pytorch/test-infra/.github/workflows/build_conda_windows.yml@main -# with: -# conda-package-directory: ${{ matrix.conda-package-directory }} -# repository: ${{ matrix.repository }} -# ref: "" -# test-infra-repository: pytorch/test-infra -# test-infra-ref: main -# build-matrix: ${{ needs.generate-matrix.outputs.matrix }} -# pre-script: ${{ matrix.pre-script }} -# post-script: ${{ matrix.post-script }} -# package-name: ${{ matrix.package-name }} -# smoke-test-script: ${{ matrix.smoke-test-script }} -# trigger-event: ${{ github.event_name }} -# secrets: -# CONDA_PYTORCHBOT_TOKEN: ${{ secrets.CONDA_PYTORCHBOT_TOKEN }} -# CONDA_PYTORCHBOT_TOKEN_TEST: ${{ secrets.CONDA_PYTORCHBOT_TOKEN_TEST }} +jobs: + generate-matrix: + uses: pytorch/test-infra/.github/workflows/generate_binary_build_matrix.yml@main + with: + package-type: conda + os: windows + test-infra-repository: pytorch/test-infra + test-infra-ref: main + build: + needs: generate-matrix + strategy: + fail-fast: false + matrix: + include: + - repository: pytorch/vision + pre-script: packaging/pre_build_script.sh + env-script: packaging/windows/internal/vc_env_helper.bat + post-script: "" + smoke-test-script: test/smoke_test.py + package-name: torchvision + name: ${{ matrix.repository }} + uses: pytorch/test-infra/.github/workflows/build_conda_windows.yml@main + with: + conda-package-directory: ${{ matrix.conda-package-directory }} + repository: ${{ matrix.repository }} + ref: "" + test-infra-repository: pytorch/test-infra + test-infra-ref: main + build-matrix: ${{ needs.generate-matrix.outputs.matrix }} + pre-script: ${{ matrix.pre-script }} + post-script: ${{ matrix.post-script }} + package-name: ${{ matrix.package-name }} + smoke-test-script: ${{ matrix.smoke-test-script }} + trigger-event: ${{ github.event_name }} + secrets: + CONDA_PYTORCHBOT_TOKEN: ${{ secrets.CONDA_PYTORCHBOT_TOKEN }} + CONDA_PYTORCHBOT_TOKEN_TEST: ${{ secrets.CONDA_PYTORCHBOT_TOKEN_TEST }} diff --git a/.github/workflows/build-wheels-windows.yml b/.github/workflows/build-wheels-windows.yml index 47d6ad4e005..818d9f78b08 100644 --- a/.github/workflows/build-wheels-windows.yml +++ b/.github/workflows/build-wheels-windows.yml @@ -1,53 +1,53 @@ -# name: Build Windows Wheels +name: Build Windows Wheels -# on: -# pull_request: -# push: -# branches: -# - nightly -# - main -# - release/* -# tags: -# # NOTE: Binary build pipelines should only get triggered on release candidate builds -# # Release candidate tags look like: v1.11.0-rc1 -# - v[0-9]+.[0-9]+.[0-9]+-rc[0-9]+ -# workflow_dispatch: +on: + pull_request: + push: + branches: + - nightly + - main + - release/* + tags: + # NOTE: Binary build pipelines should only get triggered on release candidate builds + # Release candidate tags look like: v1.11.0-rc1 + - v[0-9]+.[0-9]+.[0-9]+-rc[0-9]+ + workflow_dispatch: -# permissions: -# id-token: write -# contents: read +permissions: + id-token: write + contents: read -# jobs: -# generate-matrix: -# uses: pytorch/test-infra/.github/workflows/generate_binary_build_matrix.yml@main -# with: -# package-type: wheel -# os: windows -# test-infra-repository: pytorch/test-infra -# test-infra-ref: main -# build: -# needs: generate-matrix -# strategy: -# fail-fast: false -# matrix: -# include: -# - repository: pytorch/vision -# pre-script: packaging/pre_build_script.sh -# env-script: packaging/windows/internal/vc_env_helper.bat -# post-script: "python packaging/wheel/relocate.py" -# smoke-test-script: test/smoke_test.py -# package-name: torchvision -# name: ${{ matrix.repository }} -# uses: pytorch/test-infra/.github/workflows/build_wheels_windows.yml@main -# with: -# repository: ${{ matrix.repository }} -# ref: "" -# test-infra-repository: pytorch/test-infra -# test-infra-ref: main -# build-matrix: ${{ needs.generate-matrix.outputs.matrix }} -# pre-script: ${{ matrix.pre-script }} -# env-script: ${{ matrix.env-script }} -# post-script: ${{ matrix.post-script }} -# package-name: ${{ matrix.package-name }} -# smoke-test-script: ${{ matrix.smoke-test-script }} -# trigger-event: ${{ github.event_name }} +jobs: + generate-matrix: + uses: pytorch/test-infra/.github/workflows/generate_binary_build_matrix.yml@main + with: + package-type: wheel + os: windows + test-infra-repository: pytorch/test-infra + test-infra-ref: main + build: + needs: generate-matrix + strategy: + fail-fast: false + matrix: + include: + - repository: pytorch/vision + pre-script: packaging/pre_build_script.sh + env-script: packaging/windows/internal/vc_env_helper.bat + post-script: "python packaging/wheel/relocate.py" + smoke-test-script: test/smoke_test.py + package-name: torchvision + name: ${{ matrix.repository }} + uses: pytorch/test-infra/.github/workflows/build_wheels_windows.yml@main + with: + repository: ${{ matrix.repository }} + ref: "" + test-infra-repository: pytorch/test-infra + test-infra-ref: main + build-matrix: ${{ needs.generate-matrix.outputs.matrix }} + pre-script: ${{ matrix.pre-script }} + env-script: ${{ matrix.env-script }} + post-script: ${{ matrix.post-script }} + package-name: ${{ matrix.package-name }} + smoke-test-script: ${{ matrix.smoke-test-script }} + trigger-event: ${{ github.event_name }} diff --git a/setup.py b/setup.py index d5e34951070..9e14a2df209 100644 --- a/setup.py +++ b/setup.py @@ -321,7 +321,8 @@ def make_image_extension(): # if those are None it means they come from standard paths that are already in the search paths, which we don't need to re-add. include_dirs.append(webp_include_dir) library_dirs.append(webp_library_dir) - libraries.append("webp") + webp_library = "libwebp" if sys.platform == "win32" else "webp" + libraries.append(webp_library) define_macros += [("WEBP_FOUND", 1)] else: warnings.warn("Building torchvision without WEBP support")