Defaults in TranspileConfig (now called PassManagerConfig)

qiskit/compiler/transpile.py

@@ -15,13 +15,18 @@
 """Circuit transpile function"""
 from qiskit.transpiler import Layout, CouplingMap
 from qiskit.tools.parallel import parallel_map
-from qiskit.transpiler.transpile_config import TranspileConfig
+from qiskit.transpiler.pass_manager_config import PassManagerConfig
 from qiskit.transpiler.transpile_circuit import transpile_circuit
 from qiskit.pulse import Schedule
 from qiskit.circuit.quantumregister import Qubit
 from qiskit import user_config
 from qiskit.transpiler.exceptions import TranspilerError
 from qiskit.converters import isinstanceint, isinstancelist
+from qiskit.transpiler.passes.ms_basis_decomposer import MSBasisDecomposer
+from qiskit.transpiler.preset_passmanagers import (level_0_pass_manager,
+                                                   level_1_pass_manager,
+                                                   level_2_pass_manager,
+                                                   level_3_pass_manager)
 
 
 def transpile(circuits,
@@ -176,14 +181,15 @@ def callback_func(**kwargs):
         config = user_config.get_config()
         optimization_level = config.get('transpile_optimization_level', None)
 
-    # Get TranspileConfig(s) to configure the circuit transpilation job(s)
+    # Get transpile_args to configure the circuit transpilation job(s)
     circuits = circuits if isinstance(circuits, list) else [circuits]
-    transpile_configs = _parse_transpile_args(circuits, backend, basis_gates, coupling_map,
-                                              backend_properties, initial_layout,
-                                              seed_transpiler, optimization_level,
-                                              pass_manager, callback, output_name)
+    transpile_args = _parse_transpile_args(circuits, backend, basis_gates, coupling_map,
+                                           backend_properties, initial_layout,
+                                           seed_transpiler, optimization_level,
+                                           pass_manager, callback, output_name)
     # Check circuit width against number of qubits in coupling_map(s)
-    coupling_maps_list = list(config.coupling_map for config in transpile_configs)
+    coupling_maps_list = list(config['pass_manager_config'].coupling_map for config in
+                              transpile_args)
     for circuit, parsed_coupling_map in zip(circuits, coupling_maps_list):
         # If coupling_map is not None or n_qubits == 1
         n_qubits = len(circuit.qubits)
@@ -201,28 +207,72 @@ def callback_func(**kwargs):
                                   'is greater than maximum ({}) '.format(max_qubits) +
                                   'in the coupling_map')
     # Transpile circuits in parallel
-    circuits = parallel_map(_transpile_circuit, list(zip(circuits, transpile_configs)))
+    circuits = parallel_map(_transpile_circuit, list(zip(circuits, transpile_args)))
 
     if len(circuits) == 1:
         return circuits[0]
     return circuits
 
 
-# FIXME: This is a helper function because of parallel tools.
 def _transpile_circuit(circuit_config_tuple):
     """Select a PassManager and run a single circuit through it.
-
     Args:
         circuit_config_tuple (tuple):
             circuit (QuantumCircuit): circuit to transpile
-            transpile_config (TranspileConfig): configuration dictating how to transpile
-
+            transpile_config (dict): configuration dictating how to transpile. The format of the
+                dictionary has the following format:
+                {'optimization_level': int,
+                 'pass_manager': PassManager,
+                 'output_name': string,
+                 'callback': callable,
+                 'pass_manager_config': PassManagerConfig}
     Returns:
         QuantumCircuit: transpiled circuit
+    Raises:
+        TranspilerError: if transpile_config is not valid or transpilation incurs error
     """
     circuit, transpile_config = circuit_config_tuple
 
-    return transpile_circuit(circuit, transpile_config)
+    pass_manager_config = transpile_config['pass_manager_config']
+
+    # Workaround for ion trap support: If basis gates includes
+    # Mølmer-Sørensen (rxx) and the circuit includes gates outside the basis,
+    # first unroll to u3, cx, then run MSBasisDecomposer to target basis.
+    basic_insts = ['measure', 'reset', 'barrier', 'snapshot']
+    device_insts = set(pass_manager_config.basis_gates).union(basic_insts)
+    ms_basis_swap = None
+    if 'rxx' in pass_manager_config.basis_gates and \
+            not device_insts >= circuit.count_ops().keys():
+        ms_basis_swap = pass_manager_config.basis_gates
+        pass_manager_config.basis_gates = list(
+            set(['u3', 'cx']).union(pass_manager_config.basis_gates))
+
+    if transpile_config['pass_manager'] is not None:
+        pass_manager = transpile_config['pass_manager']
+    else:
+        if transpile_config['optimization_level'] is not None:
+            level = transpile_config['optimization_level']
+        else:
+            level = 1
+
+        if level == 0:
+            pass_manager = level_0_pass_manager(pass_manager_config)
+        elif level == 1:
+            pass_manager = level_1_pass_manager(pass_manager_config)
+        elif level == 2:
+            pass_manager = level_2_pass_manager(pass_manager_config)
+        elif level == 3:
+            pass_manager = level_3_pass_manager(pass_manager_config)
+        else:
+            raise TranspilerError("optimization_level can range from 0 to 3.")
+
+    if ms_basis_swap is not None:
+        pass_manager.append(MSBasisDecomposer(ms_basis_swap))
+
+    return transpile_circuit(circuit,
+                             pass_manager,
+                             transpile_config['output_name'],
+                             transpile_config['callback'])
 
 
 def _parse_transpile_args(circuits, backend,
@@ -238,45 +288,38 @@ def _parse_transpile_args(circuits, backend,
     arg has more priority than the arg set by backend).
 
     Returns:
-        list[TranspileConfig]: a transpile config for each circuit, which is a standardized
-            object that configures the transpiler and determines the pass manager to use.
+        list[dicts]: a list of transpile parameters.
     """
     # Each arg could be single or a list. If list, it must be the same size as
     # number of circuits. If single, duplicate to create a list of that size.
     num_circuits = len(circuits)
 
     basis_gates = _parse_basis_gates(basis_gates, backend, circuits)
-
-    coupling_map = _parse_coupling_map(coupling_map, backend, num_circuits)
-
+    coupling_map = _parse_coupling_map(coupling_map, backend, circuits)
     backend_properties = _parse_backend_properties(backend_properties, backend, num_circuits)
-
     initial_layout = _parse_initial_layout(initial_layout, circuits)
-
     seed_transpiler = _parse_seed_transpiler(seed_transpiler, num_circuits)
-
     optimization_level = _parse_optimization_level(optimization_level, num_circuits)
-
     pass_manager = _parse_pass_manager(pass_manager, num_circuits)
+    output_name = _parse_output_name(output_name, num_circuits)
 
-    output_name = _parse_output_name(output_name, circuits)
-
-    transpile_configs = []
+    transpile_args_circuits = []
     for args in zip(basis_gates, coupling_map, backend_properties,
                     initial_layout, seed_transpiler, optimization_level,
-                    pass_manager, output_name):
-        transpile_config = TranspileConfig(basis_gates=args[0],
-                                           coupling_map=args[1],
-                                           backend_properties=args[2],
-                                           initial_layout=args[3],
-                                           seed_transpiler=args[4],
-                                           optimization_level=args[5],
-                                           pass_manager=args[6],
-                                           callback=callback,
-                                           output_name=args[7])
-        transpile_configs.append(transpile_config)
-
-    return transpile_configs
+                    pass_manager, output_name, circuits):
+        transpile_args = {'pass_manager_config': PassManagerConfig(basis_gates=args[0],
+                                                                   coupling_map=args[1],
+                                                                   backend_properties=args[2],
+                                                                   initial_layout=args[3],
+                                                                   seed_transpiler=args[4]),
+                          'optimization_level': args[5],
+                          'pass_manager': args[6],
+                          'output_name': args[7],
+                          'circuit': args[8],
+                          'callback': callback}
+        transpile_args_circuits.append(transpile_args)
+
+    return transpile_args_circuits
 
 
 def _parse_basis_gates(basis_gates, backend, circuits):
@@ -299,18 +342,31 @@ def _parse_basis_gates(basis_gates, backend, circuits):
     return basis_gates
 
 
-def _parse_coupling_map(coupling_map, backend, num_circuits):
+def _parse_coupling_map(coupling_map, backend, circuits):
+    num_circuits = len(circuits)
     # try getting coupling_map from user, else backend
     if coupling_map is None:
         if getattr(backend, 'configuration', None):
-            coupling_map = getattr(backend.configuration(), 'coupling_map', None)
-    # coupling_map could be None, or a list of lists, e.g. [[0, 1], [2, 1]]
-    if coupling_map is None or isinstance(coupling_map, CouplingMap):
-        coupling_map = [coupling_map] * num_circuits
-    elif isinstance(coupling_map, list) and all(isinstance(i, list) and len(i) == 2
-                                                for i in coupling_map):
-        coupling_map = [coupling_map] * num_circuits
-    coupling_map = [CouplingMap(cm) if isinstance(cm, list) else cm for cm in coupling_map]
+            configuration = backend.configuration()
+            if hasattr(configuration, 'coupling_map') and configuration.coupling_map:
+                coupling_map = CouplingMap(configuration.coupling_map)
+
+    coupling_map = [coupling_map] * num_circuits
+
+    for index, parsed_coupling_map in enumerate(coupling_map):
+        if isinstance(parsed_coupling_map, list):
+            parsed_coupling_map = CouplingMap(parsed_coupling_map)
+        # If coupling_map is not None
+        if isinstance(parsed_coupling_map, CouplingMap):
+            n_qubits = len(circuits[index].qubits)
+            max_qubits = parsed_coupling_map.size()
+            if n_qubits > max_qubits:
+                raise TranspilerError('Number of qubits ({}) '.format(n_qubits) +
+                                      'in {} '.format(circuits[index].name) +
+                                      'is greater than maximum ({}) '.format(max_qubits) +
+                                      'in the coupling_map')
+        coupling_map[index] = parsed_coupling_map
+
     return coupling_map
 
 
@@ -372,21 +428,21 @@ def _parse_pass_manager(pass_manager, num_circuits):
     return pass_manager
 
 
-def _parse_output_name(output_name, circuits):
+def _parse_output_name(output_name, num_circuits):
     # naming and returning circuits
     # output_name could be either a string or a list
     if output_name is not None:
         if isinstance(output_name, str):
             # single circuit
-            if len(circuits) == 1:
+            if num_circuits == 1:
                 return [output_name]
             # multiple circuits
             else:
                 raise TranspilerError("Expected a list object of length equal " +
                                       "to that of the number of circuits " +
                                       "being transpiled")
         elif isinstance(output_name, list):
-            if len(circuits) == len(output_name) and \
+            if num_circuits == len(output_name) and \
                     all(isinstance(name, str) for name in output_name):
                 return output_name
             else:
@@ -398,4 +454,4 @@ def _parse_output_name(output_name, circuits):
             raise TranspilerError("The parameter output_name should be a string or a"
                                   "list of strings: %s was used." % type(output_name))
     else:
-        return [circuit.name for circuit in circuits]
+        return [None] * num_circuits

qiskit/transpiler/models.py

@@ -12,13 +12,13 @@
 # copyright notice, and modified files need to carry a notice indicating
 # that they have been altered from the originals.
 
-"""Models for TranspileConfig and RunConfig."""
+"""Models for PassManagerConfig and RunConfig."""
 
 from qiskit.validation import BaseSchema
 
 
-class TranspileConfigSchema(BaseSchema):
-    """Schema for TranspileConfig."""
+class PassManagerConfigSchema(BaseSchema):
+    """Schema for PassManagerConfig."""
 
     # Required properties.
 

qiskit/transpiler/transpile_config.py → qiskit/transpiler/pass_manager_config.py

@@ -12,24 +12,35 @@
 # copyright notice, and modified files need to carry a notice indicating
 # that they have been altered from the originals.
 
-"""Models for TranspileConfig and its related components."""
+"""Models for PassManagerConfig and its related components."""
 
-from qiskit.transpiler.models import TranspileConfigSchema
+from qiskit.transpiler.models import PassManagerConfigSchema
 from qiskit.validation import BaseModel, bind_schema
 
 
-@bind_schema(TranspileConfigSchema)
-class TranspileConfig(BaseModel):
-    """Model for TranspileConfig.
+@bind_schema(PassManagerConfigSchema)
+class PassManagerConfig(BaseModel):
+    """Model for PassManagerConfig.
 
     Please note that this class only describes the required fields. For the
-    full description of the model, please check ``TranspileConfigSchema``.
+    full description of the model, please check ``PassManagerConfigSchema``.
 
     Attributes:
         optimization_level (int): a non-negative integer indicating the
             optimization level. 0 means no transformation on the circuit. Higher
             levels may produce more optimized circuits, but may take longer.
     """
-    def __init__(self, optimization_level, **kwargs):
-        self.optimization_level = optimization_level
-        super().__init__(**kwargs)
+
+    def __init__(self,
+                 initial_layout=None,
+                 basis_gates=None,
+                 coupling_map=None,
+                 backend_properties=None,
+                 seed_transpiler=None,
+                 **kwargs):
+        super().__init__(initial_layout=initial_layout,
+                         basis_gates=basis_gates,
+                         coupling_map=coupling_map,
+                         backend_properties=backend_properties,
+                         seed_transpiler=seed_transpiler,
+                         **kwargs)