Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/main' into swernli/python-interop
Browse files Browse the repository at this point in the history
  • Loading branch information
swernli committed Dec 13, 2024
2 parents 6009385 + 502ae34 commit 04a73d6
Show file tree
Hide file tree
Showing 30 changed files with 756 additions and 684 deletions.
8 changes: 3 additions & 5 deletions .ado/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,13 +34,13 @@ parameters:
default:
- name: linux_x86_64
poolName: 'Azure-Pipelines-DevTools-EO'
imageName: 'ubuntu-20.04'
imageName: 'ubuntu-22.04'
os: linux
arch: x86_64
additionalTargets: wasm32-unknown-unknown
- name: linux_aarch64
poolName: 'Azure-Pipelines-DevTools-EO'
imageName: 'ubuntu-20.04'
imageName: 'ubuntu-22.04'
os: linux
arch: aarch64
additionalRustTargets: aarch64-unknown-linux-gnu wasm32-unknown-unknown
Expand Down Expand Up @@ -299,7 +299,7 @@ extends:
python -m pip install auditwheel patchelf
ls target/wheels
ls target/wheels/*.whl | xargs auditwheel show
ls target/wheels/*.whl | xargs auditwheel repair --wheel-dir ./target/wheels/ --plat manylinux_2_31_x86_64
ls target/wheels/*.whl | xargs auditwheel repair --wheel-dir ./target/wheels/ --plat manylinux_2_35_x86_64
rm target/wheels/*-linux_x86_64.whl
ls target/wheels
displayName: Run auditwheel for Linux Wheels
Expand All @@ -313,10 +313,8 @@ extends:
condition: and(eq(variables['Agent.OS'], 'Linux'), eq(variables['arch'], 'aarch64'))
- script: |
chmod +x ./docker/linux-aarch64/build.sh
chmod +x ./docker/linux-aarch64/run.sh
./docker/linux-aarch64/build.sh
./docker/linux-aarch64/run.sh
displayName: Run auditwheel and python tests for Linux aarch64 Wheels
condition: and(eq(variables['Agent.OS'], 'Linux'), eq(variables['arch'], 'aarch64'))
Expand Down
19 changes: 0 additions & 19 deletions docker/linux-aarch64/Dockerfile

This file was deleted.

17 changes: 0 additions & 17 deletions docker/linux-aarch64/build.sh

This file was deleted.

2 changes: 1 addition & 1 deletion docker/linux-aarch64/entrypoint.sh
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ echo "SCRIPT_DIR: ${SCRIPT_DIR}"
WHEEL_ARCH="${WHEEL_ARCH:-aarch64}"
echo "WHEEL_ARCH: ${WHEEL_ARCH}"

WHEEL_PLATFORM="${WHEEL_PLATFORM:-manylinux_2_31_${WHEEL_ARCH}}"
WHEEL_PLATFORM="${WHEEL_PLATFORM:-manylinux_2_35_${WHEEL_ARCH}}"
echo "WHEEL_PLATFORM: ${WHEEL_PLATFORM}"

PIP_DIR="${PIP_DIR:-${SCRIPT_DIR}/../../pip}"
Expand Down
8 changes: 4 additions & 4 deletions docker/linux-aarch64/run.sh
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@ set -e
SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
echo "SCRIPT_DIR: ${SCRIPT_DIR}"

TAG="${TAG:-qsharp-linux-aarch64-runner}"
echo "TAG: ${TAG}"
BASE_IMAGE="${BASE_IMAGE:-mcr.microsoft.com/cbl-mariner/base/python:3.9}"
echo "BASE_IMAGE: ${BASE_IMAGE}"

VOLUME_ROOT=$(realpath ${SCRIPT_DIR}/../..)
echo "VOLUME_ROOT: ${VOLUME_ROOT}"

echo "docker run --platform linux/arm64/v8 -v ${VOLUME_ROOT}:/qsharp -e WHEEL_DIR='/qsharp/target/wheels' ${TAG} bash /qsharp/docker/linux-aarch64/entrypoint.sh"
docker run --platform linux/arm64/v8 -v ${VOLUME_ROOT}:/qsharp -e WHEEL_DIR='/qsharp/target/wheels' ${TAG} bash /qsharp/docker/linux-aarch64/entrypoint.sh
echo "docker run --platform linux/arm64/v8 -v ${VOLUME_ROOT}:/qsharp -e WHEEL_DIR='/qsharp/target/wheels' ${BASE_IMAGE} bash /qsharp/docker/linux-aarch64/entrypoint.sh"
docker run --platform linux/arm64/v8 -v ${VOLUME_ROOT}:/qsharp -e WHEEL_DIR='/qsharp/target/wheels' ${BASE_IMAGE} bash /qsharp/docker/linux-aarch64/entrypoint.sh
4 changes: 2 additions & 2 deletions fuzz/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ Based on [Fuzzing with cargo-fuzz](https://rust-fuzz.github.io/book/cargo-fuzz.h

For running locally you need the following steps.

(**On Windows use [WSL](https://learn.microsoft.com/windows/wsl/).** Tested in WSL Ubuntu 20.04)
(**On Windows use [WSL](https://learn.microsoft.com/windows/wsl/).** Tested in WSL Ubuntu 22.04)

## Prerequisites

Expand Down Expand Up @@ -329,7 +329,7 @@ See more in [LibFuzzer Corpus](https://llvm.org/docs/LibFuzzer.html#corpus).

Based on [Code Coverage](https://rust-fuzz.github.io/book/cargo-fuzz/coverage.html#code-coverage).

Tested in WSL Ubuntu 20.04.
Tested in WSL Ubuntu 22.04.

### Code Coverage Prerequisites

Expand Down
4 changes: 2 additions & 2 deletions jupyterlab/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ build-backend = "hatchling.build"
name = "qsharp-jupyterlab"
version = "0.0.0"
readme = "README.md"
requires-python = ">=3.8"
requires-python = ">=3.9"
classifiers = [
"Framework :: Jupyter",
"Framework :: Jupyter :: JupyterLab",
Expand All @@ -16,10 +16,10 @@ classifiers = [
"License :: OSI Approved :: MIT License",
"Programming Language :: Python",
"Programming Language :: Python :: 3",
"Programming Language :: Python :: 3.8",
"Programming Language :: Python :: 3.9",
"Programming Language :: Python :: 3.10",
"Programming Language :: Python :: 3.11",
"Programming Language :: Python :: 3.12",
]
dependencies = [
]
Expand Down
4 changes: 2 additions & 2 deletions pip/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -27,12 +27,12 @@ workspace = true
allocator = { path = "../allocator" }

[target.'cfg(not(any(target_os = "windows")))'.dependencies]
pyo3 = { workspace = true, features = ["abi3-py38", "extension-module", "num-bigint", "num-complex"] }
pyo3 = { workspace = true, features = ["abi3-py39", "extension-module", "num-bigint", "num-complex"] }

[target.'cfg(any(target_os = "windows"))'.dependencies]
# generate-import-lib: skip requiring Python 3 distribution
# files to be present on the (cross-)compile host system.
pyo3 = { workspace = true, features = ["abi3-py38", "extension-module", "generate-import-lib", "num-bigint", "num-complex"] }
pyo3 = { workspace = true, features = ["abi3-py39", "extension-module", "generate-import-lib", "num-bigint", "num-complex"] }

[lib]
crate-type = ["cdylib"]
Expand Down
5 changes: 3 additions & 2 deletions pip/pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,15 +1,16 @@
[project]
name = "qsharp"
version = "0.0.0"
requires-python = ">= 3.8"
requires-python = ">= 3.9"
classifiers = [
"License :: OSI Approved :: MIT License",
"Development Status :: 5 - Production/Stable",
"Intended Audience :: Developers",
"Programming Language :: Python :: 3.8",
"Programming Language :: Python :: 3",
"Programming Language :: Python :: 3.9",
"Programming Language :: Python :: 3.10",
"Programming Language :: Python :: 3.11",
"Programming Language :: Python :: 3.12",
"Programming Language :: Python",
"Programming Language :: Rust",
"Operating System :: MacOS",
Expand Down
3 changes: 3 additions & 0 deletions pip/qsharp/_native.pyi
Original file line number Diff line number Diff line change
Expand Up @@ -287,6 +287,9 @@ class Output:
def __str__(self) -> str: ...
def _repr_markdown_(self) -> Optional[str]: ...
def state_dump(self) -> Optional[StateDumpData]: ...
def is_state_dump(self) -> bool: ...
def is_matrix(self) -> bool: ...
def is_message(self) -> bool: ...

class StateDumpData:
"""
Expand Down
Loading

0 comments on commit 04a73d6

Please sign in to comment.