Revert "partial fix qiskit 1.4 version"

zkysfls · zkysfls · commit 33396f3eddf7 · 2025-07-31T13:23:24.000-04:00
This reverts commit 267b328. revert back to init state
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -40,7 +40,7 @@ repos:
       rev: 22.12.0
       hooks:
       - id: black
-        language_version: python3.12
+        language_version: python3.8
 
     - repo: https://github.com/PyCQA/flake8
       rev: 6.0.0
diff --git a/torchquantum/plugin/qiskit/__init__.py b/torchquantum/plugin/qiskit/__init__.py
@@ -24,5 +24,6 @@
 
 from .qiskit_macros import *
 from .qiskit_plugin import *
+from .qiskit_pulse import *
 from .qiskit_processor import *
 from .qiskit_unitary_gate import *
diff --git a/torchquantum/plugin/qiskit/qiskit_plugin.py b/torchquantum/plugin/qiskit/qiskit_plugin.py
@@ -27,14 +27,10 @@
 import torchquantum.functional as tqf
 import qiskit.circuit.library.standard_gates as qiskit_gate
 import numpy as np
-import re
 
-import qiskit
 from qiskit import QuantumCircuit, ClassicalRegister
-from qiskit_aer import AerSimulator, UnitarySimulator
-from qiskit import transpile
+from qiskit import Aer, execute
 from qiskit.circuit import Parameter
-from qiskit.circuit.library import UnitaryGate
 from torchpack.utils.logging import logger
 from torchquantum.util import (
     switch_little_big_endian_matrix,
@@ -89,9 +85,7 @@ def qiskit2tq_op_history(circ):
         init_params = (
             list(map(float, gate[0].params)) if len(gate[0].params) > 0 else None
         )
-        print(
-            op_name,
-        )
+        print(op_name,)
 
         if op_name in [
             "h",
@@ -110,12 +104,12 @@ def qiskit2tq_op_history(circ):
         ]:
             ops.append(
                 {
-                    "name": op_name,  # type: ignore
-                    "wires": np.array(wires),
-                    "params": None,
-                    "inverse": False,
-                    "trainable": False,
-                }
+                "name": op_name,  # type: ignore
+                "wires": np.array(wires),
+                "params": None,
+                "inverse": False,
+                "trainable": False,
+            }
             )
         elif op_name in [
             "rx",
@@ -144,13 +138,12 @@ def qiskit2tq_op_history(circ):
         ]:
             ops.append(
                 {
-                    "name": op_name,  # type: ignore
-                    "wires": np.array(wires),
-                    "params": init_params,
-                    "inverse": False,
-                    "trainable": True,
-                }
-            )
+                "name": op_name,  # type: ignore
+                "wires": np.array(wires),
+                "params": init_params,
+                "inverse": False,
+                "trainable": True
+            })
         elif op_name in ["barrier", "measure"]:
             continue
         else:
@@ -213,10 +206,7 @@ def append_parameterized_gate(func, circ, input_idx, params, wires):
         )
     elif func == "u2":
         from qiskit.circuit.library import U2Gate
-
-        circ.append(
-            U2Gate(phi=params[input_idx[0]], lam=params[input_idx[1]]), wires, []
-        )
+        circ.append(U2Gate(phi=params[input_idx[0]], lam=params[input_idx[1]]), wires, [])
         # circ.u2(phi=params[input_idx[0]], lam=params[input_idx[1]], qubit=wires[0])
     elif func == "u3":
         circ.u(
@@ -307,7 +297,6 @@ def append_fixed_gate(circ, func, params, wires, inverse):
         circ.cu1(params, *wires)
     elif func == "u2":
         from qiskit.circuit.library import U2Gate
-
         circ.append(U2Gate(phi=params[0], lam=params[1]), wires, [])
         # circ.u2(*list(params), *wires)
     elif func == "u3":
@@ -546,15 +535,7 @@ def tq2qiskit(
             circ.cu1(module.params[0][0].item(), *module.wires)
         elif module.name == "U2":
             from qiskit.circuit.library import U2Gate
-
-            circ.append(
-                U2Gate(
-                    phi=module.params[0].data.cpu().numpy()[0],
-                    lam=module.params[0].data.cpu().numpy()[0],
-                ),
-                module.wires,
-                [],
-            )
+            circ.append(U2Gate(phi=module.params[0].data.cpu().numpy()[0], lam=module.params[0].data.cpu().numpy()[0]), module.wires, [])
             # circ.u2(*list(module.params[0].data.cpu().numpy()), *module.wires)
         elif module.name == "U3":
             circ.u3(*list(module.params[0].data.cpu().numpy()), *module.wires)
@@ -684,9 +665,11 @@ def op_history2qiskit_expand_params(n_wires, op_history, bsz):
                 param = op["params"][i]
             else:
                 param = None
-
-            append_fixed_gate(circ, op["name"], param, op["wires"], op["inverse"])
-
+            
+            append_fixed_gate(
+                circ, op["name"], param, op["wires"], op["inverse"]
+            )
+            
         circs_all.append(circ)
 
     return circs_all
@@ -779,7 +762,7 @@ def qiskit2tq_Operator(circ: QuantumCircuit):
             raise NotImplementedError(
                 f"{op_name} conversion to tq is currently not supported."
             )
-
+    
     return ops
 
 
diff --git a/torchquantum/plugin/qiskit/qiskit_processor.py b/torchquantum/plugin/qiskit/qiskit_processor.py
@@ -26,10 +26,10 @@
 import torchquantum as tq
 import pathos.multiprocessing as multiprocessing
 import itertools
-import warnings  # Added for handling deprecation warnings
 
-from qiskit import transpile, QuantumCircuit
-from qiskit_aer.noise import NoiseModel
+from qiskit import Aer, execute, IBMQ, transpile, QuantumCircuit
+from qiskit.providers.aer.noise import NoiseModel
+from qiskit.tools.monitor import job_monitor
 from qiskit.exceptions import QiskitError
 from .qiskit_plugin import (
     tq2qiskit,
@@ -38,19 +38,19 @@
 )
 from torchquantum.util import (
     get_expectations_from_counts,
-    # Removed: get_provider (IBMQ specific)
-    # Removed: get_provider_hub_group_project (IBMQ specific)
+    get_provider,
+    get_provider_hub_group_project,
     get_circ_stats,
 )
-from .qiskit_macros import (
-    IBMQ_NAMES,
-)  # Keep for checking names? Or remove? Let's keep for now.
+from .qiskit_macros import IBMQ_NAMES
 from tqdm import tqdm
 from torchpack.utils.logging import logger
 from qiskit.transpiler import PassManager
 import numpy as np
 import datetime
 
+from .my_job_monitor import my_job_monitor
+
 
 class EmptyPassManager(PassManager):
     def run(self, circuits, output_name: str = None, callback=None):
@@ -758,9 +758,9 @@ def process_circs_get_joint_expval(self, circs_all, observable, parallel=True):
         for circ_ in circs_all:
             circ = circ_.copy()
             for k, obs in enumerate(observable):
-                if obs == "X":
+                if obs == 'X':
                     circ.h(k)
-                elif obs == "Y":
+                elif obs == 'Y':
                     circ.z(k)
                     circ.s(k)
                     circ.h(k)
@@ -771,10 +771,8 @@ def process_circs_get_joint_expval(self, circs_all, observable, parallel=True):
 
         mask = np.ones(len(observable), dtype=bool)
         mask[np.array([*observable]) == "I"] = False
-
-        counts = self.process_ready_circs_get_counts(
-            circs_all_diagonalized, parallel=parallel
-        )
+    
+        counts = self.process_ready_circs_get_counts(circs_all_diagonalized, parallel=parallel)
 
         # here we need to switch the little and big endian of distribution bitstrings
         distributions = []
@@ -788,35 +786,31 @@ def process_circs_get_joint_expval(self, circs_all, observable, parallel=True):
             n_eigen_one = 0
             n_eigen_minus_one = 0
             for bitstring, n_count in distri.items():
-                if (
-                    np.dot(list(map(lambda x: eval(x), [*bitstring])), mask).sum() % 2
-                    == 0
-                ):
+                if np.dot(list(map(lambda x: eval(x), [*bitstring])), mask).sum() % 2 == 0:
                     n_eigen_one += n_count
                 else:
                     n_eigen_minus_one += n_count
-
-            expval = (
-                n_eigen_one / self.n_shots + (-1) * n_eigen_minus_one / self.n_shots
-            )
+            
+            expval = n_eigen_one / self.n_shots + (-1) * n_eigen_minus_one / self.n_shots
             expval_all.append(expval)
 
         return expval_all
 
 
-if __name__ == "__main__":
+if __name__ == '__main__':
     import pdb
-
     pdb.set_trace()
     circ = QuantumCircuit(3)
     circ.h(0)
     circ.cx(0, 1)
     circ.cx(1, 2)
     circ.rx(0.1, 0)
 
-    qiskit_processor = QiskitProcessor(use_real_qc=False)
+    qiskit_processor = QiskitProcessor(
+        use_real_qc=False
+    )
 
-    qiskit_processor.process_circs_get_joint_expval([circ], "XII")
+    qiskit_processor.process_circs_get_joint_expval([circ], 'XII')
 
     qdev = tq.QuantumDevice(n_wires=3, bsz=1)
     qdev.h(0)
@@ -825,5 +819,5 @@ def process_circs_get_joint_expval(self, circs_all, observable, parallel=True):
     qdev.rx(0, 0.1)
 
     from torchquantum.measurement import expval_joint_sampling
+    print(expval_joint_sampling(qdev, 'XII', n_shots=8192))
 
-    print(expval_joint_sampling(qdev, "XII", n_shots=8192))
diff --git a/torchquantum/util/utils.py b/torchquantum/util/utils.py
