Skip to content

Commit 41e9166

Browse files
committed
merge main, fix conflicts
2 parents 54cf747 + 86d5da0 commit 41e9166

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

66 files changed

+101
-41
lines changed

.pre-commit-config.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ repos:
99
- id: end-of-file-fixer
1010
- id: trailing-whitespace
1111
- repo: https://github.com/pycqa/isort
12-
rev: 5.13.2
12+
rev: 6.0.1
1313
hooks:
1414
- id: isort
1515
name: isort (python)

docs/digital/examples/ghz.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,10 @@
1111
# %%
1212
import math
1313

14-
from bloqade import qasm2
1514
from kirin.dialects import ilist
1615

16+
from bloqade import qasm2
17+
1718
# %% [markdown]
1819
# ## Simple Linear Depth Implementation of a GHZ State Preparation Circuit
1920
#

docs/digital/examples/ghz_linear_circuit.svg

Lines changed: 1 addition & 1 deletion

docs/digital/examples/ghz_log_circuit.svg

Lines changed: 1 addition & 1 deletion

docs/digital/examples/pauli_exponentiation.svg

Lines changed: 1 addition & 1 deletion

docs/digital/examples/qaoa.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,10 @@
99

1010
import kirin
1111
import networkx as nx
12-
from bloqade import qasm2
1312
from kirin.dialects import py, ilist
1413

14+
from bloqade import qasm2
15+
1516
pi = math.pi
1617

1718
# %% [markdown]

docs/digital/examples/qft.svg

Lines changed: 1 addition & 1 deletion

pyproject.toml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[project]
2-
name = "bloqade"
2+
name = "bloqade-circuit"
33
version = "0.22.5"
44
description = "The software development toolkit for neutral atom arrays."
55
readme = "README.md"
@@ -15,7 +15,7 @@ dependencies = [
1515
"scipy>=1.13.1",
1616
"kirin-toolchain~=0.14.0",
1717
"rich>=13.9.4",
18-
"pydantic>=1.3.0",
18+
"pydantic>=1.3.0,<2.11.0",
1919
"pandas>=2.2.3",
2020
]
2121

@@ -82,7 +82,7 @@ profile = "black"
8282
combine_as_imports = true
8383
multi_line_output = 3
8484
length_sort = true
85-
src_paths = ["src/kirin"]
85+
src_paths = ["src/bloqade"]
8686

8787
[tool.black]
8888
line-length = 88

src/bloqade/analysis/address/analysis.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,11 @@
22
from dataclasses import field
33

44
from kirin import ir, interp
5-
from bloqade.types import QubitType
65
from kirin.analysis import Forward, const
76
from kirin.analysis.forward import ForwardFrame
87

8+
from bloqade.types import QubitType
9+
910
from .lattice import Address
1011

1112

src/bloqade/noise/native/_wrappers.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
from typing import Any
22

3-
from bloqade.noise import native
43
from kirin.dialects import ilist
54
from kirin.lowering import wraps
5+
6+
from bloqade.noise import native
67
from bloqade.qasm2.types import Qubit
78

89

0 commit comments

Comments
 (0)