Merge branch 'main' of https://github.com/OpenQuantumDesign/oqd-core into visualization

Author: yhteoh

docs/explanation/atomic_interface.md

@@ -212,6 +212,25 @@ microwave_pulse = Pulse(
 
 ///
 
+#### Measurement
+
+To perform a measurement, we not only have to turn on an optical channel, we also have to turn on a detector, this is handled by the [`MeasurePulse`][oqd_core.interface.atomic.protocol.MeasurePulse].
+
+<!-- prettier-ignore -->
+/// admonition | Example
+    type: example
+
+Pulse that drives a fluorescent transition and turns on the detector for a duration $T$:
+
+```python
+detection_pulse = MeasurePulse(
+    beam=detection_beam,
+    duration=T,
+)
+```
+
+///
+
 ### Composition of Protocols
 
 The pulse program for a quantum experiment is usually more complex than a pulse of a single beam. This is handled with [`SequentialProtocol`][oqd_core.interface.atomic.protocol.SequentialProtocol] and [`ParallelProtocol`][oqd_core.interface.atomic.protocol.ParallelProtocol].

docs/explanation/math_interface.md

@@ -101,9 +101,13 @@ The compatible operators for the math interface consist of:
 The compatible named functions include:
 
 - trigonometric (`sin`, `cos`, `tan`)
+- inverse trigonometric functions (`asin`, `acos`, `atan`, `atan2`)
 - hyperbolic trigonometric (`sinh`, `cosh`, `tanh`)
+- inverse hyperbolic trigonometric functions (`asinh`, `acosh`, `atanh`)
 - exponential (`exp`)
 - logarithm (`log`)
+- complex number functions (`real`, `imag`, `conj`, `abs`)
+- step function (`heaviside`)
 
 ///
 

pyproject.toml

@@ -62,13 +62,10 @@ select = ["E4", "E7", "E9", "F", "I"]
 fixable = ["ALL"]
 
 [tool.uv.sources]
-oqd-compiler-infrastructure = { git = "https://github.com/openquantumdesign/oqd-compiler-infrastructure", rev = "fix_conversion_rule" }
+oqd-compiler-infrastructure = { git = "https://github.com/openquantumdesign/oqd-compiler-infrastructure" }
 
 [dependency-groups]
-dev = [
-    "jupyter>=1.1.1",
-    "pre-commit>=4.1.0",
-]
+dev = ["jupyter>=1.1.1", "pre-commit>=4.1.0"]
 
 
 [project.urls]

src/oqd_core/compiler/analog/passes/canonicalize.py

@@ -23,6 +23,7 @@
     PauliAlgebra,
     ProperOrder,
     PruneIdentity,
+    PruneZeros,
     ScaleTerms,
     SortedOrder,
 )
@@ -119,5 +120,5 @@ def analog_operator_canonicalization(model):
         FixedPoint(scale_terms_chain),
         FixedPoint(Post(SortedOrder())),
         canonicalize_math_expr,
-        verify_canonicalization,
+        FixedPoint(Post(PruneZeros())),
     )(model=model)

src/oqd_core/compiler/analog/rewrite/__init__.py

@@ -21,6 +21,7 @@
     PauliAlgebra,
     ProperOrder,
     PruneIdentity,
+    PruneZeros,
     ScaleTerms,
     SortedOrder,
 )
@@ -36,4 +37,5 @@
     "ProperOrder",
     "ScaleTerms",
     "SortedOrder",
+    "PruneZeros",
 ]

src/oqd_core/compiler/analog/rewrite/canonicalize.py

@@ -16,7 +16,6 @@
 
 from oqd_compiler_infrastructure import RewriteRule
 
-########################################################################################
 from oqd_core.compiler.analog.passes.analysis import analysis_term_index
 from oqd_core.interface.analog import (
     Annihilation,
@@ -49,6 +48,7 @@
     "ProperOrder",
     "ScaleTerms",
     "SortedOrder",
+    "PruneZeros",
 ]
 
 ########################################################################################
@@ -499,3 +499,33 @@ def map_OperatorAdd(self, model: OperatorAdd):
 
             elif term1 < term2:
                 return OperatorAdd(op1=model.op1, op2=model.op2)
+
+
+class PruneZeros(RewriteRule):
+    """
+    Removes operators multiplied by zero
+
+    Args:
+        model (VisitableBaseModel):
+
+    Returns:
+        model (VisitableBaseModel):
+
+    Assumptions:
+        [`GatherMathExpr`][oqd_core.compiler.analog.rewrite.canonicalize.GatherMathExpr],
+        [`OperatorDistribute`][oqd_core.compiler.analog.rewrite.canonicalize.OperatorDistribute],
+        [`ProperOrder`][oqd_core.compiler.analog.rewrite.canonicalize.ProperOrder],
+        [`GatherPauli`][oqd_core.compiler.analog.rewrite.canonicalize.GatherPauli],
+        [`NormalOrder`][oqd_core.compiler.analog.rewrite.canonicalize.NormalOrder]
+        [`PruneIdentity`][oqd_core.compiler.analog.rewrite.canonicalize.PruneIdentity]
+
+    """
+
+    def map_OperatorAdd(self, model):
+        if isinstance(model.op1, OperatorScalarMul) and model.op1.expr == MathNum(
+            value=0
+        ):
+            return model.op2
+
+        if model.op2.expr == MathNum(value=0):
+            return model.op1

src/oqd_core/interface/analog/operator.py

@@ -74,12 +74,12 @@ def __sub__(self, other):
         return OperatorSub(op1=self, op2=other)
 
     def __matmul__(self, other):
-        if isinstance(other, MathExpr):
-            raise TypeError(
-                "Tried Kron product between Operator and MathExpr. "
-                + "Scalar multiplication of MathExpr and Operator should be bracketed when perfoming Kron product."
-            )
-        return OperatorKron(op1=self, op2=other)
+        if isinstance(other, Operator):
+            return OperatorKron(op1=self, op2=other)
+
+        raise TypeError(
+            f"Attempted Kron product between Operator and {type(other)}. Double check brackets."
+        )
 
     def __mul__(self, other):
         if isinstance(other, Operator):
@@ -92,7 +92,9 @@ def __rmul__(self, other):
         other = MathExpr.cast(other)
         return self * other
 
-    pass
+    def __truediv__(self, other):
+        other = MathExpr.cast(other)
+        return OperatorScalarMul(op=self, expr=1 / other)
 
 
 ########################################################################################
@@ -154,9 +156,9 @@ def PauliPlus():
     Function that constructs the Pauli + operator
     """
     return OperatorAdd(
-        op1=PauliX(),
+        op1=OperatorScalarMul(op=PauliX(), expr=MathNum(value=0.5)),
         op2=OperatorScalarMul(
-            op=PauliY(), expr=MathMul(expr1=MathImag(), expr2=MathNum(value=1))
+            op=PauliY(), expr=MathMul(expr1=MathImag(), expr2=MathNum(value=0.5))
         ),
     )
 
@@ -166,9 +168,9 @@ def PauliMinus():
     Function that constructs the Pauli - operator
     """
     return OperatorAdd(
-        op1=PauliX(),
+        op1=OperatorScalarMul(op=PauliX(), expr=MathNum(value=0.5)),
         op2=OperatorScalarMul(
-            op=PauliY(), expr=MathMul(expr1=MathImag(), expr2=MathNum(value=-1))
+            op=PauliY(), expr=MathMul(expr1=MathImag(), expr2=MathNum(value=-0.5))
         ),
     )