Update demos to use new opmath

_static/demonstration_assets/barren_gadgets/barren_gadgets.py

@@ -54,7 +54,7 @@ def gadgetize(self, Hamiltonian, target_locality=3):
             # Generating the perturbative part
             for anc_q in range(ancillary_register_size):
                 term = qml.PauliX(previous_total+anc_q) @ qml.PauliX(previous_total+(anc_q+1)%ancillary_register_size)
-                term = qml.operation.Tensor(term, *string.non_identity_obs[
+                term = qml.prod(term, *string.non_identity_obs[
                     (target_locality-2)*anc_q:(target_locality-2)*(anc_q+1)])
                 obs_pert.append(term)
             coeffs_pert += [l * sign_correction * Hamiltonian.coeffs[str_count]] \

demonstrations/barren_gadgets/barren_gadgets.py

@@ -54,7 +54,7 @@ def gadgetize(self, Hamiltonian, target_locality=3):
             # Generating the perturbative part
             for anc_q in range(ancillary_register_size):
                 term = qml.PauliX(previous_total+anc_q) @ qml.PauliX(previous_total+(anc_q+1)%ancillary_register_size)
-                term = qml.operation.Tensor(term, *string.non_identity_obs[
+                term = qml.prod(term, *string.non_identity_obs[
                     (target_locality-2)*anc_q:(target_locality-2)*(anc_q+1)])
                 obs_pert.append(term)
             coeffs_pert += [l * sign_correction * Hamiltonian.coeffs[str_count]] \

demonstrations/braket-parallel-gradients.py

@@ -138,7 +138,7 @@ def circuit(params):
 
     # Measure all qubits to make sure all's good with Braket
     observables = [qml.PauliZ(n_wires - 1)] + [qml.Identity(i) for i in range(n_wires - 1)]
-    return qml.expval(qml.operation.Tensor(*observables))
+    return qml.expval(qml.prod(*observables))
 
 
 ##############################################################################

demonstrations/tutorial_kernel_based_training.py

@@ -172,7 +172,6 @@
 
 import pennylane as qml
 from pennylane.templates import AngleEmbedding, StronglyEntanglingLayers
-from pennylane.operation import Tensor
 
 import matplotlib.pyplot as plt
 

demonstrations/tutorial_liealgebra.py

@@ -101,7 +101,6 @@
 import numpy as np
 import pennylane as qml
 from pennylane import X, Y, Z
-qml.operation.enable_new_opmath()
 
 su2 = [1j * X(0), 1j * Y(0), 1j * Z(0)]
 
@@ -338,8 +337,6 @@
 print(qml.commutator(SZ, SX) == (2j*SY).simplify())
 print(qml.commutator(SY, SZ) == (2j*SX).simplify())
 
-qml.operation.disable_new_opmath()
-
 ##############################################################################
 #
 # Another perspective on the inherent :math:`SU(2)` symmetry of :math:`H_\text{Heis}` is that the expectation 

demonstrations/tutorial_measurement_optimize.py

@@ -572,8 +572,8 @@ def circuit(weights):
 def format_pauli_word(term):
     """Convenience function that nicely formats a PennyLane
     tensor observable as a Pauli word"""
-    if isinstance(term, qml.operation.Tensor):
-        return " ".join([format_pauli_word(t) for t in term.obs])
+    if isinstance(term, qml.ops.Prod):
+        return " ".join([format_pauli_word(t) for t in term])
 
     return f"{term.name[-1]}{term.wires.tolist()[0]}"
 

demonstrations/tutorial_toric_code.py

@@ -171,7 +171,7 @@ class Wire:
 
     sites = [(x0, y), (x0 + 1, y), (x0 + 1, y + 1), (x0, y + 1)]
 
-    op = qml.operation.Tensor(*(qml.PauliZ(mod(s)) for s in sites))
+    op = qml.prod(*(qml.PauliZ(mod(s)) for s in sites))
 
     zgroup_sites.append(sites)
     zgroup_ops.append(op)
@@ -197,7 +197,7 @@ class Wire:
     if x == 2 and y == 1:  # change order for state prep later
         sites = sites[1:] + sites[0:1]
 
-    op = qml.operation.Tensor(*(qml.PauliX(mod(s)) for s in sites))
+    op = qml.prod(*(qml.PauliX(mod(s)) for s in sites))
 
     xgroup_sites.append(sites)
     xgroup_ops.append(op)