Merge pull request #237 from sadderdate/haise/dev

add strict order bewteen calibration and measz

Author: tencentqlab

tensorcircuit/circuit.py

@@ -67,6 +67,7 @@ def __init__(
         self.calibrations = []
         self.calibration_invokes = []
         self.measz_invokes = []
+        self._event_seq = 0
 
         self.inputs = inputs
         self.mps_inputs = mps_inputs
@@ -136,18 +137,24 @@ def add_calibration(
         self.calibration_invokes.append({
             "name": builder.name,
             "parameters": parameters,
-            "pos": len(self._qir)
+            "pos": len(self._qir),
+            "seq": self._record_event()
         })
 
     def measz(self, *index: int) -> None:
         self.disable_openqasm()
         self.measz_invokes.append({
             "name": "measz",
             "index": index,
-            "pos": len(self._qir)
+            "pos": len(self._qir),
+            "seq": self._record_event()
         })
         return
 
+    def _record_event(self):
+        seq = self._event_seq
+        self._event_seq += 1
+        return seq
 
     def to_tqasm(self, pragma: Optional[str]= None) -> str:
         qasm_lines = []
@@ -186,17 +193,27 @@ def to_tqasm(self, pragma: Optional[str]= None) -> str:
             pos = m.get("pos", len(self._qir))
             measz_by_pos[pos].append(m)
 
-        # 交错输出：在第 i 个门之前输出所有 pos == i 的校准
-        for i, gate in enumerate(self._qir):
-            for m in measz_by_pos.get(i, []):
-                targets = ", ".join(f"q[{idx}]" for idx in m["index"])
-                qasm_lines.append(f"MEASZ {targets};")
+        events_by_pos = defaultdict(list)
 
-            for cal in cals_by_pos.get(i, []):
-                # print(cal)
-                pname = ", ".join(f"q[{x}]" for x in cal.get("parameters", []))
-                qasm_lines.append(f"{cal['name']} {pname};")
+        for pos, items in cals_by_pos.items():
+            for cal in items:
+                events_by_pos[pos].append(("cal", cal))
 
+        for pos, items in measz_by_pos.items():
+            for m in items:
+                events_by_pos[pos].append(("measz", m))
+
+        # 交错输出：在第 i 个门之前输出所有 pos == i 的校准
+        for i, gate in enumerate(self._qir):
+            events = sorted(events_by_pos.get(i, []), key=lambda item: item[1]["seq"])
+            for event_type, event in events:
+                if event_type == "measz":
+                    targets = ", ".join(f"q[{idx}]" for idx in event["index"])
+                    qasm_lines.append(f"MEASZ {targets};")
+                elif event_type == "cal":
+                    pname = ", ".join(f"q[{x}]" for x in event.get("parameters", []))
+                    qasm_lines.append(f"{event['name']} {pname};")
+            
             # print(gate)
             gname = gate["name"]
             gname = gname.upper()

tests/06_test_pulse_measure_mix.py

@@ -0,0 +1,82 @@
+import sys
+import os
+import matplotlib.pyplot as plt
+
+# Add the directory containing your module to Python's search path
+module_path = ".."
+sys.path.insert(0, module_path)
+
+from tensorcircuit import Circuit, Param, gates, waveforms
+from tensorcircuit.cloud.apis import submit_task, get_device, set_provider, set_token, list_devices, list_properties
+import re
+
+# from dotenv import load_dotenv
+# load_dotenv()
+
+shots_const = 1000
+
+print("✅ TEST FILE LOADED")
+set_token(os.getenv("TOKEN"))
+set_provider("tencent")
+ds = list_devices()
+print(ds)
+
+
+def gen_pulse_measure_mix_circuit(t):
+    qc = Circuit(3)
+
+    qc.h(0)
+
+    qc.measz(0)
+
+    param0 = Param("a")
+
+    builder = qc.calibrate("basic_pulse_01", [param0])
+    frame = builder.new_frame("drive_frame", param0)
+    builder.play(frame, waveforms.CosineDrag(t, 0.2, 0.0, 0.0))
+
+    builder.build()
+
+    qc.add_calibration(builder, [1])
+
+    param1 = Param("a")
+    builder1 = qc.calibrate("basic_pulse_02", [param1])
+    frame1 = builder1.new_frame("drive_frame", param1)
+    builder1.play(frame1, waveforms.CosineDrag(115.0, 0.2, 1.0, 0.0))
+    builder1.play(frame1, waveforms.Flattop(115.0, 0.2, 0.0))
+    builder1.play(frame1, waveforms.Sine(115.0, 0.2, 0.1, 0.1, 0.0))
+    builder1.build()
+
+    qc.add_calibration(builder1, [2])
+
+    qc.measz(0)
+
+    qc.cnot(0, 1)
+
+    qc.i(2)
+    qc.x(2)
+    qc.measz(0)
+
+    print(qc.to_tqasm())
+
+    return qc
+
+
+def run_circuit(qc):
+    device_name = "tianji_s2"
+    d = get_device(device_name)
+    t = submit_task(
+        circuit=qc,
+        shots=shots_const,
+        device=d,
+        enable_qos_gate_decomposition=False,
+        enable_qos_qubit_mapping=False,
+    )
+    # print(qc.to_tqasm())
+    # n = qc._nqubits
+    rf = t.results()
+    return rf
+
+qc = gen_pulse_measure_mix_circuit(1.0)
+result = run_circuit(qc)
+print(result)