Auto-merged develop -> beta (No conflicts, CI passed)

Author: TravisCI

packages/pygsti/objects/circuit.py

@@ -250,7 +250,7 @@ def _labels_lines_str(self):
     @str.setter
     def str(self, value):
         """ The Python string representation of this Circuit."""
-        assert(not self._static),"Cannot edit a read-only circuit!"
+        assert(not self._static),"Cannot edit a read-only circuit!  Set editable=True when calling pygsti.obj.Circuit to create editable circuit."
         cparser = _CircuitParser()
         chk,chk_labels = cparser.parse(value)
 
@@ -2258,7 +2258,7 @@ def write_Qcircuit_tex(self, filename): #TODO
         f.write("\end{document}")
         f.close()    
 
-    def convert_to_quil(self, gatename_conversion=None, qubit_conversion=None, readout_conversion=None): #TODO
+    def convert_to_quil(self, gatename_conversion=None, qubit_conversion=None, readout_conversion=None, block_between_layers=True, block_idles=True): #TODO
         """
         Converts this circuit to a quil string.
 
@@ -2341,13 +2341,17 @@ def convert_to_quil(self, gatename_conversion=None, qubit_conversion=None, reado
                 quil_for_gate = gatename_conversion[gate.name]
 
                 #If gate.qubits is None, gate is assumed to be single-qubit gate
-                #acting in parallel on all qubits.
+                #acting in parallel on all qubits.  If the gate is a global idle, then 
+                #Pragma blocks are inserted (for tests like idle tomography) even
+                #if block_between_layers==False.  Set block_idles=False to disable this as well.
                 if gate.qubits is None:
                     if quil_for_gate == 'I':
-                        quil += 'PRAGMA PRESERVE_BLOCK\n'
+                        if block_idles:
+                            quil += 'PRAGMA PRESERVE_BLOCK\n'
                         for q in gate_qubits:
                             quil += quil_for_gate + ' ' + str(qubit_conversion[q]) + '\n'
-                        quil += 'PRAGMA END_PRESERVE_BLOCK\n'
+                        if block_idles:
+                            quil += 'PRAGMA END_PRESERVE_BLOCK\n'
                     else:
                         for q in gate_qubits:
                             quil += quil_for_gate + ' ' + str(qubit_conversion[q]) + '\n'
@@ -2371,9 +2375,14 @@ def convert_to_quil(self, gatename_conversion=None, qubit_conversion=None, reado
                 if q not in qubits_used:
                     quil += 'I' + ' ' + str(qubit_conversion[q]) +'\n'
 
-            # Add in a barrier after every circuit layer. Future: Should make this optional at some
-            # point and/or to agree with the "barriers" in the circuit (to be added).
-            quil += 'PRAGMA PRESERVE_BLOCK\nPRAGMA END_PRESERVE_BLOCK\n'
+            # Add in a barrier after every circuit layer if block_between_layers==True.
+            # Including pragma blocks are critical for QCVV testing, as circuits should usually
+            # experience minimal "behind-the-scenes" compilation (beyond necessary 
+            # conversion to native instructions)
+            # To do: Add "barrier" as native pygsti circuit instruction, and use for indicating 
+            # where pragma blocks should be.
+            if block_between_layers:
+                quil += 'PRAGMA PRESERVE_BLOCK\nPRAGMA END_PRESERVE_BLOCK\n'
 
         # Add in a measurement at the end.
         if readout_conversion==None:
@@ -2387,7 +2396,7 @@ def convert_to_quil(self, gatename_conversion=None, qubit_conversion=None, reado
 
         return quil  
 
-    def convert_to_openqasm(self, gatename_conversion=None, qubit_conversion=None): #TODO
+    def convert_to_openqasm(self, gatename_conversion=None, qubit_conversion=None, block_between_layers=True): #TODO
         """
         Converts this circuit to an openqasm string.
 
@@ -2456,13 +2465,20 @@ def convert_to_openqasm(self, gatename_conversion=None, qubit_conversion=None):
 
                 # Find the openqasm for the gate.
                 openqasm_for_gate = gatename_conversion[gate.name]
-                for q in gate_qubits: 
-                    openqasm_for_gate += ' q[' + str(qubit_conversion[q])+']'
-                    if q != gate_qubits[-1]:
-                        openqasm_for_gate += ', '
-                openqasm_for_gate += ';\n'
+                
+                #If gate.qubits is None, gate is assumed to be single-qubit gate
+                #acting in parallel on all qubits.
+                if gate.qubits is None:
+                    for q in gate_qubits:
+                        openqasm += openqasm_for_gate + ' q[' + str(qubit_conversion[q])+'];\n'
+                else:                
+                    for q in gate_qubits: 
+                        openqasm_for_gate += ' q[' + str(qubit_conversion[q])+']'
+                        if q != gate_qubits[-1]:
+                            openqasm_for_gate += ', '
+                    openqasm_for_gate += ';\n'
                 # Add the openqasm for the gate to the openqasm string.
-                openqasm += openqasm_for_gate
+                    openqasm += openqasm_for_gate
 
                 # Keeps track of the qubits that have been accounted for, and checks that hadn't been used
                 # although that should already be checked in the .get_layer(), which checks for its a valid 
@@ -2475,13 +2491,18 @@ def convert_to_openqasm(self, gatename_conversion=None, qubit_conversion=None):
                 if q not in qubits_used:
                     openqasm += 'id' + ' q[' + str(qubit_conversion[q]) +'];\n'
 
-            # Add in a barrier after every circuit layer. Future: Should make this optional at some
-            # point and/or to agree with the "barriers" in the circuit (to be added).
-            openqasm += 'barrier '
-            for q in self.line_labels[:-1]:
-                openqasm += 'q[{0}], '.format(str(qubit_conversion[q]))
-            openqasm += 'q[{0}];\n'.format(str(qubit_conversion[self.line_labels[-1]]))
-#            openqasm += ';'
+            # Add in a barrier after every circuit layer if block_between_layers==True. 
+            # Including barriers is critical for QCVV testing, circuits should usually
+            # experience minimal "behind-the-scenes" compilation (beyond necessary 
+            # conversion to native instructions).
+            # To do: Add "barrier" as native pygsti circuit instruction, and use for indicating 
+            # where pragma blocks should be.
+            if block_between_layers:
+                openqasm += 'barrier '
+                for q in self.line_labels[:-1]:
+                    openqasm += 'q[{0}], '.format(str(qubit_conversion[q]))
+                openqasm += 'q[{0}];\n'.format(str(qubit_conversion[self.line_labels[-1]]))
+    #            openqasm += ';'
 
         # Add in a measurement at the end.
         for q in self.line_labels:

packages/pygsti/tools/internalgates.py

@@ -296,10 +296,10 @@ def get_standard_gatenames_openqasm_conversions():
     std_gatenames_to_qasm['Gxpi2'] = 'u3(1.570796326794897, 4.71238898038469, 1.570796326794897)' # [1, 3, 1] * pi/2
     std_gatenames_to_qasm['Gxmpi2'] = 'u3(1.570796326794897, 1.570796326794897, 4.71238898038469)' # [1, 1, 3] * pi/2
     std_gatenames_to_qasm['Gxpi'] = 'x'
-    std_gatenames_to_qasm['Gzpi2'] = 'u3(0., 0., 1.570796326794897)' # [0, 0, 1] * pi/2
-    std_gatenames_to_qasm['Gzmpi2'] = 'u3(0., 0., 4.71238898038469)' # [0, 0, 3] * pi/2 
+    std_gatenames_to_qasm['Gzpi2'] = 'u3(0, 0, 1.570796326794897)' # [0, 0, 1] * pi/2
+    std_gatenames_to_qasm['Gzmpi2'] = 'u3(0, 0, 4.71238898038469)' # [0, 0, 3] * pi/2 
     std_gatenames_to_qasm['Gzpi'] = 'z'
-    std_gatenames_to_qasm['Gypi2'] = 'u3(1.570796326794897, 0. 0.)' # [1, 0, 0] * pi/2
+    std_gatenames_to_qasm['Gypi2'] = 'u3(1.570796326794897, 0, 0)' # [1, 0, 0] * pi/2
     std_gatenames_to_qasm['Gympi2'] = 'u3(1.570796326794897, 3.141592653589793, 3.141592653589793)' # [1, 2, 2] * pi/2
     std_gatenames_to_qasm['Gypi'] = 'y'
     std_gatenames_to_qasm['Gp'] = 's' 
@@ -311,30 +311,30 @@ def get_standard_gatenames_openqasm_conversions():
     std_gatenames_to_qasm['Gcnot'] = 'cx'
     std_gatenames_to_qasm['Gswap'] = 'swap'
 
-    std_gatenames_to_qasm['Gc0'] = 'u3(0., 0., 0.)' # [0, 0, 0] * pi/2 (thi is Gi)
-    std_gatenames_to_qasm['Gc1'] = 'u3(1.570796326794897, 0., 1.570796326794897)' # [1, 0, 1] * pi/2
+    std_gatenames_to_qasm['Gc0'] = 'u3(0, 0, 0)' # [0, 0, 0] * pi/2 (thi is Gi)
+    std_gatenames_to_qasm['Gc1'] = 'u3(1.570796326794897, 0, 1.570796326794897)' # [1, 0, 1] * pi/2
     std_gatenames_to_qasm['Gc2'] = 'u3(1.570796326794897, 1.570796326794897, 3.141592653589793)' # [1, 1, 2] * pi/2
-    std_gatenames_to_qasm['Gc3'] = 'u3(3.141592653589793, 0., 3.141592653589793)' # [2, 0, 2] * pi/2 (this is Gxpi)
+    std_gatenames_to_qasm['Gc3'] = 'u3(3.141592653589793, 0, 3.141592653589793)' # [2, 0, 2] * pi/2 (this is Gxpi)
     std_gatenames_to_qasm['Gc4'] = 'u3(1.570796326794897, 3.141592653589793, 4.71238898038469)' # [1, 2, 3] * pi/2
     std_gatenames_to_qasm['Gc5'] = 'u3(1.570796326794897, 4.71238898038469, 3.141592653589793)' # [1, 3, 2] * pi/2
-    std_gatenames_to_qasm['Gc6'] = 'u3(3.141592653589793, 0., 0.)' # [2, 0, 0] * pi/2 (this is Gypi)
+    std_gatenames_to_qasm['Gc6'] = 'u3(3.141592653589793, 0, 0)' # [2, 0, 0] * pi/2 (this is Gypi)
     std_gatenames_to_qasm['Gc7'] = 'u3(1.570796326794897, 3.141592653589793, 1.570796326794897)' # [1, 2, 1] * pi/2
     std_gatenames_to_qasm['Gc8'] = 'u3(1.570796326794897, 4.71238898038469, 0.)' # [1, 3, 0] * pi/2
-    std_gatenames_to_qasm['Gc9'] = 'u3(0., 0., 3.141592653589793)' # [0, 0, 2] * pi/2 (this is Gzpi)
-    std_gatenames_to_qasm['Gc10'] = 'u3(1.570796326794897, 0., 4.71238898038469)' # [1, 0, 3] * pi/2
+    std_gatenames_to_qasm['Gc9'] = 'u3(0, 0, 3.141592653589793)' # [0, 0, 2] * pi/2 (this is Gzpi)
+    std_gatenames_to_qasm['Gc10'] = 'u3(1.570796326794897, 0, 4.71238898038469)' # [1, 0, 3] * pi/2
     std_gatenames_to_qasm['Gc11'] = 'u3(1.570796326794897, 1.570796326794897, 0.)' # [1, 1, 0] * pi/2
     std_gatenames_to_qasm['Gc12'] = 'u3(1.570796326794897, 0., 3.141592653589793)' # [1, 0, 2] * pi/2 (this is Gh)
     std_gatenames_to_qasm['Gc13'] = 'u3(1.570796326794897, 1.570796326794897, 4.71238898038469)' # [1, 1, 3] * pi/2 (this is Gxmpi2 )
-    std_gatenames_to_qasm['Gc14'] = 'u3(0., 0., 1.570796326794897)' # [0, 0, 1] * pi/2 (this is Gzpi2 / Gp)
+    std_gatenames_to_qasm['Gc14'] = 'u3(0, 0, 1.570796326794897)' # [0, 0, 1] * pi/2 (this is Gzpi2 / Gp)
     std_gatenames_to_qasm['Gc15'] = 'u3(1.570796326794897, 3.141592653589793, 3.141592653589793)' # [1, 2, 2] * pi/2 (the is Gympi2)
     std_gatenames_to_qasm['Gc16'] = 'u3(1.570796326794897, 4.71238898038469, 1.570796326794897)' # [1, 3, 1] * pi/2 (this is Gxpi2 )
-    std_gatenames_to_qasm['Gc17'] = 'u3(3.141592653589793, 0., 1.570796326794897)' # [2, 0, 1] * pi/2
+    std_gatenames_to_qasm['Gc17'] = 'u3(3.141592653589793, 0, 1.570796326794897)' # [2, 0, 1] * pi/2
     std_gatenames_to_qasm['Gc18'] = 'u3(1.570796326794897, 3.141592653589793, 0.)' # [1, 2, 0] * pi/2
     std_gatenames_to_qasm['Gc19'] = 'u3(1.570796326794897, 4.71238898038469, 4.71238898038469)' # [1, 3, 3] * pi/2
-    std_gatenames_to_qasm['Gc20'] = 'u3(3.141592653589793, 0., 4.71238898038469)' # [2, 0, 3] * pi/2
-    std_gatenames_to_qasm['Gc21'] = 'u3(1.570796326794897, 0., 0.)' # [1, 0, 0] * pi/2 (this is Gypi2)
+    std_gatenames_to_qasm['Gc20'] = 'u3(3.141592653589793, 0, 4.71238898038469)' # [2, 0, 3] * pi/2
+    std_gatenames_to_qasm['Gc21'] = 'u3(1.570796326794897, 0, 0)' # [1, 0, 0] * pi/2 (this is Gypi2)
     std_gatenames_to_qasm['Gc22'] = 'u3(1.570796326794897, 1.570796326794897, 1.570796326794897)' # [1, 1, 1] * pi/2
-    std_gatenames_to_qasm['Gc23'] = 'u3(0., 0., 4.71238898038469)' # [0, 0, 3] * pi/2 (this is Gzmpi2 / Gpdag)
+    std_gatenames_to_qasm['Gc23'] = 'u3(0, 0, 4.71238898038469)' # [0, 0, 3] * pi/2 (this is Gzmpi2 / Gpdag)
 
     return std_gatenames_to_qasm