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

update wgpu-native version #445

Merged
merged 2 commits into from
Dec 6, 2023
Merged
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
36 changes: 32 additions & 4 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -226,9 +226,9 @@ jobs:
- name: Build wheels
uses: pypa/[email protected]
env:
CIBW_MANYLINUX_X86_64_IMAGE: quay.io/pypa/manylinux_2_28_x86_64
CIBW_ARCHS_LINUX: x86_64
CIBW_SKIP: cp39-musllinux_x86_64
CIBW_MANYLINUX_X86_64_IMAGE: quay.io/pypa/manylinux_2_28_x86_64
CIBW_ARCHS_LINUX: x86_64
CIBW_SKIP: cp39-musllinux_x86_64
with:
output-dir: dist
- name: Twine check
Expand All @@ -240,6 +240,34 @@ jobs:
path: dist
name: dist

# Thees release builds uses QEMU so that we can build wheels for arm64.
# We build wheels and upload the wheel as an artifact, but we don't test them here.
qemu-release-builds:
name: Build wheels on ubuntu-latest with QEMU
timeout-minutes: 10
runs-on: ubuntu-latest
strategy:
fail-fast: false
steps:
- uses: actions/checkout@v3
- name: Set up QEMU
uses: docker/setup-qemu-action@v3
with:
platforms: arm64
- name: Build wheels
uses: pypa/[email protected]
env:
CIBW_MANYLINUX_AARCH64_IMAGE: quay.io/pypa/manylinux_2_28_aarch64
CIBW_ARCHS_LINUX: aarch64
CIBW_SKIP: cp39-musllinux_aarch64
with:
output-dir: dist
- name: Upload distributions
uses: actions/upload-artifact@v2
with:
path: dist
name: dist

sdist-build:
name: Build sdist
timeout-minutes: 5
Expand Down Expand Up @@ -281,7 +309,7 @@ jobs:
publish:
name: Publish to Github and Pypi
runs-on: ubuntu-latest
needs: [test-builds, release-builds, sdist-build]
needs: [test-builds, release-builds, qemu-release-builds, sdist-build]
if: success() && startsWith(github.ref, 'refs/tags/v')
steps:
- uses: actions/checkout@v3
Expand Down
6 changes: 3 additions & 3 deletions download-wgpu-native.py
Original file line number Diff line number Diff line change
Expand Up @@ -87,14 +87,14 @@ def get_arch():
# https://github.com/pypa/cibuildwheel/blob/4307b52ff28b631519d38bfa0dd09d6a9b39a81e/cibuildwheel/macos.py#L277
if os.environ.get("CIBUILDWHEEL") == "1" and "ARCHFLAGS" in os.environ:
archflags = os.environ["ARCHFLAGS"]
return "arm64" if "arm64" in archflags else "x86_64"
return "aarch64" if "arm64" in archflags else "x86_64"

if machine == "armv7l":
# Raspberry pi
return "armv7"
elif is_64_bit and machine.startswith(("arm", "aarch64")):
# Includes MacOS M1, arm linux, ...
return "arm64"
return "aarch64"
elif is_64_bit:
return "x86_64"
else:
Expand Down Expand Up @@ -165,7 +165,7 @@ def main(version, os_string, arch, upstream):
"--arch",
help=f"Architecture to download for (default: {arch_string})",
default=arch_string,
choices=("x86_64", "i686", "arm64"),
choices=("x86_64", "i686", "aarch64"),
)
upstream = "gfx-rs/wgpu-native"
parser.add_argument(
Expand Down
4 changes: 2 additions & 2 deletions wgpu/backends/wgpu_native/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@


# The wgpu-native version that we target/expect
__version__ = "0.18.1.2"
__commit_sha__ = "f326782ecb69544126579fd335effa1e7259bd2c"
__version__ = "0.18.1.3"
__commit_sha__ = "8561b0d8c0b5af7dfb8631d6f924e5418c92f2ce"
version_info = tuple(map(int, __version__.split(".")))
_check_expected_version(version_info) # produces a warning on mismatch

Expand Down
Loading