Skip to content

Commit

Permalink
Merge branch 'main' into update-from-plxpr
Browse files Browse the repository at this point in the history
  • Loading branch information
albi3ro authored Dec 30, 2024
2 parents 8077a47 + 05d78ca commit 8db6bbb
Show file tree
Hide file tree
Showing 223 changed files with 11,333 additions and 3,489 deletions.
5 changes: 5 additions & 0 deletions .codecov.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,8 @@ comment:
behavior: once
require_changes: true
after_n_builds: 2

coverage:
status:
project: false
patch: true
4 changes: 2 additions & 2 deletions .dep-versions
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ enzyme=v0.0.149

# For a custom PL version, update the package version here and at
# 'doc/requirements.txt
pennylane=0.40.0-dev16
pennylane=0.40.0-dev20

# For a custom LQ/LK version, update the package version here and at
# 'doc/requirements.txt'
lightning=0.40.0-dev11
lightning=0.40.0-dev41
30 changes: 0 additions & 30 deletions .devcontainer/Dockerfile

This file was deleted.

37 changes: 0 additions & 37 deletions .devcontainer/dev/Dockerfile

This file was deleted.

43 changes: 0 additions & 43 deletions .devcontainer/dev/devcontainer.json

This file was deleted.

5 changes: 0 additions & 5 deletions .devcontainer/dev/post-install.sh

This file was deleted.

15 changes: 0 additions & 15 deletions .devcontainer/devcontainer.json

This file was deleted.

4 changes: 2 additions & 2 deletions .github/workflows/build-wheel-linux-arm64.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -204,7 +204,7 @@ jobs:
needs: [constants, build-dependencies]
strategy:
fail-fast: false
max-parallel: 2
max-parallel: 1
matrix:
python_version: [{major_minor: "3.10", patch: "14", package: "python3.10", alternative: "310"},
{major_minor: "3.11", patch: "9", package: "python3.11", alternative: "311"},
Expand Down Expand Up @@ -299,7 +299,7 @@ jobs:
needs: [constants, catalyst-linux-wheels-arm64]
strategy:
fail-fast: false
max-parallel: 2
max-parallel: 1
matrix:
python_version: [{major_minor: "3.10", patch: "14", package: "python3.10"},
{major_minor: "3.11", patch: "9", package: "python3.11"},
Expand Down
63 changes: 56 additions & 7 deletions .github/workflows/build-wheel-linux-x86_64.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,9 @@ on:
- ready_for_review
push:
branches: [ main ]
schedule:
# Thursdays we test the standalone plugin
- cron: '35 4 * * 4'
workflow_dispatch:
workflow_call:

Expand Down Expand Up @@ -184,7 +187,7 @@ jobs:
-DMLIR_ENABLE_BINDINGS_PYTHON=ON \
-DPython3_EXECUTABLE=$(which python${{ matrix.python_version }}) \
-DPython3_NumPy_INCLUDE_DIRS=$(python${{ matrix.python_version }} -c "import numpy as np; print(np.get_include())") \
-DCMAKE_CXX_VISIBILITY_PRESET=protected \
-DCMAKE_CXX_VISIBILITY_PRESET=default \
-DLLVM_ENABLE_LLD=ON
# TODO: when updating LLVM, test to see if mlir/unittests/Bytecode/BytecodeTest.cpp:55 is passing
Expand Down Expand Up @@ -217,7 +220,7 @@ jobs:
-DPython3_EXECUTABLE=$(which python${{ matrix.python_version }}) \
-DLLVM_ENABLE_ZLIB=FORCE_ON \
-DLLVM_ENABLE_ZSTD=OFF \
-DCMAKE_CXX_VISIBILITY_PRESET=protected \
-DCMAKE_CXX_VISIBILITY_PRESET=default \
-DLLVM_ENABLE_LLD=ON
LIT_FILTER_OUT="chlo_legalize_to_mhlo" cmake --build mhlo-build --target check-mlir-hlo
Expand All @@ -238,7 +241,7 @@ jobs:
-DCMAKE_BUILD_TYPE=Release \
-DLLVM_DIR=$GITHUB_WORKSPACE/llvm-build/lib/cmake/llvm \
-DENZYME_STATIC_LIB=ON \
-DCMAKE_CXX_VISIBILITY_PRESET=protected \
-DCMAKE_CXX_VISIBILITY_PRESET=default \
-DCMAKE_CXX_FLAGS="-fuse-ld=lld"
cmake --build enzyme-build --target EnzymeStatic-19
Expand Down Expand Up @@ -339,10 +342,7 @@ jobs:
cmake -S runtime -B runtime-build -G Ninja \
-DCMAKE_BUILD_TYPE=Release \
-DCMAKE_LIBRARY_OUTPUT_DIRECTORY=$GITHUB_WORKSPACE/runtime-build/lib \
-DPYTHON_EXECUTABLE=$(which python${{ matrix.python_version }}) \
-DPython_ROOT_DIR=$(python${{ matrix.python_version }} -c "import sys; print(sys.prefix)") \
-DPYTHON_VERSION_TO_FIND=${{ matrix.python_version }} \
-Dpybind11_DIR=$(python${{ matrix.python_version }} -c "import pybind11; print(pybind11.get_cmake_dir())") \
-DPython_EXECUTABLE=$(which python${{ matrix.python_version }}) \
-DENABLE_OPENQASM=ON
cmake --build runtime-build --target rt_capi rtd_openqasm rtd_null_qubit
Expand All @@ -357,6 +357,16 @@ jobs:
PYTHON=$(which python${{ matrix.python_version }}) \
make oqc
# Build OQD-Runtime
- name: Build OQD-Runtime
run: |
C_COMPILER=$(which gcc) \
CXX_COMPILER=$(which g++) \
OQD_BUILD_DIR=$GITHUB_WORKSPACE/oqd-build \
RT_BUILD_DIR=$GITHUB_WORKSPACE/runtime-build \
PYTHON=$(which python${{ matrix.python_version }}) \
make oqd
# Build Quantum and Gradient Dialects
- name: Build MLIR Dialects
run: |
Expand All @@ -378,6 +388,15 @@ jobs:
cmake --build quantum-build --target check-dialects catalyst-cli
- name: Build Plugin wheel
# Run only on Thursday at the given time
if: github.event.schedule == '35 4 * * 4'
run: |
CCACHE_DIR="$(pwd)/.ccache" \
MLIR_DIR="$GITHUB_WORKSPACE/llvm-build/lib/cmake/mlir" \
LLVM_BUILD_DIR="$GITHUB_WORKSPACE/llvm-build" \
make plugin-wheel
- name: Build wheel
run: |
PYTHON=python${{ matrix.python_version }} \
Expand All @@ -386,6 +405,7 @@ jobs:
DIALECTS_BUILD_DIR=$GITHUB_WORKSPACE/quantum-build \
RT_BUILD_DIR=$GITHUB_WORKSPACE/runtime-build \
OQC_BUILD_DIR=$GITHUB_WORKSPACE/oqc-build \
OQD_BUILD_DIR=$GITHUB_WORKSPACE/oqd-build \
ENZYME_BUILD_DIR=$GITHUB_WORKSPACE/enzyme-build \
make wheel
Expand All @@ -401,6 +421,15 @@ jobs:
path: wheel/
retention-days: 14

- name: Upload Standalone Plugin Wheel Artifact
# Run only on Thursday at the given time
if: github.event.schedule == '35 4 * * 4'
uses: actions/upload-artifact@v4
with:
name: standalone-plugin-manylinux_2_28_x86_64-wheel-py-${{ matrix.python_version }}.zip
path: standalone_plugin_wheel/dist
retention-days: 14

test-wheels:
needs: [constants, catalyst-linux-wheels-x86-64, determine_runner]
strategy:
Expand All @@ -422,6 +451,14 @@ jobs:
name: catalyst-manylinux_2_28_x86_64-wheel-py-${{ matrix.python_version }}.zip
path: dist

- name: Download Standalone Plugin Wheel Artifact
# Run only on Thursday at the given time
if: github.event.schedule == '35 4 * * 4'
uses: actions/download-artifact@v4
with:
name: standalone-plugin-manylinux_2_28_x86_64-wheel-py-${{ matrix.python_version }}.zip
path: standalone_plugin_wheel/wheel

- name: Set up Python ${{ matrix.python_version }}
uses: actions/setup-python@v5
with:
Expand All @@ -444,10 +481,22 @@ jobs:
run: |
python${{ matrix.python_version }} -m pip install dist/*.whl --extra-index-url https://test.pypi.org/simple
- name: Install Standalone Plugin
# Run only on Thursday at the given time (TODO: set comparison to == before merging)
if: github.event.schedule == '35 4 * * 4'
run: |
python${{ matrix.python_version }} -m pip install standalone_plugin_wheel/wheel/*.whl --no-deps
- name: Run Python Pytest Tests
run: |
python${{ matrix.python_version }} -m pytest frontend/test/pytest -n auto
python${{ matrix.python_version }} -m pytest frontend/test/pytest --backend="lightning.kokkos" -n auto
python${{ matrix.python_version }} -m pytest frontend/test/async_tests
# python${{ matrix.python_version }} -m pytest frontend/test/pytest --runbraket=LOCAL -n auto
python${{ matrix.python_version }} -m pytest frontend/test/test_oqc/oqc -n auto
- name: Run Standalone Plugin Tests
# Run only on Thursday at the given time
if: github.event.schedule == '35 4 * * 4'
run: |
python${{ matrix.python_version }} -m pytest standalone_plugin_wheel/standalone_plugin/test -n auto
Loading

0 comments on commit 8db6bbb

Please sign in to comment.