quarkcircuit 0.3.4__tar.gz → 0.3.6.dev0__tar.gz

{quarkcircuit-0.3.4 → quarkcircuit-0.3.6.dev0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: quarkcircuit
-Version: 0.3.4
+Version: 0.3.6.dev0
 Summary: Construction, visualization, and transpilation of quantum circuits
 Author-email: Xiaoxiao Xiao <xiaoxx@baqis.ac.cn>
 License-Expression: MIT

{quarkcircuit-0.3.4 → quarkcircuit-0.3.6.dev0}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "quarkcircuit"
-version = "0.3.4"
+version = "0.3.6dev"
 authors = [
   { name="Xiaoxiao Xiao", email="xiaoxx@baqis.ac.cn" }
 ]

{quarkcircuit-0.3.4 → quarkcircuit-0.3.6.dev0}/quark/circuit/backend.py

@@ -142,7 +142,7 @@ class Backend:
         
     def draw(self,show_couplers_fidelity:bool = False, show_qubits_attributes:Literal['T1','T2','fidelity','frequency','']='', 
              show_qubits_index:bool=False,show_couplers_index:bool=False,
-             highlight_nodes:list = [], save_svg_fname: str|None = None):
+             highlight_nodes:list = [], save_svg_fname: str|None = None,edge_fidelity_thres=0.0):
         """Draw the chip layout.
     
         Args:
@@ -174,9 +174,9 @@ class Backend:
         from matplotlib.colors import Normalize,LinearSegmentedColormap
         from matplotlib.cm import ScalarMappable 
 
-
-        edge_fidelity = nx.get_edge_attributes(self.graph, 'fidelity') 
-        node_attributes = nx.get_node_attributes(self.graph,show_qubits_attributes)
+        graph_show = self.edge_filtered_graph(thres=edge_fidelity_thres)
+        edge_fidelity = nx.get_edge_attributes(graph_show, 'fidelity') 
+        node_attributes = nx.get_node_attributes(graph_show,show_qubits_attributes)
         if show_couplers_fidelity:
             if set(list(edge_fidelity.values())) == {0}:
                 print('The two-qubit gate fidelity is N/A now.')
@@ -197,7 +197,7 @@ class Backend:
             edge_cmap = LinearSegmentedColormap.from_list('truncated_blues', plt.get_cmap('Blues')(np.linspace(0.31, 1.0, 1000)))  #plt.get_cmap('Blues')
             edge_colors = [ScalarMappable(norm = edge_norm, cmap = edge_cmap).to_rgba(fidelity) for fidelity in edge_fidelity.values()]
         else:
-            edge_colors = ['#083776' for edge in self.graph.edges()]
+            edge_colors = ['#083776' for edge in graph_show.edges()]
 
         edge_labels = {}
         for k,v in edge_fidelity.items():
@@ -207,11 +207,11 @@ class Backend:
                 fidelity = np.round(v, 3)
             if show_couplers_fidelity is True and is_edge_info_avaliable is True:
                 if show_couplers_index:
-                    edge_labels[k] = self.graph.edges[k].get('index')
+                    edge_labels[k] = graph_show.edges[k].get('index')
                 else:
                     edge_labels[k] = fidelity
             else:
-                edge_labels[k] = self.graph.edges[k].get('index')
+                edge_labels[k] = graph_show.edges[k].get('index')
 
         if show_qubits_attributes != '' and is_node_info_avaliable is True:
             min_attributes = sorted(list(node_attributes.values()))[0]
@@ -221,12 +221,12 @@ class Backend:
             node_colors = [ScalarMappable(norm = node_norm, cmap = node_cmap).to_rgba(attribute) for attribute in node_attributes.values()]
             if show_qubits_attributes == 'fidelity':
                 if show_qubits_index:
-                    node_labels = {node:node for node in self.graph.nodes()} 
+                    node_labels = {node:node for node in graph_show.nodes()} 
                 else:
                     node_labels =  {node: np.round(attr, 3) for node, attr in node_attributes.items()} # 保留三位有效数字
             else:
                 if show_qubits_index:
-                    node_labels = {node:node for node in self.graph.nodes()} 
+                    node_labels = {node:node for node in graph_show.nodes()} 
                 else:    
                     node_labels =  {node: np.round(attr, 2) for node, attr in node_attributes.items()}  # 保留两位有效数字
             node_font_size = 8 
@@ -235,8 +235,8 @@ class Backend:
             else:
                 figsize = (15, 13.5)
         else:
-            node_colors = ['#083776' for node in self.graph.nodes()]
-            node_labels = {node:node for node in self.graph.nodes()}   
+            node_colors = ['#083776' for node in graph_show.nodes()]
+            node_labels = {node:node for node in graph_show.nodes()}   
             node_font_size = 10 
             if show_couplers_fidelity is True and is_edge_info_avaliable is True:
                 figsize = (15, 13.5)
@@ -248,7 +248,7 @@ class Backend:
                 highlight_nodes = list(set(e for sub in highlight_nodes for e in sub))
             node_colors_update = []
             node_labels_update = {}
-            for idx, node in enumerate(self.graph.nodes()):
+            for idx, node in enumerate(graph_show.nodes()):
                 if node in highlight_nodes:
                     node_colors_update.append(node_colors[idx])
                     node_labels_update[node] = node_labels[node]
@@ -258,10 +258,10 @@ class Backend:
             node_colors = node_colors_update
             node_labels = node_labels_update
 
-            subgraph = self.graph.subgraph(highlight_nodes)
+            subgraph = graph_show.subgraph(highlight_nodes)
             edge_colors_update = []
             edge_labels_update = {}
-            for idx, edge in enumerate(self.graph.edges()):
+            for idx, edge in enumerate(graph_show.edges()):
                 if edge in subgraph.edges():
                     edge_colors_update.append(edge_colors[idx])
                     edge_labels_update[edge] = edge_labels[edge]
@@ -272,10 +272,10 @@ class Backend:
             edge_labels = edge_labels_update
 
         fig, ax = plt.subplots(figsize=figsize) #facecolor='none'
-        pos = nx.get_node_attributes(self.graph, 'coordinate') 
-        nx.draw(self.graph, pos,ax=ax, with_labels=False, node_color=node_colors, node_size=800, edgecolors='white',edge_color = edge_colors ,width = 18,) 
-        nx.draw_networkx_labels(self.graph,pos,labels=node_labels,font_size=node_font_size, font_color='white')
-        nx.draw_networkx_edge_labels(self.graph, pos, edge_labels=edge_labels,font_size=8, font_color='white',bbox=dict(facecolor='none', edgecolor='none'),rotate=False)
+        pos = nx.get_node_attributes(graph_show, 'coordinate') 
+        nx.draw(graph_show, pos,ax=ax, with_labels=False, node_color=node_colors, node_size=800, edgecolors='white',edge_color = edge_colors ,width = 18,) 
+        nx.draw_networkx_labels(graph_show,pos,labels=node_labels,font_size=node_font_size, font_color='white')
+        nx.draw_networkx_edge_labels(graph_show, pos, edge_labels=edge_labels,font_size=8, font_color='white',bbox=dict(facecolor='none', edgecolor='none'),rotate=False)
 
         if show_qubits_attributes != '' and is_node_info_avaliable is True:
             if show_qubits_attributes == 'T1':

{quarkcircuit-0.3.4 → quarkcircuit-0.3.6.dev0}/quark/circuit/decompose.py

@@ -121,7 +121,96 @@ def rz2u(theta:float,qubit:int) -> tuple:
     """
     return ('u',0.0,0.0,theta,qubit)
 
-def cx_decompose(control_qubit: int, target_qubit: int,convert_single_qubit_gate_to_u:bool,two_qubit_gate_basis:Literal['cx','cz']) -> list:
+def convert_cx_to_iswap(control_qubit,target_qubit,convert_single_qubit_gate_to_u:bool):
+    gates0 = [
+        ('rz', -1.5707963267948966, control_qubit),
+        ('ry',  1.5707963267948966, control_qubit),
+        ('rz',  1.5707963267948966, control_qubit),
+        ('ry', -1.5707963267948966, target_qubit),
+        ('rz', -1.0094094858814842, target_qubit),
+        ('iswap', control_qubit, target_qubit),
+        ('rz', -1.5707963267948966, control_qubit),
+        ('ry',   3.141592653589793, control_qubit),
+        ('rz',  1.5707963267948966, target_qubit),
+        ('ry', -1.5707963267948966, target_qubit),
+        ('iswap', control_qubit, target_qubit),
+        ('rz',  -3.141592653589793, control_qubit),
+        ('ry', -1.5707963267948966, control_qubit),
+        ('rz', -1.0094094858814842, target_qubit),
+        ('ry', -1.5707963267948966, target_qubit)]
+    
+    new = []
+    if convert_single_qubit_gate_to_u:
+        for gate_info in gates0:
+            if gate_info[0] =='rz':
+                new_gate_info = rz2u(gate_info[1],gate_info[2])
+                new.append(new_gate_info)
+            elif gate_info[0] == 'ry':
+                new_gate_info = ry2u(gate_info[1],gate_info[2])
+                new.append(new_gate_info)
+            else:
+                new.append(gate_info)
+        gates0 = new
+    return gates0
+
+def convert_cz_to_iswap(control_qubit,target_qubit,convert_single_qubit_gate_to_u:bool):
+    gates0 = [
+        ('rz', -1.5707963267948966, control_qubit),
+        ('ry',  1.5707963267948966, control_qubit),
+        ('rz',  1.5707963267948966, control_qubit),
+        ('rz', -1.5707963267948966, target_qubit),
+        ('ry',   3.141592653589793, target_qubit),
+        ('iswap', control_qubit, target_qubit),
+        ('rz', -1.5707963267948966, control_qubit),
+        ('ry',   3.141592653589793, control_qubit),
+        ('rz',  1.5707963267948966, target_qubit),
+        ('ry', -1.5707963267948966, target_qubit),
+        ('iswap', control_qubit, target_qubit),
+        ('ry',  1.5707963267948966, control_qubit),
+        ('rz',  1.5707963267948966, target_qubit)]
+    new = []
+    if convert_single_qubit_gate_to_u:
+        for gate_info in gates0:
+            if gate_info[0] =='rz':
+                new_gate_info = rz2u(gate_info[1],gate_info[2])
+                new.append(new_gate_info)
+            elif gate_info[0] == 'ry':
+                new_gate_info = ry2u(gate_info[1],gate_info[2])
+                new.append(new_gate_info)
+            else:
+                new.append(gate_info)
+        gates0 = new
+    return gates0
+
+def cz_decompose(control_qubit: int, target_qubit: int,convert_single_qubit_gate_to_u:bool,two_qubit_gate_basis:Literal['cx','cz','iswap']) -> list:
+    """ Decompose CZ gate to U3 gates and CZ gates.
+
+    Args:
+        control_qubit (int): The qubit used as control.
+        target_qubit (int): The qubit targeted by the gate.
+
+    Returns:
+        list: A list of U3 gates and CZ gates.
+    """
+    gates = []
+    if two_qubit_gate_basis == 'cz':
+        gates.append(('cz',control_qubit,target_qubit))
+    elif two_qubit_gate_basis == 'cx':
+        if convert_single_qubit_gate_to_u:
+            gates.append(h2u(target_qubit))
+        else:
+            gates.append(('h',target_qubit))
+        gates.append(('cx', control_qubit, target_qubit))
+        if convert_single_qubit_gate_to_u:
+            gates.append(h2u(target_qubit))
+        else:
+            gates.append(('h',target_qubit))
+    elif two_qubit_gate_basis == 'iswap':
+        gates += convert_cz_to_iswap(control_qubit,target_qubit,convert_single_qubit_gate_to_u)
+
+    return gates
+
+def cx_decompose(control_qubit: int, target_qubit: int,convert_single_qubit_gate_to_u:bool,two_qubit_gate_basis:Literal['cx','cz','iswap']) -> list:
     """ Decompose CX gate to U3 gates and CZ gates.
 
     Args:
@@ -144,9 +233,11 @@ def cx_decompose(control_qubit: int, target_qubit: int,convert_single_qubit_gate
             gates.append(('h',target_qubit))
     elif two_qubit_gate_basis == 'cx':
         gates.append(('cx',control_qubit,target_qubit))
+    elif two_qubit_gate_basis == 'iswap':
+        gates += convert_cx_to_iswap(control_qubit,target_qubit,convert_single_qubit_gate_to_u)
     return gates
 
-def cy_decompose(control_qubit: int, target_qubit: int, convert_single_qubit_gate_to_u:bool, two_qubit_gate_basis:Literal['cz','cx']) -> list:
+def cy_decompose(control_qubit: int, target_qubit: int, convert_single_qubit_gate_to_u:bool, two_qubit_gate_basis:Literal['cz','cx','iswap']) -> list:
     """ Decompose CY gate to U3 gates and CZ gates. 
 
     Args:
@@ -167,6 +258,8 @@ def cy_decompose(control_qubit: int, target_qubit: int, convert_single_qubit_gat
         gates += cx_decompose(control_qubit,target_qubit,convert_single_qubit_gate_to_u,two_qubit_gate_basis)
     elif two_qubit_gate_basis == 'cx':
         gates.append(('cx',control_qubit,target_qubit))
+    elif two_qubit_gate_basis =='iswap':
+        gates += convert_cx_to_iswap(control_qubit,target_qubit,convert_single_qubit_gate_to_u)
 
     if convert_single_qubit_gate_to_u:
         gates.append(s2u(target_qubit))
@@ -174,7 +267,7 @@ def cy_decompose(control_qubit: int, target_qubit: int, convert_single_qubit_gat
         gates.append(('s',target_qubit))
     return gates
 
-def swap_decompose(qubit1: int, qubit2: int, convert_single_qubit_gate_to_u:bool, two_qubit_gate_basis:Literal['cz','cx']) -> list:
+def swap_decompose(qubit1: int, qubit2: int, convert_single_qubit_gate_to_u:bool, two_qubit_gate_basis:Literal['cz','cx','iswap']) -> list:
     """Decompose SWAP gate to U3 gates and CZ gates.
 
     Args:
@@ -214,9 +307,17 @@ def swap_decompose(qubit1: int, qubit2: int, convert_single_qubit_gate_to_u:bool
         gates.append(('cx',qubit1,qubit2))
         gates.append(('cx',qubit2,qubit1))
         gates.append(('cx',qubit1,qubit2))
+    elif two_qubit_gate_basis == 'iswap':
+        gates = []
+        gates.append(('iswap',qubit1,qubit2))
+        gates.append(('sx',qubit2))
+        gates.append(('iswap',qubit1,qubit2))
+        gates.append(('sx',qubit1))
+        gates.append(('iswap',qubit1,qubit2))
+        gates.append(('sx',qubit2))
     return gates
 
-def iswap_decompose(qubit1: int, qubit2: int, convert_single_qubit_gate_to_u:bool, two_qubit_gate_basis:Literal['cz','cx']) -> list:
+def iswap_decompose(qubit1: int, qubit2: int, convert_single_qubit_gate_to_u:bool, two_qubit_gate_basis:Literal['cz','cx','iswap']) -> list:
     """ Decompose iswap gate with qiskit decompose algorithm. 
 
     Args:
@@ -227,44 +328,44 @@ def iswap_decompose(qubit1: int, qubit2: int, convert_single_qubit_gate_to_u:boo
         list: A list of U3 gates and CZ gates.
     """
     # iswap = R_{XX+YY}(-pi/2) = e^{i*pi/4*(X\otimesX + Y\otimesY)}
-    gates = []
-    if convert_single_qubit_gate_to_u:
-        gates.append(x2u(qubit1))
-        gates.append(rx2u(np.pi/2,qubit1))
-        gates.append(rx2u(-np.pi/2,qubit2))
-    else:
-        gates.append(('x', qubit1))
-        gates.append(('rx', np.pi/2, qubit1))
-        gates.append(('rx',-np.pi/2, qubit2))
-    
-    if two_qubit_gate_basis == 'cx':
-        gates.append(('cx',  qubit1, qubit2))
-    elif two_qubit_gate_basis == 'cz':
-        gates += cx_decompose(qubit1, qubit2, convert_single_qubit_gate_to_u,two_qubit_gate_basis)
-
-    if convert_single_qubit_gate_to_u:
-        gates.append(rx2u(-np.pi/2,qubit1))
-        gates.append(rz2u(-np.pi/2,qubit2))
-    else:
-        gates.append(('rx',-np.pi/2, qubit1))
-        gates.append(('rz',-np.pi/2, qubit2)) 
-
-    if two_qubit_gate_basis == 'cx':
-        gates.append(('cx',  qubit1, qubit2))
-    elif two_qubit_gate_basis == 'cz':
-        gates += cx_decompose(qubit1, qubit2, convert_single_qubit_gate_to_u,two_qubit_gate_basis)
-    
-    if convert_single_qubit_gate_to_u:
-        gates.append(rx2u(-np.pi/2, qubit1))
-        gates.append(rx2u(np.pi/2, qubit2))
-        gates.append(x2u(qubit1))
+    if two_qubit_gate_basis == 'iswap':
+        gates = []
+        gates.append(('iswap',qubit1,qubit2))
     else:
-        gates.append(('rx',-np.pi/2, qubit1))
-        gates.append(('rx', np.pi/2, qubit2))
-        gates.append(('x', qubit1))
+        gates = []
+        if convert_single_qubit_gate_to_u:
+            gates.append(x2u(qubit1))
+            gates.append(rx2u(np.pi/2,qubit1))
+            gates.append(rx2u(-np.pi/2,qubit2))
+        else:
+            gates.append(('x', qubit1))
+            gates.append(('rx', np.pi/2, qubit1))
+            gates.append(('rx',-np.pi/2, qubit2))
+        if two_qubit_gate_basis == 'cx':
+            gates.append(('cx',  qubit1, qubit2))
+        elif two_qubit_gate_basis == 'cz':
+            gates += cx_decompose(qubit1, qubit2, convert_single_qubit_gate_to_u,two_qubit_gate_basis)
+        if convert_single_qubit_gate_to_u:
+            gates.append(rx2u(-np.pi/2,qubit1))
+            gates.append(rz2u(-np.pi/2,qubit2))
+        else:
+            gates.append(('rx',-np.pi/2, qubit1))
+            gates.append(('rz',-np.pi/2, qubit2)) 
+        if two_qubit_gate_basis == 'cx':
+            gates.append(('cx',  qubit1, qubit2))
+        elif two_qubit_gate_basis == 'cz':
+            gates += cx_decompose(qubit1, qubit2, convert_single_qubit_gate_to_u,two_qubit_gate_basis)
+        if convert_single_qubit_gate_to_u:
+            gates.append(rx2u(-np.pi/2, qubit1))
+            gates.append(rx2u(np.pi/2, qubit2))
+            gates.append(x2u(qubit1))
+        else:
+            gates.append(('rx',-np.pi/2, qubit1))
+            gates.append(('rx', np.pi/2, qubit2))
+            gates.append(('x', qubit1))
     return gates
 
-def rxx_decompose(theta:float,qubit1:int,qubit2:int,convert_single_qubit_gate_to_u:bool, two_qubit_gate_basis:Literal['cz','cx']) -> list:
+def rxx_decompose(theta:float,qubit1:int,qubit2:int,convert_single_qubit_gate_to_u:bool, two_qubit_gate_basis:Literal['cz','cx','iswap']) -> list:
     """Decompose RXX gate to U3 gates and CZ gates.
 
     Args:
@@ -286,6 +387,9 @@ def rxx_decompose(theta:float,qubit1:int,qubit2:int,convert_single_qubit_gate_to
         gates.append(('cx',qubit1,qubit2))
     elif two_qubit_gate_basis == 'cz':        
         gates += cx_decompose(qubit1,qubit2,convert_single_qubit_gate_to_u,two_qubit_gate_basis)
+    elif two_qubit_gate_basis == 'iswap':
+        gates += convert_cx_to_iswap(qubit1,qubit2,convert_single_qubit_gate_to_u)
+
     if convert_single_qubit_gate_to_u:
         gates.append(rz2u(theta,qubit2))
     else:
@@ -294,6 +398,9 @@ def rxx_decompose(theta:float,qubit1:int,qubit2:int,convert_single_qubit_gate_to
         gates.append(('cx',qubit1,qubit2))
     elif two_qubit_gate_basis == 'cz':        
         gates += cx_decompose(qubit1,qubit2,convert_single_qubit_gate_to_u,two_qubit_gate_basis)
+    elif two_qubit_gate_basis == 'iswap':
+        gates += convert_cx_to_iswap(qubit1,qubit2,convert_single_qubit_gate_to_u)
+
     if convert_single_qubit_gate_to_u:  
         gates.append(h2u(qubit1))
         gates.append(h2u(qubit2))
@@ -302,7 +409,7 @@ def rxx_decompose(theta:float,qubit1:int,qubit2:int,convert_single_qubit_gate_to
         gates.append(('h', qubit2))      
     return gates
 
-def ryy_decompose(theta:float, qubit1:int, qubit2:int, convert_single_qubit_gate_to_u:bool, two_qubit_gate_basis:Literal['cz','cx']) -> list:
+def ryy_decompose(theta:float, qubit1:int, qubit2:int, convert_single_qubit_gate_to_u:bool, two_qubit_gate_basis:Literal['cz','cx','iswap']) -> list:
     """Decompose RYY gate to U3 gates and CZ gates.
 
     Args:
@@ -324,6 +431,8 @@ def ryy_decompose(theta:float, qubit1:int, qubit2:int, convert_single_qubit_gate
         gates.append(('cx', qubit1, qubit2))
     elif two_qubit_gate_basis == 'cz':
         gates += cx_decompose(qubit1,qubit2,convert_single_qubit_gate_to_u,two_qubit_gate_basis)
+    elif two_qubit_gate_basis == 'iswap':
+        gates += convert_cx_to_iswap(qubit1,qubit2,convert_single_qubit_gate_to_u)
     if convert_single_qubit_gate_to_u:
         gates.append(rz2u(theta,qubit2))
     else:
@@ -332,6 +441,8 @@ def ryy_decompose(theta:float, qubit1:int, qubit2:int, convert_single_qubit_gate
         gates.append(('cx', qubit1, qubit2))
     elif two_qubit_gate_basis == 'cz':
         gates += cx_decompose(qubit1,qubit2,convert_single_qubit_gate_to_u,two_qubit_gate_basis)
+    elif two_qubit_gate_basis == 'iswap':
+        gates += convert_cx_to_iswap(qubit1,qubit2,convert_single_qubit_gate_to_u)
     if convert_single_qubit_gate_to_u:
         gates.append(rx2u(-np.pi/2,qubit1))
         gates.append(rx2u(-np.pi/2,qubit2))
@@ -340,7 +451,7 @@ def ryy_decompose(theta:float, qubit1:int, qubit2:int, convert_single_qubit_gate
         gates.append(('rx', -np.pi/2, qubit2))    
     return gates
 
-def rzz_decompose(theta:float, qubit1:int, qubit2:int, convert_single_qubit_gate_to_u:bool, two_qubit_gate_basis:Literal['cz','cx']) -> list:
+def rzz_decompose(theta:float, qubit1:int, qubit2:int, convert_single_qubit_gate_to_u:bool, two_qubit_gate_basis:Literal['cz','cx','iswap']) -> list:
     """Decompose RZZ gate to U3 gates and CZ gates.
 
     Args:
@@ -356,6 +467,8 @@ def rzz_decompose(theta:float, qubit1:int, qubit2:int, convert_single_qubit_gate
         gates.append(('cx', qubit1, qubit2))
     elif two_qubit_gate_basis == 'cz':
         gates += cx_decompose(qubit1,qubit2,convert_single_qubit_gate_to_u,two_qubit_gate_basis)
+    elif two_qubit_gate_basis == 'iswap':
+        gates += convert_cx_to_iswap(qubit1,qubit2,convert_single_qubit_gate_to_u)
     if convert_single_qubit_gate_to_u:
         gates.append(rz2u(theta,qubit2))
     else:
@@ -364,10 +477,12 @@ def rzz_decompose(theta:float, qubit1:int, qubit2:int, convert_single_qubit_gate
         gates.append(('cx', qubit1, qubit2))
     elif two_qubit_gate_basis == 'cz':
         gates += cx_decompose(qubit1,qubit2,convert_single_qubit_gate_to_u,two_qubit_gate_basis)  
+    elif two_qubit_gate_basis == 'iswap':
+        gates += convert_cx_to_iswap(qubit1,qubit2,convert_single_qubit_gate_to_u)
     return gates
 
 
-def cp_decompose(theta:float, control_qubit:int, target_qubit:int, convert_single_qubit_gate_to_u:bool) -> list:
+def cp_decompose(theta:float, control_qubit:int, target_qubit:int, convert_single_qubit_gate_to_u:bool,two_qubit_gate_basis:Literal['cz','cx','iswap']) -> list:
     """Decompose CPhase gate to U3 gates and CZ gates. ref: Quantum Sci. Technol. 7 (2022) 025021
 
     Args:
@@ -383,12 +498,18 @@ def cp_decompose(theta:float, control_qubit:int, target_qubit:int, convert_singl
         gates.append(h2u(target_qubit))
     else:
         gates.append(('h',target_qubit))
-    gates.append(('cz', control_qubit, target_qubit))
+
+    #gates.append(('cz', control_qubit, target_qubit))
+    gates += cz_decompose(control_qubit,target_qubit,convert_single_qubit_gate_to_u,two_qubit_gate_basis)
+    
     if convert_single_qubit_gate_to_u:
         gates.append(rx2u(theta/2,target_qubit))
     else:
         gates.append(('rx',theta/2,target_qubit))
-    gates.append(('cz', control_qubit, target_qubit))
+
+    #gates.append(('cz', control_qubit, target_qubit))
+    gates += cz_decompose(control_qubit,target_qubit,convert_single_qubit_gate_to_u,two_qubit_gate_basis)
+
     if convert_single_qubit_gate_to_u:
         gates.append(rz2u(-1*theta/2, control_qubit))
         gates.append(h2u(target_qubit))

{quarkcircuit-0.3.4 → quarkcircuit-0.3.6.dev0}/quark/circuit/layout.py

@@ -349,7 +349,9 @@ class Layout:
                     raise(ValueError(f'The physical qubit {node} in target_qubits does not exit'))
             # check edge fidelity
             is_connected = nx.is_connected(subgraph)
-            for _, fidelity in nx.get_edge_attributes(subgraph,'fidelity').items():
+            if is_connected is False:
+                raise(ValueError(f'The physical qubit layout {target_qubits} constructed from target_qubits is not connected.'))  
+            for _, fidelity in nx.get_edge_attributes(subgraph,'fidelity').items(): # it will be []
                 if fidelity == 0.:
                     is_connected = False
                 if is_connected is False:
@@ -424,7 +426,7 @@ class Layout:
             raise(ValueError('Wrong qubits error!'))
 
     # large qubit layour    
-    def get_one_component(self,thres=0.95):
+    def get_one_component(self,thres=0.90):
         def edge_filter(u,v):
             return self.graph[u][v].get("fidelity") >= thres
         subgraph_view = nx.subgraph_view(self.graph,filter_edge=edge_filter)
@@ -446,12 +448,13 @@ class Layout:
         # self.graph = chip_backend.graph #chip_backend.edge_filtered_graph(thres=0.95)
 
         one_subgraph = self.get_one_component()
+        start_node = np.random.choice(list(one_subgraph.nodes))
 
-        if self.priority_qubits is None:
-            start_node = np.random.choice(list(one_subgraph.nodes))
-        else:
-            priority_qubits_list = list(set(i for sublist in self.priority_qubits for i in sublist))
-            start_node = np.random.choice(priority_qubits_list)
+        # if self.priority_qubits is None:
+        #     start_node = np.random.choice(list(one_subgraph.nodes))
+        # else:
+        #     priority_qubits_list = list(set(i for sublist in self.priority_qubits for i in sublist))
+        #     start_node = np.random.choice(priority_qubits_list)
 
         visited = set([start_node])
         queue = [(start_node, 0)]  

{quarkcircuit-0.3.4 → quarkcircuit-0.3.6.dev0}/quark/circuit/routing.py

@@ -281,7 +281,7 @@ class SabreRouting(TranspilerPass):
             for node in front_layer:
                 for node_successor in self._dag_successors(node):
                     gate = node_successor.split('_')[0]
-                    if gate in two_qubit_gates and len(E) <= 20:
+                    if gate in two_qubit_gates and len(E) <= len(self.v2p):
                         E.update([node_successor])
             self.extended_successor_set = list(E)
         else:

{quarkcircuit-0.3.4 → quarkcircuit-0.3.6.dev0}/quark/circuit/test_transpiler.py

@@ -34,6 +34,8 @@ def call_quark_transpiler(qc:QuantumCircuit|list|str,chip_name:str,compile:bool,
     else:
         chip_backend = Backend(chip_name)
 
+    two_qubit_gate_basis = chip_backend.chip_info['global_info']['two_qubit_gate_basis'].lower()
+
     # 初始化线路,检查线路中的门是否都支持。
     if isinstance(qc, QuantumCircuit):
         quarkQC = qc
@@ -103,21 +105,26 @@ def call_quark_transpiler(qc:QuantumCircuit|list|str,chip_name:str,compile:bool,
             raise(ValueError('More optimize_level is not support now!'))
 
         quarkQC_half_compiled = copy.deepcopy(quarkQC_compiled)
-        quarkQC_half_compiled = TranslateToBasisGates(convert_single_qubit_gate_to_u=False,two_qubit_gate_basis='cx').run(quarkQC_half_compiled)
+        quarkQC_half_compiled = TranslateToBasisGates(convert_single_qubit_gate_to_u=False,two_qubit_gate_basis=two_qubit_gate_basis).run(quarkQC_half_compiled)
         quarkQC_half_compiled = GateCompressor().run(quarkQC_half_compiled) 
 
-        quarkQC_compiled = TranslateToBasisGates(convert_single_qubit_gate_to_u=True,two_qubit_gate_basis='cz').run(quarkQC_compiled)
+        if two_qubit_gate_basis == 'cx':
+            two_qubit_gate_basis = 'cz'
+        quarkQC_compiled = TranslateToBasisGates(convert_single_qubit_gate_to_u=True,two_qubit_gate_basis=two_qubit_gate_basis).run(quarkQC_compiled)
         quarkQC_compiled = GateCompressor().run(quarkQC_compiled) 
     else:
         gates_availale = list(one_qubit_gates_available.keys()) \
             + list(one_qubit_parameter_gates_available.keys()) \
-            + ['cx','cz','barrier','measure','delay'] #chip 支持的语法
+            + ['barrier','measure','delay'] + [two_qubit_gate_basis]#chip 支持的语法
+        if 'cz' in gates_availale:
+            gates_availale.append('cx')
+
         collect_two_qubit_gates = []
         for gate_info in quarkQC.gates:
             gate = gate_info[0]
             if gate not in gates_availale:
                 raise(ValueError(f'The {gate} gate you provided is not supported by the current chip. Please convert to basis gates.'))
-            if gate in ['cx','cz']:
+            if gate in ['cx','cz','iswap']:
                 collect_two_qubit_gates.append(gate_info)
 
         # check qubits existance and fidelity 

{quarkcircuit-0.3.4 → quarkcircuit-0.3.6.dev0}/quark/circuit/translate.py

@@ -30,15 +30,16 @@ from .quantumcircuit_helpers import (one_qubit_gates_available,
                                      )
 from .matrix import gate_matrix_dict
 from .decompose import (cx_decompose,
-                                cy_decompose,
-                                swap_decompose,
-                                iswap_decompose,
-                                rxx_decompose,
-                                ryy_decompose,
-                                rzz_decompose,
-                                cp_decompose,
-                                u3_decompose,
-                                )
+                        cz_decompose,
+                        cy_decompose,
+                        swap_decompose,
+                        iswap_decompose,
+                        rxx_decompose,
+                        ryy_decompose,
+                        rzz_decompose,
+                        cp_decompose,
+                        u3_decompose,
+                        )
 from .basepasses import TranspilerPass
 
 class TranslateToBasisGates(TranspilerPass):
@@ -47,7 +48,7 @@ class TranslateToBasisGates(TranspilerPass):
     Args:
         TranspilerPass (class): The base class that provides the structure for the transpiler pass.
     """
-    def __init__(self,convert_single_qubit_gate_to_u:bool=True, two_qubit_gate_basis: Literal['cz','cx']='cz'):
+    def __init__(self,convert_single_qubit_gate_to_u:bool=True, two_qubit_gate_basis: Literal['cz','cx','iswap']='cz'):
         """Initializes the TranslateToBasisGates class with the specified settings.
 
         Args:
@@ -95,7 +96,8 @@ class TranslateToBasisGates(TranspilerPass):
                     new.append(gate_info)
             elif gate in two_qubit_gates_available.keys():
                 if gate in ['cz']:
-                    new.append(gate_info)
+                    _cz = cz_decompose(gate_info[1],gate_info[2],self.convert_single_qubit_gate_to_u,self.two_qubit_gate_basis)
+                    new += _cz
                 elif gate in ['cx', 'cnot']:
                     _cx = cx_decompose(gate_info[1],gate_info[2],self.convert_single_qubit_gate_to_u,self.two_qubit_gate_basis)
                     new += _cx
@@ -118,7 +120,7 @@ class TranslateToBasisGates(TranspilerPass):
                 elif gate == 'rzz':
                     new += rzz_decompose(*gate_info[1:],self.convert_single_qubit_gate_to_u,self.two_qubit_gate_basis)
                 elif gate == 'cp':
-                    new += cp_decompose(*gate_info[1:],self.convert_single_qubit_gate_to_u)
+                    new += cp_decompose(*gate_info[1:],self.convert_single_qubit_gate_to_u,self.two_qubit_gate_basis)
             elif gate in functional_gates_available.keys():
                 new.append(gate_info)
             else:

{quarkcircuit-0.3.4 → quarkcircuit-0.3.6.dev0}/quark/circuit/transpiler.py

@@ -59,6 +59,7 @@ class Transpiler:
             raise TypeError("Expected a Quark QuantumCircuit or OpenQASM 2.0 or qlisp, but got a {}.".format(type(qc)))
         
         if self.chip_backend is None:
+            print('Warning: No chip specified, defaulting to a linearly connected layout for simulation.')
             import networkx as nx
             subgraph = nx.Graph()
             qubits = list(sorted(qc.qubits))

{quarkcircuit-0.3.4 → quarkcircuit-0.3.6.dev0}/quarkcircuit.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: quarkcircuit
-Version: 0.3.4
+Version: 0.3.6.dev0
 Summary: Construction, visualization, and transpilation of quantum circuits
 Author-email: Xiaoxiao Xiao <xiaoxx@baqis.ac.cn>
 License-Expression: MIT