revise some bugs.

Author: tencentqlab

tensorcircuit/cloud/tencent.py

@@ -44,7 +44,8 @@ def map_qubits(self, chip_addrs: Optional[List[int]], user_addrs: List[int] = No
 
         self._used_chip_qubits = chip_addrs
         self._used_user_qubits = user_addrs
-        self._used_user_pairs = [e for e in self._qubit_pairs if e[0] in chip_addrs and e[1] in user_addrs]
+        inherited_pairs = [e for e in self._qubit_pairs if e[0] in chip_addrs and e[1] in chip_addrs]
+        self._used_user_pairs = [(user_addrs[chip_addrs.index(e[0])], user_addrs[chip_addrs.index(e[1])]) for e in inherited_pairs]
 
     def map_qubit(self, chip_addr: int, user_addr: int) -> None:
         if chip_addr not in self._qubits:
@@ -59,16 +60,15 @@ def map_qubit(self, chip_addr: int, user_addr: int) -> None:
         return
 
     def pair_qubit(self, user_addr1: int, user_addr2: int, dual: bool = True, add_remove: bool = True) -> None:
-        original_pair = (user_addr1, user_addr2)
-        
         def update_pairs(user_addr1: int, user_addr2: int, add_remove: bool = True):
+            original_pair = (user_addr1, user_addr2)
             if add_remove:
                 if original_pair in getattr(self, "_used_user_pairs", []):
                     return
-                self._qubit_mapping = getattr(self, "_used_user_pairs", []) + [original_pair]
+                self._used_user_pairs = getattr(self, "_used_user_pairs", []) + [original_pair]
             else:
                 try:
-                    self._qubit_mapping = getattr(self, "_used_user_pairs", []) - [original_pair]
+                    self._used_user_pairs = getattr(self, "_used_user_pairs", []) - [original_pair]
                 except ValueError:
                     raise ValueError(f"Qubit pair {user_addr1}-{user_addr2} does not exist to remove")
         update_pairs(user_addr1, user_addr2, add_remove)

tests/04_test_custom_chip.py

@@ -40,16 +40,18 @@ def run_circuit(qc):
 # 以下是两种映射方式
     tp = Topology(d)
     # tp.map_qubits([6,3,4,1])
-    # tp.map_qubits([6,3,4,1], [3,2,1,0])
+    tp.map_qubits([6,3,4,1], [3,2,1,0])
 
-    tp.map_qubit(0, 6)
-    tp.map_qubit(1, 3)
-    tp.map_qubit(2, 4)
-    tp.map_qubit(3, 1)
+    # tp.map_qubit(6, 0)
+    # tp.map_qubit(3, 1)
+    # tp.map_qubit(4, 2)
+    # tp.map_qubit(1, 3)
 
-    tp.pair_qubit(0, 1)
-    tp.pair_qubit(0, 2)
-    tp.pair_qubit(1, 3)
+    # tp.pair_qubit(0, 1)
+    # tp.pair_qubit(0, 2)
+    # tp.pair_qubit(1, 3)
+    pragma = tp.pragma()
+    print(qc.to_tqasm(pragma=pragma))
     t = submit_task(
         circuit=qc,
         shots=shots_const,