modify test with up-to-date change

Author: zkysfls

.github/workflows/functional_tests.yaml

@@ -14,7 +14,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: ["3.8", "3.9", "3.10", "3.11", "3.12"]
+        python-version: ["3.9", "3.10", "3.11", "3.12"]
 
     steps:
     - uses: actions/checkout@v3

.gitignore

@@ -345,3 +345,6 @@ max-acc-valid.pt
 model.pt
 .cursor/rules/*.mdc
 
+.cursorignore
+.cursor/
+.github/copilot-instructions.md

requirements.txt

@@ -8,10 +8,10 @@ opt_einsum
 pathos>=0.2.7
 pylatexenc>=2.10
 pyscf>=2.0.1
-qiskit>=0.39.0,<1.0.0
+qiskit==1.4.3
 recommonmark
-qiskit_ibm_runtime==0.20.0
-qiskit-aer==0.13.3
+qiskit_ibm_runtime
+qiskit-aer
 
 scipy>=1.5.2
 setuptools>=52.0.0
@@ -21,4 +21,4 @@ torchdiffeq>=0.2.3
 torchpack>=0.3.0
 torchquantum>=0.1
 torchvision>=0.9.0.dev20210130
-tqdm>=4.56.0
+tqdm>=4.56.0

test/layers/test_nlocal.py

@@ -17,7 +17,7 @@ def compare_tq_to_qiskit(tq_circuit, qiskit_circuit, instance_info=""):
     for bit in qiskit_circuit.decompose():
         wires = []
         for qu in bit.qubits:
-            wires.append(qu.index)
+            wires.append(qu._index)
         qiskit_ops.append(
             {
                 "name": bit.operation.name,

test/layers/test_rotgate.py

@@ -1,6 +1,7 @@
 import torchquantum as tq
 import qiskit
-from qiskit import Aer, execute
+from qiskit_aer import Aer
+from qiskit import transpile
 
 from torchquantum.util import (
     switch_little_big_endian_matrix,
@@ -36,7 +37,8 @@ def test_rotgates():
 
                 # get the unitary from qiskit
                 backend = Aer.get_backend("unitary_simulator")
-                result = execute(qiskit_circuit, backend).result()
+                qiskit_circuit = transpile(qiskit_circuit, backend)
+                result = backend.run(qiskit_circuit).result()
                 unitary_qiskit = result.get_unitary(qiskit_circuit)
 
                 # create tq circuit

test/measurement/test_eval_observable.py

@@ -25,7 +25,7 @@
 from qiskit import QuantumCircuit
 import numpy as np
 import random
-from qiskit.opflow import StateFn, X, Y, Z, I
+from qiskit.quantum_info import Statevector, SparsePauliOp
 
 import torchquantum as tq
 
@@ -35,14 +35,6 @@
 
 import torch
 
-pauli_str_op_dict = {
-    "X": X,
-    "Y": Y,
-    "Z": Z,
-    "I": I,
-}
-
-
 def test_expval_observable():
     # seed = 0
     # random.seed(seed)
@@ -63,18 +55,21 @@ def test_expval_observable():
         )[0].item()
 
         qiskit_circ = op_history2qiskit(qdev.n_wires, qdev.op_history)
-        operator = pauli_str_op_dict[obs[0]]
-        for ob in obs[1:]:
-            # note here the order is reversed because qiskit is in little endian
-            operator = pauli_str_op_dict[ob] ^ operator
-        psi = StateFn(qiskit_circ)
-        psi_evaled = psi.eval()._primitive._data
+
+        # opflow was little-endian, SparsePauliOp is also little-endian.
+        # TorchQuantum is big-endian.
+        # So we need to reverse the observable string for qiskit.
+        qiskit_observable_str = "".join(reversed(obs))
+        operator = SparsePauliOp(qiskit_observable_str)
+
+        psi = Statevector.from_instruction(qiskit_circ)
+        psi_evaled = psi.data
         state_tq = switch_little_big_endian_state(
             qdev.get_states_1d().detach().numpy()
         )[0]
         assert np.allclose(psi_evaled, state_tq, atol=1e-5)
 
-        expval_qiskit = (~psi @ operator @ psi).eval().real
+        expval_qiskit = psi.expectation_value(operator).real
         # print(expval_tq, expval_qiskit)
         assert np.isclose(expval_tq, expval_qiskit, atol=1e-5)
         if (
@@ -91,35 +86,35 @@ def util0():
 
     qc.x(0)
 
-    operator = Z ^ I
-    psi = StateFn(qc)
-    expectation_value = (~psi @ operator @ psi).eval()
+    operator = SparsePauliOp("ZI")
+    psi = Statevector(qc)
+    expectation_value = psi.expectation_value(operator)
     print(expectation_value.real)
     # result: 1.0, means measurement result is 0, so Z is on qubit 1
 
-    operator = I ^ Z
-    psi = StateFn(qc)
-    expectation_value = (~psi @ operator @ psi).eval()
+    operator = SparsePauliOp("IZ")
+    psi = Statevector(qc)
+    expectation_value = psi.expectation_value(operator)
     print(expectation_value.real)
     # result: -1.0 means measurement result is 1, so Z is on qubit 0
 
-    operator = I ^ I
-    psi = StateFn(qc)
-    expectation_value = (~psi @ operator @ psi).eval()
+    operator = SparsePauliOp("II")
+    psi = Statevector(qc)
+    expectation_value = psi.expectation_value(operator)
     print(expectation_value.real)
 
-    operator = Z ^ Z
-    psi = StateFn(qc)
-    expectation_value = (~psi @ operator @ psi).eval()
+    operator = SparsePauliOp("ZZ")
+    psi = Statevector(qc)
+    expectation_value = psi.expectation_value(operator)
     print(expectation_value.real)
 
     qc = QuantumCircuit(3)
 
     qc.x(0)
 
-    operator = I ^ I ^ Z
-    psi = StateFn(qc)
-    expectation_value = (~psi @ operator @ psi).eval()
+    operator = SparsePauliOp("ZII")
+    psi = Statevector(qc)
+    expectation_value = psi.expectation_value(operator)
     print(expectation_value.real)
 
 

test/measurement/test_measure.py

@@ -25,7 +25,8 @@
 import torchquantum as tq
 
 from torchquantum.plugin import op_history2qiskit
-from qiskit import Aer, transpile
+from qiskit_aer import Aer
+from qiskit import transpile
 import numpy as np
 
 

test/plugin/test_qiskit_plugins.py

@@ -25,7 +25,7 @@
 from qiskit import QuantumCircuit
 import numpy as np
 import random
-from qiskit.opflow import StateFn, X, Y, Z, I
+from qiskit.quantum_info import Statevector, SparsePauliOp
 
 import torchquantum as tq
 
@@ -35,13 +35,6 @@
 import torch
 import pytest
 
-pauli_str_op_dict = {
-    "X": X,
-    "Y": Y,
-    "Z": Z,
-    "I": I,
-}
-
 @pytest.mark.skip
 def test_expval_observable():
     # seed = 0
@@ -63,18 +56,16 @@ def test_expval_observable():
             [qiskit_circ], "".join(obs), parallel=False
         )
 
-        operator = pauli_str_op_dict[obs[0]]
-        for ob in obs[1:]:
-            # note here the order is reversed because qiskit is in little endian
-            operator = pauli_str_op_dict[ob] ^ operator
-        psi = StateFn(qiskit_circ)
-        psi_evaled = psi.eval()._primitive._data
+        qiskit_observable_str = "".join(reversed(obs))
+        operator = SparsePauliOp(qiskit_observable_str)
+        psi = Statevector.from_instruction(qiskit_circ)
+        psi_evaled = psi.data
         state_tq = switch_little_big_endian_state(
             qdev.get_states_1d().detach().numpy()
         )[0]
         assert np.allclose(psi_evaled, state_tq, atol=1e-5)
 
-        expval_qiskit = (~psi @ operator @ psi).eval().real
+        expval_qiskit = psi.expectation_value(operator).real
         # print(expval_qiskit_processor, expval_qiskit)
         if (
             n_wires <= 3

torchquantum/plugin/qiskit/qiskit_processor.py

@@ -35,8 +35,9 @@
 # Removed: from .my_job_monitor import my_job_monitor as job_monitor
 # Removed: from qiskit.providers.ibmq import IBMQ
 from qiskit_ibm_runtime import QiskitRuntimeService # Changed provider to runtime
-from qiskit_aer.primitives import SamplerV2 as AerSamplerV2 # Added
-from qiskit_ibm_runtime import SamplerV2 as RuntimeSamplerV2 # Changed provider to runtime
+# from qiskit_aer.primitives import SamplerV2 as AerSamplerV2 # Added
+from qiskit_aer.primitives import Sampler as AerSampler
+from qiskit_ibm_runtime import SamplerV2 as RuntimeSampler # Changed provider to runtime
 from qiskit.primitives.containers import PubResult # Added
 from qiskit.exceptions import QiskitError
 from .qiskit_plugin import (
@@ -183,8 +184,8 @@ def qiskit_init(self):
             try:
                 self.service = QiskitRuntimeService(token=self.ibm_quantum_token, channel='ibm_quantum')
                 self.backend = self.service.backend(self.backend_name)
-                self.sampler = RuntimeSamplerV2(mode=self.backend)
-                logger.info(f"Initialized QiskitRuntimeService and RuntimeSamplerV2 for backend: {self.backend_name}")
+                self.sampler = RuntimeSampler(mode=self.backend)
+                logger.info(f"Initialized QiskitRuntimeService and RuntimeSampler for backend: {self.backend_name}")
             except Exception as e:
                 logger.error(f"Failed to initialize QiskitRuntimeService or get backend: {e}")
                 raise
@@ -223,8 +224,8 @@ def qiskit_init(self):
             # Configure backend options for the sampler
             backend_opts = {"noise_model": self.noise_model} if self.noise_model else {}
             # Initialize Sampler with options
-            self.sampler = AerSamplerV2(options={"backend_options": backend_opts}, seed=self.seed_simulator)
-            logger.info(f"Initialized AerSamplerV2.{' With noise model.' if self.noise_model else ''}")
+            self.sampler = AerSampler(options={"backend_options": backend_opts}, seed=self.seed_simulator)
+            logger.info(f"Initialized AerSampler.{' With noise model.' if self.noise_model else ''}")
 
     def set_layout(self, layout):
         self.initial_layout = layout
@@ -278,7 +279,7 @@ def process_ready_circs_get_counts(self, circs_all, parallel=True):
 
         # Prepare run options
         run_options = {"shots": self.n_shots}
-        if isinstance(self.sampler, AerSamplerV2):
+        if isinstance(self.sampler, AerSampler):
             # Pass seed to constructor, not run options
             # run_options["seed"] = self.seed_simulator # Incorrect - seed is for constructor
             pass # Seed already set in constructor