Merge pull request #46 from CQCL/release/1.10.0

Release/1.10.0

Author: cqc-melf

.github/workflows/issue.yml

@@ -10,21 +10,21 @@ jobs:
     runs-on: ubuntu-22.04
     steps:
     - name: Login
-      uses: atlassian/gajira-login@v3.0.0
+      uses: atlassian/gajira-login@v3.0.1
       env:
         JIRA_BASE_URL: ${{ secrets.JIRA_BASE_URL }}
         JIRA_USER_EMAIL: ${{ secrets.JIRA_USER_EMAIL }}
         JIRA_API_TOKEN: ${{ secrets.JIRA_API_TOKEN }}
     - name: Create Bug
-      uses: atlassian/gajira-create@v3.0.0
+      uses: atlassian/gajira-create@v3.0.1
       if: contains(github.event.issue.labels.*.name, 'bug')
       with:
         project: TKET
         issuetype: Bug
         summary: « [pytket-qiskit] ${{ github.event.issue.title }}»
         description: ${{ github.event.issue.html_url }}
     - name: Create Task
-      uses: atlassian/gajira-create@v3.0.0
+      uses: atlassian/gajira-create@v3.0.1
       if: "! contains(github.event.issue.labels.*.name, 'bug')"
       with:
         project: TKET

_metadata.py

@@ -1,2 +1,2 @@
-__extension_version__ = "0.32.0"
+__extension_version__ = "0.33.0"
 __extension_name__ = "pytket-qiskit"

docs/changelog.rst

@@ -1,6 +1,13 @@
 Changelog
 ~~~~~~~~~
 
+0.33.0 (December 2022)
+----------------------
+
+* Fix handling of parameter when converting ``PauliEvolutionGate`` to
+  ``QubitPauliOperator``.
+* Updated pytket version requirement to 1.10.
+
 0.32.0 (December 2022)
 ----------------------
 

pytket/extensions/qiskit/backends/aer.py

@@ -685,8 +685,8 @@ def _process_model(noise_model: NoiseModel, gate_set: Set[OpType]) -> dict:
 def _sparse_to_zx_tup(
     pauli: QubitPauliString, n_qubits: int
 ) -> Tuple[np.ndarray, np.ndarray]:
-    x = np.zeros(n_qubits, dtype=np.bool8)
-    z = np.zeros(n_qubits, dtype=np.bool8)
+    x = np.zeros(n_qubits, dtype=np.bool_)
+    z = np.zeros(n_qubits, dtype=np.bool_)
     for q, p in pauli.map.items():
         i = _default_q_index(q)
         z[i] = p in (Pauli.Z, Pauli.Y)
@@ -698,7 +698,7 @@ def _qubitpauliop_to_sparsepauliop(
     operator: QubitPauliOperator, n_qubits: int
 ) -> SparsePauliOp:
     n_ops = len(operator._dict)
-    table_array = np.zeros((n_ops, 2 * n_qubits), dtype=np.bool8)
+    table_array = np.zeros((n_ops, 2 * n_qubits), dtype=np.bool_)
     coeffs = np.zeros(n_ops, dtype=np.float64)
 
     for i, (term, coeff) in enumerate(operator._dict.items()):

pytket/extensions/qiskit/qiskit_convert.py

@@ -217,10 +217,12 @@ def _tk_gate_set(backend: "QiskitBackend") -> Set[OpType]:
 
 def _qpo_from_peg(peg: PauliEvolutionGate, qubits: List[Qubit]) -> QubitPauliOperator:
     op = peg.operator
+    t = peg.params[0]
     qpodict = {}
     for p, c in zip(op.paulis, op.coeffs):
         if np.iscomplex(c):
             raise ValueError("Coefficient for Pauli {} is non-real.".format(p))
+        coeff = param_to_tk(t) * c
         qpslist = []
         pstr = p.to_label()
         for a in pstr:
@@ -233,7 +235,7 @@ def _qpo_from_peg(peg: PauliEvolutionGate, qubits: List[Qubit]) -> QubitPauliOpe
             else:
                 assert a == "I"
                 qpslist.append(Pauli.I)
-        qpodict[QubitPauliString(qubits, qpslist)] = c
+        qpodict[QubitPauliString(qubits, qpslist)] = coeff
     return QubitPauliOperator(qpodict)
 
 

setup.py

@@ -44,7 +44,7 @@
     packages=find_namespace_packages(include=["pytket.*"]),
     include_package_data=True,
     install_requires=[
-        "pytket ~= 1.9",
+        "pytket ~= 1.10",
         "qiskit ~= 0.39.0",
         "qiskit_ibm_runtime ~= 0.8.0",
     ],

tests/qiskit_convert_test.py

@@ -26,8 +26,9 @@
     Aer,
     IBMQ,
 )
-from qiskit.opflow import PauliTrotterEvolution  # type: ignore
+from qiskit.opflow import PauliOp, PauliSumOp, PauliTrotterEvolution, Suzuki  # type: ignore
 from qiskit.opflow.primitive_ops import PauliSumOp  # type: ignore
+from qiskit.quantum_info import Pauli  # type: ignore
 from qiskit.transpiler import PassManager  # type: ignore
 from qiskit.circuit.library import RYGate, MCMT  # type: ignore
 from qiskit.circuit import Parameter  # type: ignore
@@ -716,3 +717,15 @@ def test_rebased_conversion() -> None:
     u1 = tket_circzz.get_unitary()
     u2 = tket_circzz2.get_unitary()
     assert compare_unitaries(u1, u2)
+
+
+# https://github.com/CQCL/pytket-qiskit/issues/24
+def test_parametrized_evolution() -> None:
+    pauli_blocks = [PauliOp(Pauli("XXZ"), coeff=1.0), PauliOp(Pauli("YXY"), coeff=0.5)]
+    operator: PauliSumOp = sum(pauli_blocks) * Parameter("x")
+    evolved_circ_op = PauliTrotterEvolution(
+        trotter_mode=Suzuki(reps=2, order=4)
+    ).convert(operator.exp_i())
+    qc: QuantumCircuit = evolved_circ_op.primitive
+    tk_qc: Circuit = qiskit_to_tk(qc)
+    assert len(tk_qc.free_symbols()) == 1