[fix] Remove Metric handling rules and passes

Author: yhteoh

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

@@ -13,12 +13,11 @@
 # limitations under the License.
 
 from .analysis import analysis_canonical_hamiltonian_dim, analysis_term_index
-from .assign import assign_analog_circuit_dim, verify_analog_args_dim
+from .assign import assign_analog_circuit_dim
 from .canonicalize import analog_operator_canonicalization
 
 __all__ = [
     "assign_analog_circuit_dim",
-    "verify_analog_args_dim",
     "analog_operator_canonicalization",
     "analysis_canonical_hamiltonian_dim",
     "analysis_term_index",

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

@@ -17,15 +17,13 @@
 ########################################################################################
 from oqd_core.compiler.analog.rewrite.assign import AssignAnalogIRDim
 from oqd_core.compiler.analog.verify.task import (
-    VerifyAnalogArgsDim,
     VerifyAnalogCircuitDim,
 )
 
 ########################################################################################
 
 __all__ = [
     "assign_analog_circuit_dim",
-    "verify_analog_args_dim",
 ]
 
 ########################################################################################
@@ -51,20 +49,3 @@ def assign_analog_circuit_dim(model):
         )
     )(assigned_model)
     return assigned_model
-
-
-def verify_analog_args_dim(model, n_qreg, n_qmode):
-    """
-    This pass checks whether the assigned n_qreg and n_qmode in AnalogCircuit match the n_qreg and n_qmode
-    in any Operators (like the Operator inside Expectation) in TaskArgsAnalog
-
-    Args:
-        model (TaskArgsAnalog):
-
-    Returns:
-        model (TaskArgsAnalog):
-
-    Assumptions:
-        All  [`Operator`][oqd_core.interface.analog.operator.Operator] inside TaskArgsAnalog must be canonicalized
-    """
-    Post(VerifyAnalogArgsDim(n_qreg=n_qreg, n_qmode=n_qmode))(model)

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

@@ -386,9 +386,6 @@ def __init__(self):
     def map_AnalogGate(self, model):
         self.op_add_root = False
 
-    def map_Expectation(self, model):
-        self.op_add_root = False
-
     def map_Operator(self, model: Operator):
         if not self.op_add_root:
             self.op_add_root = True

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

@@ -25,7 +25,6 @@
 )
 from .operator import VerifyHilberSpaceDim
 from .task import (
-    VerifyAnalogArgsDim,
     VerifyAnalogCircuitDim,
 )
 
@@ -40,6 +39,5 @@
     "CanVerSortedOrder",
     "CanVerScaleTerm",
     "VerifyAnalogCircuitDim",
-    "VerifyAnalogArgsDim",
     "VerifyHilberSpaceDim",
 ]

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

@@ -385,9 +385,6 @@ def __init__(self):
     def map_AnalogGate(self, model):
         self._single_term_scaling_needed = False
 
-    def map_Expectation(self, model):
-        self._single_term_scaling_needed = False
-
     def map_OperatorScalarMul(self, model: OperatorScalarMul):
         self._single_term_scaling_needed = True
         pass

src/oqd_core/compiler/analog/verify/operator.py

@@ -71,9 +71,6 @@ def _reset(self):
     def map_AnalogGate(self, model):
         self._reset()
 
-    def map_Expectation(self, model):
-        self._reset()
-
     def _get_dim(self, model):
         if isinstance(model, Pauli):
             return (1, 0)
@@ -103,14 +100,14 @@ def map_OperatorAdd(self, model):
             assert self._term_dim == new, "Incorrect Hilbert space dimension"
 
         if isinstance(model.op1, Union[OperatorTerminal, OperatorMul]):
-            assert self._term_dim == self._get_dim(model.op1), (
-                "Incorrect Hilbert space dimension"
-            )
+            assert self._term_dim == self._get_dim(
+                model.op1
+            ), "Incorrect Hilbert space dimension"
         elif isinstance(model.op1, OperatorScalarMul):
             if isinstance(model.op1.op, Union[OperatorTerminal, OperatorMul]):
-                assert self._term_dim == self._get_dim(model.op1.op), (
-                    "Incorrect Hilbert space dimension"
-                )
+                assert self._term_dim == self._get_dim(
+                    model.op1.op
+                ), "Incorrect Hilbert space dimension"
 
         if not isinstance(model.op1, OperatorAdd):
             self._final_add_term = True

src/oqd_core/compiler/analog/verify/task.py

@@ -14,7 +14,6 @@
 
 from oqd_compiler_infrastructure import RewriteRule
 
-from oqd_core.backend.metric import Expectation
 from oqd_core.compiler.analog.passes.analysis import analysis_canonical_hamiltonian_dim
 
 ########################################################################################
@@ -24,7 +23,6 @@
 
 __all__ = [
     "VerifyAnalogCircuitDim",
-    "VerifyAnalogArgsDim",
 ]
 
 ########################################################################################
@@ -51,32 +49,6 @@ def __init__(self, n_qreg, n_qmode):
         self._dim: tuple = (n_qreg, n_qmode)
 
     def map_AnalogGate(self, model: AnalogGate):
-        assert self._dim == analysis_canonical_hamiltonian_dim(model.hamiltonian), (
-            "Inconsistent Hilbert space dimension between Analog Gates"
-        )
-
-
-class VerifyAnalogArgsDim(RewriteRule):
-    """
-    Checks whether hilbert space dimensions are consistent between Expectation in args
-    and whether they match the n_qreg and n_qmode given as input.
-
-    Args:
-        model (VisitableBaseModel):
-            The rule only verfies Expectation inside TaskArgsAnalog in Analog layer
-
-    Returns:
-        model (VisitableBaseModel): unchanged
-
-    Assumptions:
-        All [`Operator`][oqd_core.interface.analog.operator.Operator] inside  [`AnalogCircuit`][oqd_core.interface.analog.operations.AnalogCircuit] are canonicalized
-    """
-
-    def __init__(self, n_qreg, n_qmode):
-        super().__init__()
-        self._dim: tuple = (n_qreg, n_qmode)
-
-    def map_Expectation(self, model: Expectation):
-        assert self._dim == analysis_canonical_hamiltonian_dim(model.operator), (
-            "Inconsistent Hilbert space dimension in Expectation metric"
-        )
+        assert self._dim == analysis_canonical_hamiltonian_dim(
+            model.hamiltonian
+        ), "Inconsistent Hilbert space dimension between Analog Gates"