S

Qiskit · Apr 19, 2022 · 6f81c34 · 6f81c34
1 parent 281046b
commit 6f81c34
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 6 deletions.
diff --git a/qiskit/compiler/transpiler.py b/qiskit/compiler/transpiler.py
@@ -137,8 +137,10 @@ def transpile(
 
                     [qr[0], None, None, qr[1], None, qr[2]]
 
-        layout_method: Name of layout selection pass ('trivial', 'dense', 'noise_adaptive', 'sabre')
-        routing_method: Name of routing pass ('basic', 'lookahead', 'stochastic', 'sabre', 'none')
+        layout_method: Name of layout selection pass
+            ('trivial', 'dense', 'noise_adaptive', 'sabre', 'toqm')
+        routing_method: Name of routing pass
+            ('basic', 'lookahead', 'stochastic', 'sabre', 'toqm', 'none')
         translation_method: Name of translation pass ('unroller', 'translator', 'synthesis')
         scheduling_method: Name of scheduling pass.
             * ``'as_soon_as_possible'``: Schedule instructions greedily, as early as possible

diff --git a/qiskit/transpiler/preset_passmanagers/level0.py b/qiskit/transpiler/preset_passmanagers/level0.py
@@ -129,7 +129,7 @@ def _choose_layout_condition(property_set):
     elif layout_method == "toqm":
         HAS_TOQM.require_now("TOQM-based layout")
         if routing_method != "toqm":
-            raise TranspilerError(f"Layout method 'toqm' requires routing method 'toqm'.")
+            raise TranspilerError("Layout method 'toqm' requires routing method 'toqm'.")
         _choose_layout = TrivialLayout(coupling_map)
     else:
         raise TranspilerError("Invalid layout method %s." % layout_method)

diff --git a/qiskit/transpiler/preset_passmanagers/level1.py b/qiskit/transpiler/preset_passmanagers/level1.py
@@ -186,7 +186,7 @@ def _vf2_match_not_found(property_set):
     elif layout_method == "toqm":
         HAS_TOQM.require_now("TOQM-based layout")
         if routing_method != "toqm":
-            raise TranspilerError(f"Layout method 'toqm' requires routing method 'toqm'.")
+            raise TranspilerError("Layout method 'toqm' requires routing method 'toqm'.")
         _improve_layout = TrivialLayout(coupling_map)
     else:
         raise TranspilerError("Invalid layout method %s." % layout_method)

diff --git a/qiskit/transpiler/preset_passmanagers/level2.py b/qiskit/transpiler/preset_passmanagers/level2.py
@@ -170,7 +170,7 @@ def _vf2_match_not_found(property_set):
     elif layout_method == "toqm":
         HAS_TOQM.require_now("TOQM-based layout")
         if routing_method != "toqm":
-            raise TranspilerError(f"Layout method 'toqm' requires routing method 'toqm'.")
+            raise TranspilerError("Layout method 'toqm' requires routing method 'toqm'.")
         _choose_layout_1 = TrivialLayout(coupling_map)
     else:
         raise TranspilerError("Invalid layout method %s." % layout_method)

diff --git a/qiskit/transpiler/preset_passmanagers/level3.py b/qiskit/transpiler/preset_passmanagers/level3.py
@@ -172,7 +172,7 @@ def _vf2_match_not_found(property_set):
     elif layout_method == "toqm":
         HAS_TOQM.require_now("TOQM-based layout")
         if routing_method != "toqm":
-            raise TranspilerError(f"Layout method 'toqm' requires routing method 'toqm'.")
+            raise TranspilerError("Layout method 'toqm' requires routing method 'toqm'.")
         _choose_layout_1 = TrivialLayout(coupling_map)
     else:
         raise TranspilerError("Invalid layout method %s." % layout_method)

diff --git a/requirements-dev.txt b/requirements-dev.txt
@@ -20,6 +20,7 @@ seaborn>=0.9.0
 reno>=3.4.0
 Sphinx>=3.0.0
 qiskit-sphinx-theme>=1.6
+qiskit-toqm>=0.0.1
 sphinx-autodoc-typehints<1.14.0
 jupyter-sphinx
 sphinx-panels