Skip to content

Fix atomic compiler #110

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.

Sign up for GitHub

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

Open
vishnu-m77 wants to merge 2 commits into
base: v1.0
Choose a base branch
from
Open

Fix atomic compiler #110

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f40f340
clean: Move math into atomic compiler
vishnu-m77 Jun 18, 2026
8232c4c
feat: Fix atomic canonicalization passes
vishnu-m77 Jun 19, 2026
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
2 changes: 1 addition & 1 deletion .github/workflows/pytest.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,4 +39,4 @@ jobs:
uv sync --extra tests
- name: Run tests
run: |
uv run pytest tests/test_frontend tests/test_analog tests/test_analysis -v
uv run pytest tests/ -v
4 changes: 2 additions & 2 deletions examples/analog/test.analog
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ if (x > 0){
initialize(r)
}
if (x == 1) {
evolve(H_single, 1.0, r)
evolve(H_single, 1.0, q0)
}
else { evolve(H_pair, 0.5, r) }
n = 3
Expand Down Expand Up @@ -67,7 +67,7 @@ if (a > b) {
initialize(r)

// evolve(hamiltonian, duration, target)
evolve(H_single, 2.0, r)
evolve(H_single, 2.0, q1)
evolve(H_pair, 1.0, targets)
evolve(%X %* 0.5, pi, q0)

Expand Down
199 changes: 120 additions & 79 deletions examples/analog/test.ipynb
View file
Open in desktop

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions examples/atomic/test.atomic
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ phi = #phi
t_gate = 10e-6
flag = true
n = 3
r = ionreg(2)

// beam(frequency, rabi, phase, polarization, wavevector)
beam_mw = beam(2.0 * pi * 1e6, omega, phi, [1.0, 0.0, 0.0], [0.0, 0.0, 1.0])
Expand Down
47 changes: 44 additions & 3 deletions examples/atomic/test.ipynb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,7 @@
"t_gate = 1e-5\n",
"flag = true\n",
"n = 3\n",
"r = ionreg(2)\n",
"beam_mw = beam(2.0 * pi * 1000000.0, omega, phi, [1.0, 0.0, 0.0], [0.0, 0.0, 1.0])\n",
"beam_det = beam(2.0 * pi * 2000000.0, 0.25, 0.0, [0.0, 1.0, 0.0], [0.0, 0.0, 1.0])\n",
"pulse(beam_mw, t_gate, q0, false)\n",
Expand Down Expand Up @@ -138,16 +139,56 @@
},
{
"cell_type": "code",
"execution_count": null,
"execution_count": 4,
"id": "89124808",
"metadata": {},
"outputs": [],
"source": []
"source": [
"from oqd_compiler_infrastructure import Post, PrettyPrint\n",
"\n",
"from oqd_core.analysis.atomic.cfg import AtomicCFGBuilder\n",
"from oqd_core.analysis.atomic.type_checker import AtomicTypeChecker\n",
"from oqd_core.frontend.atomic import parse_atomic\n",
"\n",
"printer = Post(PrettyPrint())\n",
"\n",
"with open(\"test.atomic\", mode=\"r\", encoding=\"utf8\") as f:\n",
" source = f.read()\n",
"\n",
"circuit = parse_atomic(source)\n",
"cfg = AtomicCFGBuilder().run(circuit)\n",
"checker = AtomicTypeChecker(cfg)\n"
]
},
{
"cell_type": "code",
"execution_count": 5,
"id": "9314af17",
"metadata": {},
"outputs": [
{
"data": {
"text/plain": [
"AtomicCircuit(class_='AtomicCircuit', statements=[Declaration(class_='Declaration', name='ions', value=IonRegister(class_='IonRegister', size=2)), Declaration(class_='Declaration', name='q0', value=Extract(class_='Extract', access=Access(class_='Access', name='ions'), index=0)), Declaration(class_='Declaration', name='q1', value=Extract(class_='Extract', access=Access(class_='Access', name='ions'), index=1)), Declaration(class_='Declaration', name='targets', value=AtomicList(class_='AtomicList', values=[Access(class_='Access', name='q0'), Access(class_='Access', name='q1')])), Declaration(class_='Declaration', name='pi', value=MathNum(class_='MathNum', value=3.14159)), Declaration(class_='Declaration', name='omega', value=MathVar(class_='MathVar', name='#omega')), Declaration(class_='Declaration', name='phi', value=MathVar(class_='MathVar', name='#phi')), Declaration(class_='Declaration', name='t_gate', value=MathNum(class_='MathNum', value=1e-05)), Declaration(class_='Declaration', name='flag', value=Bool(class_='Bool', value=True)), Declaration(class_='Declaration', name='n', value=MathNum(class_='MathNum', value=3)), Declaration(class_='Declaration', name='r', value=IonRegister(class_='IonRegister', size=2)), Declaration(class_='Declaration', name='beam_mw', value=Beam(class_='Beam', frequency=MathMul(class_='MathMul', expr1=MathNum(class_='MathNum', value=2000000.0), expr2=Access(class_='Access', name='pi')), rabi=Access(class_='Access', name='omega'), phase=Access(class_='Access', name='phi'), polarization=AtomicList(class_='AtomicList', values=[MathNum(class_='MathNum', value=1.0), MathNum(class_='MathNum', value=0.0), MathNum(class_='MathNum', value=0.0)]), wavevector=AtomicList(class_='AtomicList', values=[MathNum(class_='MathNum', value=0.0), MathNum(class_='MathNum', value=0.0), MathNum(class_='MathNum', value=1.0)]))), Declaration(class_='Declaration', name='beam_det', value=Beam(class_='Beam', frequency=MathMul(class_='MathMul', expr1=MathNum(class_='MathNum', value=4000000.0), expr2=Access(class_='Access', name='pi')), rabi=MathNum(class_='MathNum', value=0.25), phase=MathNum(class_='MathNum', value=0.0), polarization=AtomicList(class_='AtomicList', values=[MathNum(class_='MathNum', value=0.0), MathNum(class_='MathNum', value=1.0), MathNum(class_='MathNum', value=0.0)]), wavevector=AtomicList(class_='AtomicList', values=[MathNum(class_='MathNum', value=0.0), MathNum(class_='MathNum', value=0.0), MathNum(class_='MathNum', value=1.0)]))), SerialProtocol(class_='SerialProtocol', pulses=[Pulse(class_='Pulse', duration=Access(class_='Access', name='t_gate'), target=Access(class_='Access', name='q0'), beam=Access(class_='Access', name='beam_mw'), measured=Bool(class_='Bool', value=False))]), SerialProtocol(class_='SerialProtocol', pulses=[Pulse(class_='Pulse', duration=MathNum(class_='MathNum', value=3e-06), target=Access(class_='Access', name='q1'), beam=Access(class_='Access', name='beam_det'), measured=Bool(class_='Bool', value=True))]), SerialProtocol(class_='SerialProtocol', pulses=[Pulse(class_='Pulse', duration=MathNum(class_='MathNum', value=2e-06), target=Access(class_='Access', name='targets'), beam=Access(class_='Access', name='beam_mw'), measured=Bool(class_='Bool', value=False))]), SerialProtocol(class_='SerialProtocol', pulses=[Pulse(class_='Pulse', duration=Access(class_='Access', name='t_gate'), target=Extract(class_='Extract', access=Access(class_='Access', name='r'), index=0), beam=Access(class_='Access', name='beam_mw'), measured=Bool(class_='Bool', value=False))]), SerialProtocol(class_='SerialProtocol', pulses=[Pulse(class_='Pulse', duration=MathNum(class_='MathNum', value=3e-06), target=Extract(class_='Extract', access=Access(class_='Access', name='r'), index=1), beam=Access(class_='Access', name='beam_det'), measured=Bool(class_='Bool', value=True))]), SerialProtocol(class_='SerialProtocol', pulses=[ParallelProtocol(class_='ParallelProtocol', pulses=[Pulse(class_='Pulse', duration=MathNum(class_='MathNum', value=5e-06), target=Access(class_='Access', name='q0'), beam=Access(class_='Access', name='beam_mw'), measured=Bool(class_='Bool', value=False)), Pulse(class_='Pulse', duration=MathNum(class_='MathNum', value=5e-06), target=Access(class_='Access', name='q1'), beam=Access(class_='Access', name='beam_det'), measured=Bool(class_='Bool', value=False))])]), SerialProtocol(class_='SerialProtocol', pulses=[ParallelProtocol(class_='ParallelProtocol', pulses=[Pulse(class_='Pulse', duration=MathNum(class_='MathNum', value=5e-06), target=Access(class_='Access', name='q0'), beam=Access(class_='Access', name='beam_mw'), measured=Bool(class_='Bool', value=False))]), ParallelProtocol(class_='ParallelProtocol', pulses=[Pulse(class_='Pulse', duration=MathNum(class_='MathNum', value=5e-06), target=Access(class_='Access', name='q1'), beam=Access(class_='Access', name='beam_det'), measured=Bool(class_='Bool', value=False))])]), SerialProtocol(class_='SerialProtocol', pulses=[ParallelProtocol(class_='ParallelProtocol', pulses=[Pulse(class_='Pulse', duration=MathNum(class_='MathNum', value=5e-06), target=Access(class_='Access', name='q0'), beam=Access(class_='Access', name='beam_mw'), measured=Bool(class_='Bool', value=False)), Pulse(class_='Pulse', duration=MathNum(class_='MathNum', value=5e-06), target=Access(class_='Access', name='q0'), beam=Access(class_='Access', name='beam_mw'), measured=Bool(class_='Bool', value=False)), Pulse(class_='Pulse', duration=MathNum(class_='MathNum', value=5e-06), target=Access(class_='Access', name='q1'), beam=Access(class_='Access', name='beam_det'), measured=Bool(class_='Bool', value=False))]), ParallelProtocol(class_='ParallelProtocol', pulses=[Pulse(class_='Pulse', duration=MathNum(class_='MathNum', value=5e-06), target=Access(class_='Access', name='q1'), beam=Access(class_='Access', name='beam_det'), measured=Bool(class_='Bool', value=False))])]), IfElse(class_='IfElse', condition=Access(class_='Access', name='flag'), then_branch=[SerialProtocol(class_='SerialProtocol', pulses=[Pulse(class_='Pulse', duration=MathNum(class_='MathNum', value=2e-06), target=Access(class_='Access', name='targets'), beam=Access(class_='Access', name='beam_mw'), measured=Bool(class_='Bool', value=False))])], else_branch=[SerialProtocol(class_='SerialProtocol', pulses=[Pulse(class_='Pulse', duration=MathNum(class_='MathNum', value=2e-05), target=Access(class_='Access', name='targets'), beam=Access(class_='Access', name='beam_det'), measured=Bool(class_='Bool', value=True))])]), While(class_='While', condition=BoolGreaterThan(class_='BoolGreaterThan', expr1=Access(class_='Access', name='n'), expr2=MathNum(class_='MathNum', value=0)), body=[SerialProtocol(class_='SerialProtocol', pulses=[ParallelProtocol(class_='ParallelProtocol', pulses=[Pulse(class_='Pulse', duration=MathNum(class_='MathNum', value=1e-06), target=Access(class_='Access', name='targets'), beam=Access(class_='Access', name='beam_mw'), measured=Bool(class_='Bool', value=False))])]), Declaration(class_='Declaration', name='n', value=MathAdd(class_='MathAdd', expr1=MathNum(class_='MathNum', value=-1), expr2=Access(class_='Access', name='n'))), IfElse(class_='IfElse', condition=BoolEq(class_='BoolEq', expr1=Access(class_='Access', name='n'), expr2=MathNum(class_='MathNum', value=1)), then_branch=[Continue(class_='Continue')], else_branch=[]), IfElse(class_='IfElse', condition=BoolEq(class_='BoolEq', expr1=Access(class_='Access', name='n'), expr2=MathNum(class_='MathNum', value=0)), then_branch=[Break(class_='Break')], else_branch=[])])])"
]
},
"execution_count": 5,
"metadata": {},
"output_type": "execute_result"
}
],
"source": [
"from oqd_core.compiler.atomic.canonicalize import canonicalize_atomic_circuit_factory\n",
"from oqd_core.compiler.atomic.cfg_passes.walk import canonicalize_math_cfg\n",
"\n",
"canonicalize_math_cfg(cfg)\n",
"canonicalize_atomic_circuit_factory()(circuit)"
]
}
],
"metadata": {
"kernelspec": {
"display_name": "oqd-core (3.11.11)",
"display_name": "oqd-core (3.11.11.final.0)",
"language": "python",
"name": "python3"
},
Expand Down
6 changes: 3 additions & 3 deletions src/oqd_core/analysis/analog/types.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,14 @@

from __future__ import annotations

from dataclasses import dataclass
from typing import Union

from oqd_compiler_infrastructure.lattice import (
LatticeBase,
LatticeBottom,
LatticeTop,
)
from pydantic import BaseModel, ConfigDict

from oqd_core.interface.analog import (
BoolAnd,
Expand All @@ -48,9 +48,9 @@ class AnalogTypeError(TypeError):
"""Type Error class for Analog."""
pass

@dataclass
class TList(LatticeTop):
class TList(LatticeTop, BaseModel):
"""Lattice value representing a list."""
model_config = ConfigDict(frozen=True)
elem: TLatticeValue

TLatticeValue = Union[TList, type[LatticeTop]]
Expand Down
Loading
Loading