Merge remote-tracking branch 'origin/master'

chensgit169 · Nov 23, 2023 · 49ee886 · 49ee886
2 parents 2d310f0 + 524e3e4
commit 49ee886
Show file tree

Hide file tree

Showing 4 changed files with 46 additions and 6 deletions.
diff --git a/quafu/circuits/quantum_circuit.py b/quafu/circuits/quantum_circuit.py
@@ -108,7 +108,7 @@ def gates(self, gates: list):
     # TODO(qtzhuang): add_gates is just a temporary call function to add gate from gate_list
     def add_gates(self, gates: list):
         for gate in gates:
-            self.add_gate(gate)
+            self.add_ins(gate)
 
     def add_gate(self, gate: QuantumGate):
         """

diff --git a/quafu/qfasm/qfasm_parser.py b/quafu/qfasm/qfasm_parser.py
@@ -196,20 +196,30 @@ def handle_gateins(self, gateins: GateInstruction):
                     gate_list.append(gate_classes[gateins.name](*oneargs))
 
         # if op is barrier or reset or measure
-        elif gateins.name in ["reset", "barrier"]:
-            nametoclass = {"reset": Reset, "barrier": Barrier}
+        elif gateins.name == "reset":
             for qarg in gateins.qargs:
                 symnode = self.global_symtab[qarg.name]
                 if isinstance(qarg, Id):
                     qlist = []
                     for i in range(symnode.num):
                         qlist.append(symnode.start + i)
-                    gate_list.append(nametoclass[gateins.name](qlist))
+                    gate_list.append(Reset(qlist))
                 elif isinstance(qarg, IndexedId):
                     gate_list.append(
-                        nametoclass[gateins.name]([symnode.start + qarg.num])
+                        Reset([symnode.start + qarg.num])
                     )
 
+        elif gateins.name == "barrier":
+            qlist = []
+            for qarg in gateins.qargs:
+                symnode = self.global_symtab[qarg.name]
+                if isinstance(qarg, Id):
+                    for i in range(symnode.num):
+                        qlist.append(symnode.start + i)
+                elif isinstance(qarg, IndexedId):
+                    qlist.append(symnode.start + qarg.num)
+            gate_list.append(Barrier(qlist))
+
         # we have check the num of cbit and qbit
         elif gateins.name == "measure":
             bitmap = {}

diff --git a/tests/quafu/algorithms/angle_test.py b/tests/quafu/algorithms/angle_test.py
@@ -25,7 +25,7 @@ def test_build(self):
         qc = QuantumCircuit(num_qubits)
         feature = np.array([[6,-12.5,11.15,7],[8,9.5,-11,-5],[5,0.5,8,-7]])
         for i in range(4):
-            qc.add_gate(qeg.HGate(pos=i))
+            qc.add_ins(qeg.HGate(pos=i))
         for i in range(len(feature)):
             qc.add_gates(AngleEmbedding(features=feature[i], num_qubits=num_qubits,rotation='Y'))
         qc.draw_circuit(width=num_qubits)
diff --git a/tests/quafu/qasm/parser_test.py b/tests/quafu/qasm/parser_test.py
@@ -662,10 +662,40 @@ def test_qubit_barrier_in_definition(self):
         qc = QuantumCircuit(2)
         qc.barrier([0])
         qc.barrier([1])
+        qc.barrier([0, 1])
+        self.compare_cir(cir, qc)
+
+    def test_barrier_single(self):
+        qasm = """
+        qreg q[2];
+        barrier q[0];
+        barrier q[1];
+        barrier q;
+        """
+        cir = qasm_to_quafu(qasm)
+        qc = QuantumCircuit(2)
         qc.barrier([0])
         qc.barrier([1])
+        qc.barrier([0, 1])
         self.compare_cir(cir, qc)
 
+    def test_barrier_mul(self):
+        qasm = """
+        qreg q[2];
+        qreg q2[2];
+        barrier q[0], q[1];
+        barrier q[1], q2[0];
+        barrier q[0], q2;
+        barrier q, q2[0];
+        """
+        cir = qasm_to_quafu(qasm)
+        qc = QuantumCircuit(4)
+        qc.barrier([0,1])
+        qc.barrier([1,2])
+        qc.barrier([0,2,3])
+        qc.barrier([0,1,2])
+        self.compare_cir(cir, qc)
+
     def test_double_call_gate(self):
         qasm = """
             gate test(x, y) a {