remove defining basis in compile. (Qiskit#577)

in pr Qiskit#562 a basis string constant was defined which seems like could be avoided.
edasgupta · Jun 18, 2018 · 31b3baa · 31b3baa
1 parent 3130029
commit 31b3baa
Showing 1 changed file with 5 additions and 6 deletions.
diff --git a/qiskit/_compiler.py b/qiskit/_compiler.py
@@ -125,12 +125,11 @@ def compile(circuits, backend,
 
         if skip_transpiler:  # Just return the qobj, without any transformation or analysis
             job["config"]["layout"] = None
-            job["compiled_circuit_qasm"] = circuit.qasm()
-            basis_all = "id,u0,u1,u2,u3,x,y,z,h,s,sdg,t,tdg,rx,ry,rz," \
-                        "cx,cy,cz,ch,crz,cu1,cu3,swap,ccx,cswap"
-            job["compiled_circuit"] = DagUnroller(
-                DAGCircuit.fromQuantumCircuit(circuit),
-                JsonBackend(basis_all.split(','))).execute()
+            dag_circuit = DAGCircuit.fromQuantumCircuit(circuit)
+            job["compiled_circuit_qasm"] = dag_circuit.qasm(qeflag=True,
+                                                            eval_symbols=True)
+            job["compiled_circuit"] = DagUnroller(dag_circuit,
+                                                  JsonBackend(dag_circuit.basis)).execute()
         else:
             if initial_layout is None and not backend.configuration['simulator']:
                 # if coupling_map is not already satisfied, pick a good initial layout