adding tests

pennylane/ops/op_math/adjoint.py

@@ -241,7 +241,7 @@ def wrapper(*args, **kwargs):
         for arg in args:
             remove_from_queue_args_and_kwargs(arg)
 
-        for key, value in kwargs.items():
+        for value in kwargs.values():
             remove_from_queue_args_and_kwargs(value)
 
         if lazy:

pennylane/ops/op_math/condition.py

@@ -25,7 +25,6 @@
 from pennylane.compiler import compiler
 from pennylane.measurements import MeasurementValue
 from pennylane.operation import AnyWires, Operation, Operator
-from pennylane.ops.op_math.controlled import remove_from_queue_args_and_kwargs
 from pennylane.ops.op_math.symbolicop import SymbolicOp
 from pennylane.tape import make_qscript
 
@@ -624,12 +623,6 @@ def wrapper(*args, **kwargs):
             # 1. Apply true_fn conditionally
             qscript = make_qscript(true_fn)(*args, **kwargs)
 
-            for arg in args:
-                remove_from_queue_args_and_kwargs(arg)
-
-            for key, value in kwargs.items():
-                remove_from_queue_args_and_kwargs(value)
-
             if qscript.measurements:
                 raise ConditionalTransformError(with_meas_err)
 

pennylane/ops/op_math/controlled.py

@@ -205,7 +205,7 @@ def remove_from_queue_args_and_kwargs(item):
         for elem in item:
             remove_from_queue_args_and_kwargs(elem)
     elif isinstance(item, dict):
-        for key, value in item.items():
+        for value in item.values():
             remove_from_queue_args_and_kwargs(value)
     elif isinstance(item, Operator):
         qml.queuing.QueuingManager.remove(item)
@@ -219,7 +219,7 @@ def wrapper(*args, **kwargs):
         for arg in args:
             remove_from_queue_args_and_kwargs(arg)
 
-        for key, value in kwargs.items():
+        for value in kwargs.values():
             remove_from_queue_args_and_kwargs(value)
 
         # flip control_values == 0 wires here, so we don't have to do it for each individual op.

pennylane/ops/op_math/prod.py

@@ -113,12 +113,6 @@ def prod(*ops, id=None, lazy=True):
         def wrapper(*args, **kwargs):
             qs = qml.tape.make_qscript(fn)(*args, **kwargs)
 
-            for arg in args:
-                remove_from_queue_args_and_kwargs(arg)
-
-            for key, value in kwargs.items():
-                remove_from_queue_args_and_kwargs(value)
-
             if len(qs.operations) == 1:
                 if qml.QueuingManager.recording():
                     qml.apply(qs[0])

tests/ops/op_math/test_adjoint.py

@@ -868,6 +868,21 @@ def test_single_op_defined_outside_queue_eager(self):
         assert len(q) == 1
         assert q.queue[0] is out
 
+    def test_correct_queued_operators(self):
+        """Test that args and kwargs do not add operators to the queue."""
+
+        dev = qml.device("default.qubit")
+
+        @qml.qnode(dev)
+        def circuit():
+            qml.adjoint(qml.QSVT)(qml.X(1), [qml.Z(1)])
+            qml.adjoint(qml.QSVT(qml.X(1), [qml.Z(1)]))
+            return qml.state()
+
+        circuit()
+        for op in circuit.tape.operations:
+            assert op.name == "Adjoint(QSVT)"
+
     @pytest.mark.usefixtures("use_legacy_opmath")
     def test_single_observable(self):
         """Test passing a single preconstructed observable in a queuing context."""

tests/ops/op_math/test_controlled.py

@@ -1899,6 +1899,21 @@ def test_nested_pauli_x_based_ctrl_ops(self):
         expected = qml.MultiControlledX(wires=[3, 2, 1, 0], control_values=[1, 0, 1])
         assert op == expected
 
+    def test_correct_queued_operators(self):
+        """Test that args and kwargs do not add operators to the queue."""
+
+        dev = qml.device("default.qubit")
+
+        @qml.qnode(dev)
+        def circuit():
+            qml.ctrl(qml.QSVT, control=0)(qml.X(1), [qml.Z(1)])
+            qml.ctrl(qml.QSVT(qml.X(1), [qml.Z(1)]), control=0)
+            return qml.state()
+
+        circuit()
+        for op in circuit.tape.operations:
+            assert op.name == "C(QSVT)"
+
 
 class _Rot(Operation):
     """A rotation operation that is not an instance of Rot

tests/ops/op_math/test_prod.py

@@ -1425,6 +1425,21 @@ def test_nonlazy_mode_queueing(self):
         assert len(q) == 1
         assert q.queue[0] is prod2
 
+    def test_correct_queued_operators(self):
+        """Test that args and kwargs do not add operators to the queue."""
+
+        dev = qml.device("default.qubit")
+
+        @qml.qnode(dev)
+        def circuit():
+            qml.prod(qml.QSVT)(qml.X(1), [qml.Z(1)])
+            qml.prod(qml.QSVT(qml.X(1), [qml.Z(1)]))
+            return qml.state()
+
+        circuit()
+        for op in circuit.tape.operations:
+            assert op.name == "QSVT"
+
 
 class TestIntegration:
     """Integration tests for the Prod class."""