Add interop/qasm

cirq/__init__.py

@@ -48,12 +48,15 @@
     neutral_atoms,
     api,
     google,
-    interop,
+
     # Applications
     experiments,
     # Extra (nothing should depend on these)
     testing,
     contrib,
+
+    # For interoperation
+    interop,
 )
 # End dependency order list of sub-modules
 
@@ -69,7 +72,6 @@
     InsertStrategy,
     PointOptimizationSummary,
     PointOptimizer,
-    QasmOutput,
     TextDiagramDrawer,
     Unique,
 )
@@ -100,6 +102,8 @@
 )
 
 from cirq.interop import (
+    circuit_from_qasm,
+    QasmOutput,
     quirk_json_to_circuit,
     quirk_url_to_circuit,
 )

cirq/circuits/__init__.py

@@ -17,9 +17,6 @@
 from cirq.circuits.text_diagram_drawer import (
     TextDiagramDrawer,)
 
-from cirq.circuits.qasm_output import (
-    QasmOutput,)
-
 from cirq.circuits.circuit import (
     Circuit,)
 from cirq.circuits.circuit_dag import (

cirq/circuits/circuit.py

@@ -36,7 +36,6 @@
 from cirq.circuits._bucket_priority_queue import BucketPriorityQueue
 from cirq.circuits.insert_strategy import InsertStrategy
 from cirq.circuits.text_diagram_drawer import TextDiagramDrawer
-from cirq.circuits.qasm_output import QasmOutput
 from cirq.type_workarounds import NotImplementedType
 import cirq._version
 
@@ -1625,7 +1624,7 @@ def _to_qasm_output(
             header: Optional[str] = None,
             precision: int = 10,
             qubit_order: 'cirq.QubitOrderOrList' = ops.QubitOrder.DEFAULT,
-    ) -> QasmOutput:
+    ) -> 'cirq.QasmOutput':
         """Returns a QASM object equivalent to the circuit.
 
         Args:
@@ -1640,6 +1639,8 @@ def _to_qasm_output(
                 cirq._version.__version__)
         qubits = ops.QubitOrder.as_qubit_order(qubit_order).order_for(
             self.all_qubits())
+        # HACK: avoid circular import
+        from cirq.interop.qasm.qasm_output import QasmOutput
         return QasmOutput(operations=self.all_operations(),
                           qubits=qubits,
                           header=header,

cirq/circuits/qasm_output.py

@@ -21,6 +21,7 @@
 import numpy as np
 
 from cirq import ops, linalg, protocols, value
+from cirq._compat import deprecated
 
 if TYPE_CHECKING:
     import cirq
@@ -29,6 +30,9 @@
 @value.value_equality(approximate=True)
 class QasmUGate(ops.SingleQubitGate):
 
+    @deprecated(deadline='v0.8',
+                fix='Use `cirq.interop.qasm_output.QasmUGate` instead.',
+                name='cirq.circuits.qasm_output.QasmUGate')
     def __init__(self, theta, phi, lmda) -> None:
         """A QASM gate representing any single qubit unitary with a series of
         three rotations, Z, Y, and Z.
@@ -81,6 +85,10 @@ def _value_equality_values_(self):
 
 @value.value_equality
 class QasmTwoQubitGate(ops.TwoQubitGate):
+
+    @deprecated(deadline='v0.8',
+                fix='Use `cirq.interop.qasm_output.QasmTwoQubitGate` instead.',
+                name='cirq.circuits.qasm_output.QasmTwoQubitGate')
     def __init__(self, kak: linalg.KakDecomposition) -> None:
         """A two qubit gate represented in QASM by the KAK decomposition.
 
@@ -144,6 +152,9 @@ def __repr__(self) -> str:
 class QasmOutput:
     valid_id_re = re.compile(r'[a-z][a-zA-Z0-9_]*\Z')
 
+    @deprecated(deadline='v0.8',
+                fix='Use `cirq.interop.qasm_output.QasmOutput` instead.',
+                name='cirq.circuits.qasm_output.QasmOutput')
     def __init__(self,
                  operations: 'cirq.OP_TREE',
                  qubits: Tuple['cirq.Qid', ...],
@@ -276,6 +287,7 @@ def fallback(op):
                 return NotImplemented
 
             if len(op.qubits) == 1:
+                print('SDFKSLJKJLFHASLHRIUERIUFREIHUFDFDSHFKKHFKD')
                 return QasmUGate.from_matrix(mat).on(*op.qubits)
             return QasmTwoQubitGate.from_matrix(mat).on(*op.qubits)