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

Implement PyBufferProtocol for RustyBuffer #48

Merged
merged 18 commits into from
Mar 30, 2021
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
49 changes: 34 additions & 15 deletions .github/workflows/CI.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,14 @@ on:
jobs:
macos:
runs-on: macos-latest
strategy:
matrix:
python-version: [3.6, 3.7, 3.8, 3.9]
steps:
- uses: actions/checkout@v2
- uses: actions/setup-python@v2
with:
python-version: 3.6
python-version: ${{ matrix.python-version }}
- name: Install Rust toolchain
uses: actions-rs/toolchain@v1
with:
Expand Down Expand Up @@ -59,6 +62,7 @@ jobs:
runs-on: windows-latest
strategy:
matrix:
python-version: [3.6, 3.7, 3.8, 3.9]
platform: [
{ python-architecture: "x64", target: "x86_64-pc-windows-msvc" },
{ python-architecture: "x86", target: "i686-pc-windows-msvc" },
Expand All @@ -67,7 +71,7 @@ jobs:
- uses: actions/checkout@v2
- uses: actions/setup-python@v2
with:
python-version: 3.6
python-version: ${{ matrix.python-version }}
architecture: ${{ matrix.platform.python-architecture }}
- name: Install Rust toolchain
uses: actions-rs/toolchain@v1
Expand All @@ -83,7 +87,7 @@ jobs:
if: matrix.platform.python-architecture == 'x64'
run: cargo test --no-default-features --release
- name: Install maturin
run: pip install maturin
run: pip install --pre maturin
- name: Build wheels
run: |
maturin build -i python --release --out dist --no-sdist --target ${{ matrix.platform.target }}
Expand All @@ -102,6 +106,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
python-version: [3.6, 3.7, 3.8, 3.9]
platform: [
{ manylinux: '2010', target: "x86_64-unknown-linux-gnu", arch: "x86_64" },
{ manylinux: '2010', target: "i686-unknown-linux-gnu", arch: "i686" },
Expand All @@ -120,14 +125,14 @@ jobs:
run: cargo test --no-default-features
- uses: actions/setup-python@v2
with:
python-version: 3.6
python-version: ${{ matrix.python-version }}
- name: Build Wheels
run: |
echo 'curl --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --default-toolchain stable
source ~/.cargo/env
export PATH=/opt/python/cp38-cp38/bin:$PATH
pip install maturin
maturin build -i python --release --out dist --no-sdist --target ${{ matrix.platform.target }} --manylinux ${{ matrix.platform.manylinux }}
export PATH=/opt/python/cp36-cp36m/bin:/opt/python/cp37-cp37m/bin:/opt/python/cp38-cp38/bin:/opt/python/cp39-cp39/bin:$PATH
pip install --pre maturin
maturin build -i python${{ matrix.python-version }} --release --out dist --no-sdist --target ${{ matrix.platform.target }} --manylinux ${{ matrix.platform.manylinux }}
' > build-wheel.sh

docker run --rm -v "$PWD":/io -w /io quay.io/pypa/manylinux${{ matrix.platform.manylinux }}_${{ matrix.platform.arch }} bash build-wheel.sh
Expand All @@ -147,41 +152,55 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
python: [
{ version: '3.6', abi: 'm' },
{ version: '3.7', abi: 'm' },
{ version: '3.8', abi: '' },
{ version: '3.9', abi: '' },
]
platform: [
{ manylinux: "2014", target: "aarch64-unknown-linux-gnu", arch: "aarch64" },
{ manylinux: "2014", target: "armv7-unknown-linux-gnueabihf", arch: "armv7" },
]
steps:
- uses: actions/checkout@v2
- uses: actions/setup-python@v2
with:
python-version: 3.6
- name: Build Wheels
run: |
echo 'curl -sSf https://sh.rustup.rs | sh -s -- -y --default-toolchain stable
source ~/.cargo/env
rustup target add ${{ matrix.platform.target }}
maturin build -i python --release --out dist --no-sdist --target ${{ matrix.platform.target }} --manylinux ${{ matrix.platform.manylinux }} --cargo-extra-args="--no-default-features" --cargo-extra-args="--features=abi3,extension-module" # disable mimallocator

export PYO3_CROSS_PYTHON_VERSION=${{ matrix.python.version }}
PY_VER="${PYO3_CROSS_PYTHON_VERSION//./}"
PY_ABI=${{ matrix.python.abi }}
PY_TAG="cp$PY_VER-cp$PY_VER$PY_ABI"
export PYO3_CROSS_LIB_DIR=/opt/python/$PY_TAG/lib

maturin build -i "python$PYO3_CROSS_PYTHON_VERSION" --release --out dist --no-sdist --target ${{ matrix.platform.target }} --manylinux ${{ matrix.platform.manylinux }} --cargo-extra-args="--no-default-features" --cargo-extra-args="--features=extension-module" # disable mimallocator
' > build-wheel.sh

docker run --rm -v "$PWD":/io -w /io messense/manylinux2014-cross:${{ matrix.platform.arch }} bash build-wheel.sh
- uses: uraimo/[email protected]
name: Install built wheel
with:
arch: ${{ matrix.platform.arch }}
distro: ubuntu18.04
distro: ubuntu20.04
githubToken: ${{ github.token }}
# Mount the dist directory as /artifacts in the container
dockerRunArgs: |
--volume "${PWD}/dist:/artifacts"
install: |
apt-get update
apt-get install -y --no-install-recommends python3 python3-pip
apt-get install -y --no-install-recommends python3 python3-pip software-properties-common
pip3 install -U pip
add-apt-repository ppa:deadsnakes/ppa
apt-get update
apt-get install -y python3.6 python3.7 python3.9
run: |
ls -lrth /artifacts
pip3 install cramjam --no-index --find-links /artifacts --force-reinstall
python3 -c "import cramjam"
PYTHON=python${{ matrix.python.version }}
$PYTHON -m pip install cramjam --no-index --find-links /artifacts --force-reinstall
$PYTHON -c 'import cramjam'
- name: Upload wheels
uses: actions/upload-artifact@v2
with:
Expand Down
7 changes: 3 additions & 4 deletions Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "cramjam"
version = "2.1.0"
version = "2.2.0"
authors = ["Miles Granger <[email protected]>"]
edition = "2018"
license-file = "LICENSE"
Expand All @@ -12,8 +12,7 @@ readme = "README.md"
crate-type = ["cdylib"]

[features]
default = ["abi3", "mimallocator", "extension-module"]
abi3 = ["pyo3/abi3-py36"]
default = ["mimallocator", "extension-module"]
mimallocator = ["mimalloc"]
extension-module = ["pyo3/extension-module"]

Expand All @@ -28,7 +27,7 @@ snap = "^1"
brotli2 = "^0.3"
lz4 = "^1"
flate2 = "^1"
zstd = "0.6.0+zstd.1.4.8"
zstd = "0.6.1+zstd.1.4.9"
numpy = "0.13.0"

[dependencies.mimalloc]
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -34,5 +34,5 @@ dev-install:
pip install cramjam --no-index --find-links dist/

pypy-build:
maturin build -i $(shell which pypy) --release --out dist --cargo-extra-args="--no-default-features" --cargo-extra-args="--features=mimallocator,extension-module" # disable abi3
maturin build -i $(shell which pypy) --release --out dist
pypy ./pypy_patch.py
8 changes: 7 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -40,9 +40,15 @@ All available for use as:

```python
>>> import cramjam
>>> import numpy as np
>>> compressed = cramjam.snappy.compress(b"bytes here")
>>> cramjam.snappy.decompress(compressed)
>>> decompressed = cramjam.snappy.decompress(compressed)
>>> decompressed
cramjam.Buffer(len=10) # an object which implements the buffer protocol
>>> bytes(decompressed)
b"bytes here"
>>> np.frombuffer(decompressed, dtype=np.uint8)
array([ 98, 121, 116, 101, 115, 32, 104, 101, 114, 101], dtype=uint8)
```

Where the API is `cramjam.<compression-variant>.compress/decompress` and accepts
Expand Down
Loading