track with main

Author: ritu-thombre99

.dep-versions

@@ -10,7 +10,7 @@ enzyme=v0.0.180
 
 # For a custom PL version, update the package version here and at
 # 'doc/requirements.txt
-pennylane=0.42.0-dev33
+pennylane=0.42.0-dev48
 
 # For a custom LQ/LK version, update the package version here and at
 # 'doc/requirements.txt'

doc/dev/transforms.rst

@@ -299,6 +299,12 @@ Let's add the pattern-matching logic to the ``matchAndRewrite`` method:
             return failure();
         }
 
+        // In the line `Operation *parent = qbs[0].getDefiningOp();`,
+        // we retrived the parent `Operation`, which only has methods on the
+        // base `Operation` class
+        // https://mlir.llvm.org/doxygen/classmlir_1_1Operation.html
+        // To use the specific methods and the auto-generated getters for
+        // the specific `QubitUnitaryOp`, we need to cast it first.
         QubitUnitaryOp parentOp = cast<QubitUnitaryOp>(parent);
         ValueRange parentQbs = parentOp.getOutQubits();
 
@@ -308,10 +314,11 @@ Let's add the pattern-matching logic to the ``matchAndRewrite`` method:
             return failure();
         }
 
-        for (auto [qb1, qb2] : llvm::zip(qbs, parentQbs))
+        for (auto [qb1, qb2] : llvm::zip(qbs, parentQbs)) {
             if (qb1 != qb2) {
                 return failure();
             }
+        }
 
         // Rewrite logic
         // ... We have matched the pattern, now rewrite the IR here
@@ -370,9 +377,9 @@ In C++ it will look as follows:
         // Pattern matching logic
         // ... match the pattern
 
+        //////////////////////////////////////////////////
+
         // Rewrite logic
-        ValueRange qbs = op.getInQubits();
-        QubitUnitaryOp parentOp = cast<QubitUnitaryOp>(qbs[0].getDefiningOp());
 
         // In the tablegen definition of `QubitUnitaryOp`, there is a
         // field called `$matrix`, storing the matrix for the unitary gate.
@@ -536,7 +543,7 @@ fixed point is reached.
 
     If you are encoutering issues, or would like to quickly try out the merge unitary pass described in this
     section, you can have a look at or cherry-pick this commit which includes all changes described
-    in this section: https://github.com/PennyLaneAI/catalyst/commit/9afcc3500e12e5a51b78dda76cd4d27bdf4c8905
+    in this section: https://github.com/PennyLaneAI/catalyst/commit/2c84b2402cb67c62a6de5137bbf5b41afaa5a328
 
 
 Writing more general transformations

doc/releases/changelog-dev.md

@@ -218,6 +218,9 @@
 * `make all` now correctly compiles the standalone plugin with the same compiler used to compile LLVM and MLIR.
   [(#1768)](https://github.com/PennyLaneAI/catalyst/pull/1768)
 
+* Stacked python decorators for built-in catalyst passes are now applied in the correct order.
+  [(#1798)](https://github.com/PennyLaneAI/catalyst/pull/1798)
+
 <h3>Internal changes ⚙️</h3>
 
 * `null.qubit` can now support an optional `track_resources` argument which allows it to record which gates are executed.

doc/requirements.txt

@@ -33,4 +33,4 @@ lxml_html_clean
 --extra-index-url https://test.pypi.org/simple/
 pennylane-lightning-kokkos==0.42.0-dev16
 pennylane-lightning==0.42.0-dev16
-pennylane==0.42.0-dev33
+pennylane==0.42.0-dev48

frontend/catalyst/_version.py

@@ -16,4 +16,4 @@
 Version number (major.minor.patch[-label])
 """
 
-__version__ = "0.12.0-dev50"
+__version__ = "0.12.0-dev53"

frontend/catalyst/passes/pass_api.py

@@ -72,8 +72,11 @@ def __init__(self, qnode, pass_name_or_pipeline, *flags, **valued_options):
     def __call__(self, *args, **kwargs):
         if EvaluationContext.is_tracing():
             pass_pipeline = kwargs.pop("pass_pipeline", [])
-            pass_pipeline += dictionary_to_list_of_passes(
-                self.pass_name_or_pipeline, *self.flags, **self.valued_options
+            pass_pipeline = (
+                dictionary_to_list_of_passes(
+                    self.pass_name_or_pipeline, *self.flags, **self.valued_options
+                )
+                + pass_pipeline
             )
             kwargs["pass_pipeline"] = pass_pipeline
         return super().__call__(*args, **kwargs)

frontend/test/lit/test_peephole_optimizations.py

@@ -278,10 +278,10 @@ def test_chained_pipeline_lowering():
     """
     pipeline1 = {
         "cancel_inverses": {},
-        "merge_rotations": {},
     }
     pipeline2 = {
         "cancel_inverses": {},
+        "merge_rotations": {},
     }
 
     @qjit()
@@ -343,8 +343,8 @@ def test_chained_pipeline_lowering_keep_original_workflow(x: float):
     # COM: The qnode after pipeline2
     # CHECK: transform.named_sequence @__transform_main
     # CHECK-NEXT: {{%.+}} = transform.apply_registered_pass "remove-chained-self-inverse" to {{%.+}}
-    # CHECK-NEXT: {{%.+}} = transform.apply_registered_pass "remove-chained-self-inverse" to {{%.+}}
     # CHECK-NEXT: {{%.+}} = transform.apply_registered_pass "merge-rotations" to {{%.+}}
+    # CHECK-NEXT: {{%.+}} = transform.apply_registered_pass "remove-chained-self-inverse" to {{%.+}}
     # CHECK-NEXT: transform.yield
     print(test_chained_pipeline_lowering_keep_original_workflow.mlir)
 
@@ -358,8 +358,8 @@ def test_chained_apply_passes():
     """
 
     @qjit()
-    @apply_pass("remove-chained-self-inverse")
     @apply_pass("merge-rotations")
+    @apply_pass("remove-chained-self-inverse")
     @qml.qnode(qml.device("lightning.qubit", wires=2))
     def test_chained_apply_passes_workflow(x: float):
         qml.Hadamard(wires=[1])
@@ -406,8 +406,8 @@ def test_chained_apply_passes_keep_original_workflow(x: float):
     # CHECK-NEXT: {{%.+}} = transform.apply_registered_pass "remove-chained-self-inverse" to {{%.+}}
     # COM: The qnode after merge_rotations
     # CHECK: transform.named_sequence @__transform_main
-    # CHECK-NEXT: {{%.+}} = transform.apply_registered_pass "merge-rotations" to {{%.+}}
     # CHECK-NEXT: {{%.+}} = transform.apply_registered_pass "remove-chained-self-inverse" to {{%.+}}
+    # CHECK-NEXT: {{%.+}} = transform.apply_registered_pass "merge-rotations" to {{%.+}}
     # CHECK-NEXT: transform.yield
     print(test_chained_apply_passes_keep_original_workflow.mlir)
 
@@ -421,8 +421,8 @@ def test_chained_peephole_passes():
     """
 
     @qjit()
-    @cancel_inverses
     @merge_rotations
+    @cancel_inverses
     @qml.qnode(qml.device("lightning.qubit", wires=2))
     def test_chained_peephole_passes_workflow(x: float):
         qml.Hadamard(wires=[1])
@@ -469,8 +469,8 @@ def test_chained_peephole_passes_keep_original_workflow(x: float):
     # CHECK-NEXT: {{%.+}} = transform.apply_registered_pass "remove-chained-self-inverse" to {{%.+}}
     # COM: The qnode after merge_rotations
     # CHECK: transform.named_sequence @__transform_main
-    # CHECK-NEXT: {{%.+}} = transform.apply_registered_pass "merge-rotations" to {{%.+}}
     # CHECK-NEXT: {{%.+}} = transform.apply_registered_pass "remove-chained-self-inverse" to {{%.+}}
+    # CHECK-NEXT: {{%.+}} = transform.apply_registered_pass "merge-rotations" to {{%.+}}
     # CHECK-NEXT: transform.yield
     print(test_chained_peephole_passes_keep_original_workflow.mlir)
 
@@ -569,8 +569,8 @@ def test_stacked_pass_for_loop_autograph():
     # CHECK-NEXT: {{%.+}} = transform.apply_registered_pass "remove-chained-self-inverse" to {{%.+}}
     # CHECK-NEXT: {{%.+}} = transform.apply_registered_pass "merge-rotations" to {{%.+}}
     # CHECK-NEXT: transform.yield
-    @cancel_inverses
     @merge_rotations
+    @cancel_inverses
     @qml.qnode(qml.device("null.qubit", wires=1))
     def circuit(n_iter: int):
         for _ in range(n_iter):

frontend/test/lit/test_ppr_ppm.py

@@ -60,8 +60,8 @@ def test_commute_ppr():
     pipe = [("pipe", ["enforce-runtime-invariants-pipeline"])]
 
     @qjit(pipelines=pipe, target="mlir")
-    @to_ppr
     @commute_ppr
+    @to_ppr
     @qml.qnode(qml.device("null.qubit", wires=2))
     def cir_commute_ppr():
         qml.H(0)
@@ -91,8 +91,8 @@ def test_commute_ppr_max_pauli_size():
     pipe = [("pipe", ["enforce-runtime-invariants-pipeline"])]
 
     @qjit(pipelines=pipe, target="mlir")
-    @to_ppr
     @commute_ppr(max_pauli_size=2)
+    @to_ppr
     @qml.qnode(qml.device("null.qubit", wires=2))
     def cir_commute_ppr_max_pauli_size():
         qml.CNOT([0, 2])
@@ -122,8 +122,8 @@ def test_merge_ppr_ppm():
     pipe = [("pipe", ["enforce-runtime-invariants-pipeline"])]
 
     @qjit(pipelines=pipe, target="mlir")
-    @to_ppr
     @merge_ppr_ppm
+    @to_ppr
     @qml.qnode(qml.device("null.qubit", wires=2))
     def cir_merge_ppr_ppm():
         qml.H(0)
@@ -150,8 +150,8 @@ def test_merge_ppr_ppm_max_pauli_size():
     pipe = [("pipe", ["enforce-runtime-invariants-pipeline"])]
 
     @qjit(pipelines=pipe, target="mlir")
-    @to_ppr
     @merge_ppr_ppm(max_pauli_size=1)
+    @to_ppr
     @qml.qnode(qml.device("null.qubit", wires=2))
     def cir_merge_ppr_ppm_max_pauli_size():
         qml.CNOT([0, 2])
@@ -182,14 +182,14 @@ def test_ppr_to_ppm():
     @qjit(pipelines=pipe, target="mlir")
     def circuit_ppr_to_ppm():
 
-        @to_ppr
         @ppr_to_ppm
+        @to_ppr
         @qml.qnode(device)
         def cir_default():
             qml.S(0)
 
-        @to_ppr
         @ppr_to_ppm(decompose_method="clifford-corrected", avoid_y_measure=True)
+        @to_ppr
         @qml.qnode(device)
         def cir_inject_magic_state():
             qml.T(0)

frontend/test/pytest/test_peephole_optimizations.py

@@ -173,8 +173,8 @@ def test_chained_passes():
     """
 
     @qjit()
-    @cancel_inverses
     @merge_rotations
+    @cancel_inverses
     @qml.qnode(qml.device("lightning.qubit", wires=2))
     def test_chained_apply_passes_workflow(x: float):
         qml.Hadamard(wires=[1])
@@ -217,8 +217,8 @@ def test_commute_ppr():
     @qjit(pipelines=pipe, target="mlir")
     def test_commute_ppr_workflow():
 
-        @to_ppr
         @commute_ppr
+        @to_ppr
         @qml.qnode(qml.device("lightning.qubit", wires=2))
         def f():
             qml.H(0)
@@ -243,8 +243,8 @@ def test_merge_ppr_ppm():
     @qjit(pipelines=pipe, target="mlir")
     def test_merge_ppr_ppm_workflow():
 
-        @to_ppr
         @merge_ppr_ppm
+        @to_ppr
         @qml.qnode(qml.device("lightning.qubit", wires=2))
         def f():
             qml.H(0)
@@ -268,8 +268,8 @@ def test_ppr_to_ppm():
     @qjit(pipelines=pipe, target="mlir")
     def test_ppr_to_ppm_workflow():
 
-        @to_ppr
         @ppr_to_ppm
+        @to_ppr
         @qml.qnode(qml.device("lightning.qubit", wires=2))
         def f():
             qml.H(0)
@@ -303,8 +303,8 @@ def test_ppr_to_ppm_inject_magic_state():
     @qjit(pipelines=pipe, target="mlir")
     def test_ppr_to_ppm_workflow():
 
-        @to_ppr
         @ppr_to_ppm(decompose_method="clifford-corrected", avoid_y_measure=True)
+        @to_ppr
         @qml.qnode(qml.device("lightning.qubit", wires=2))
         def f():
             qml.H(0)
@@ -336,18 +336,18 @@ def test_convert_clifford_to_ppr_workflow():
 
         device = qml.device("lightning.qubit", wires=2)
 
-        @to_ppr
-        @commute_ppr(max_pauli_size=2)
         @merge_ppr_ppm
+        @commute_ppr(max_pauli_size=2)
+        @to_ppr
         @qml.qnode(device)
         def f():
             qml.CNOT([0, 2])
             qml.T(0)
             return measure(0), measure(1)
 
-        @to_ppr
-        @commute_ppr
         @merge_ppr_ppm(max_pauli_size=1)
+        @commute_ppr
+        @to_ppr
         @qml.qnode(device)
         def g():
             qml.CNOT([0, 2])

frontend/test/pytest/test_quantum_control.py

@@ -850,17 +850,22 @@ def test_flatten_unflatten(self):
         control_wires = qml.wires.Wires((1, 2))
         control_values = (False, False)  # (0, 0)
         work_wires = qml.wires.Wires(3)
+        # A work_wire_type will be kept until dynamic qubit allocation is supported in PL
+        # Default value is "dirty"
+        # https://github.com/PennyLaneAI/pennylane/pull/7612
+        work_wire_type = "dirty"
 
         op = C_ctrl(target, control_wires, control_values=control_values, work_wires=work_wires)
 
         data, metadata = op._flatten()
         assert data[0] is target
         assert len(data) == 1
 
-        assert len(metadata) == 3
+        assert len(metadata) == 4
         assert metadata[0] == control_wires
         assert metadata[1] == control_values
         assert metadata[2] == work_wires
+        assert metadata[3] == work_wire_type
 
         assert hash(metadata)