NoiseAdaptiveLayout to consider inconsistencies in backend #10859

1ucian0 · 2023-09-18T20:43:11Z

The pass NoiseAdaptiveLayout now takes a CouplingMap as an optional argument. This is used by the plugin to control on configuration/properties inconsistency, like in the case of FakeMelbourne

qiskit-bot · 2023-09-18T20:43:15Z

One or more of the the following people are requested to review this:

@Qiskit/terra-core

coveralls · 2023-09-18T21:30:01Z

Pull Request Test Coverage Report for Build 6227804167

4 of 4 (100.0%) changed or added relevant lines in 1 file are covered.
6 unchanged lines in 2 files lost coverage.
Overall coverage increased (+0.008%) to 87.284%

Files with Coverage Reduction	New Missed Lines	%
crates/qasm2/src/lex.rs	3	91.41%
qiskit/pulse/library/waveform.py	3	93.75%

Totals
Change from base Build 6209701566:	0.008%
Covered Lines:	74192
Relevant Lines:	85001

💛 - Coveralls

mtreinish

At a high level this looks fine to me. Just a couple small inline comments about some implementation details.

mtreinish · 2023-10-11T11:47:15Z

qiskit/transpiler/passes/layout/noise_adaptive_layout.py

        """NoiseAdaptiveLayout initializer.

        Args:
            backend_prop (Union[BackendProperties, Target]): backend properties object
+            coupling_map (CouplingMap): Optional. To filter the backend_prop qubits/gates.


I would add a note here that this argument is ignored if backend_prop is a Target object and this is only needed to deal with inconsistencies in BackendProperties objects.

Extending it in 29bc007

mtreinish · 2023-10-11T11:48:06Z

qiskit/transpiler/passes/layout/noise_adaptive_layout.py

+                # inconsistency internally). For the non-target path, this is a possible solution.
+                # See https://github.com/Qiskit/qiskit/issues/7677
+                self.backend_prop.gates = filter(
+                    lambda ginfo: ginfo.gate == "cx"


What about backends that use different entangling gates besides cx?

i think the pass is already cx-specific

qiskit/qiskit/transpiler/passes/layout/noise_adaptive_layout.py

Line 92 in fc74ab9

if ginfo.gate == "cx":

. But it is easy to fix by just removing that condition, in 6d9c214

mtreinish · 2023-10-11T11:50:47Z

qiskit/transpiler/passes/layout/noise_adaptive_layout.py

+                # See https://github.com/Qiskit/qiskit/issues/7677
+                self.backend_prop.gates = filter(
+                    lambda ginfo: ginfo.gate == "cx"
+                    and tuple(ginfo.qubits) in coupling_map.graph.edge_list(),


For performance it might make sense to collect the edge_list into a set(). Event though edge_list() returns a rust container it's a sequence type based on a rust Vec, so there is an O(n^2) overhead here because we're iterating over all edges for each edge in the backend.

Good call! easy optimization 1e52ac8

mtreinish · 2023-10-11T11:53:31Z

qiskit/transpiler/passes/layout/noise_adaptive_layout.py

+                    and tuple(ginfo.qubits) in coupling_map.graph.edge_list(),
+                    backend_prop.gates,
+                )
+                self.backend_prop.qubits = backend_prop.qubits[


Does this modify the BackendProperties object for other passes that are using it, do we need a copy here before modifying? For the default preset pass managers, I don't think it really matters because the only things after this that access the backend properties are potentially VF2PostLayout, Optimize1qGatesDecomposition, and UnitarySynthesis (I might have missed one from memory) and those only look up error rates in the properties.

Good point. I made the copy only under this condition, so I dont penalize the most general case. Done in 1a375df

mtreinish · 2023-10-11T11:54:20Z

test/python/transpiler/test_preset_passmanagers.py

+
+        result = transpile(qc, backend, layout_method="noise_adaptive", optimization_level=level)
+
+        self.assertIsInstance(result, QuantumCircuit)


Do you want to assert anything about the properties of the output circuit, like number of qubits?

sure. I did the same with test_no_coupling_map in this very same file in 960c20c

…h 'main' of github.com:Qiskit/qiskit-terra into fixes/7677/1

mtreinish

LGTM, thanks for the updates

1ucian0 added 2 commits September 18, 2023 18:20

filter backend_prop when does not match the size of the device

a24fa40

NoiseAdaptiveLayout to consider inconsistencies in backend

4708fd6

1ucian0 requested a review from a team as a code owner September 18, 2023 20:43

This was referenced Sep 18, 2023

NoiseAdaptiveLayout cannot handle inconsistent properties/configuration (like in FakeMelbourne) #7677

Closed

Update FakeMelbourne to 15 qubits #10856

Closed

1ucian0 added the Changelog: Bugfix Include in the "Fixed" section of the changelog label Sep 19, 2023

1ucian0 added this to the 0.45.0 milestone Sep 19, 2023

jakelishman assigned mtreinish Oct 10, 2023

mtreinish reviewed Oct 11, 2023

View reviewed changes

1ucian0 added 6 commits October 16, 2023 16:21

Merge branch 'fixes/7677/1' of github.com:1ucian0/qiskit-terra; branc…

df41cb2

…h 'main' of github.com:Qiskit/qiskit-terra into fixes/7677/1

extend docstring with the warning that the parameter might be ignored

29bc007

remove the ginfo.gate and just find two-qubit gates

6d9c214

edge_set

1e52ac8

deepcopy

1a375df

extend test

960c20c

mtreinish previously approved these changes Oct 16, 2023

View reviewed changes

Attempt to fix docs build error

6ffa053

mtreinish dismissed their stale review via 6ffa053 October 16, 2023 19:45

mtreinish approved these changes Oct 16, 2023

View reviewed changes

mtreinish added this pull request to the merge queue Oct 16, 2023

Merged via the queue into Qiskit:main with commit 458ad13 Oct 17, 2023
14 checks passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

NoiseAdaptiveLayout to consider inconsistencies in backend #10859

NoiseAdaptiveLayout to consider inconsistencies in backend #10859

1ucian0 commented Sep 18, 2023 •

edited

Loading

qiskit-bot commented Sep 18, 2023

coveralls commented Sep 18, 2023

mtreinish left a comment

mtreinish Oct 11, 2023

1ucian0 Oct 16, 2023 •

edited

Loading

mtreinish Oct 11, 2023

1ucian0 Oct 16, 2023 •

edited

Loading

mtreinish Oct 11, 2023

1ucian0 Oct 16, 2023 •

edited

Loading

mtreinish Oct 11, 2023

1ucian0 Oct 16, 2023 •

edited

Loading

mtreinish Oct 11, 2023

1ucian0 Oct 16, 2023

mtreinish left a comment


		result = transpile(qc, backend, layout_method="noise_adaptive", optimization_level=level)

		self.assertIsInstance(result, QuantumCircuit)

NoiseAdaptiveLayout to consider inconsistencies in backend #10859

NoiseAdaptiveLayout to consider inconsistencies in backend #10859

Conversation

1ucian0 commented Sep 18, 2023 • edited Loading

qiskit-bot commented Sep 18, 2023

coveralls commented Sep 18, 2023

Pull Request Test Coverage Report for Build 6227804167

💛 - Coveralls

mtreinish left a comment

Choose a reason for hiding this comment

mtreinish Oct 11, 2023

Choose a reason for hiding this comment

1ucian0 Oct 16, 2023 • edited Loading

Choose a reason for hiding this comment

mtreinish Oct 11, 2023

Choose a reason for hiding this comment

1ucian0 Oct 16, 2023 • edited Loading

Choose a reason for hiding this comment

mtreinish Oct 11, 2023

Choose a reason for hiding this comment

1ucian0 Oct 16, 2023 • edited Loading

Choose a reason for hiding this comment

mtreinish Oct 11, 2023

Choose a reason for hiding this comment

1ucian0 Oct 16, 2023 • edited Loading

Choose a reason for hiding this comment

mtreinish Oct 11, 2023

Choose a reason for hiding this comment

1ucian0 Oct 16, 2023

Choose a reason for hiding this comment

mtreinish left a comment

Choose a reason for hiding this comment

1ucian0 commented Sep 18, 2023 •

edited

Loading

1ucian0 Oct 16, 2023 •

edited

Loading

1ucian0 Oct 16, 2023 •

edited

Loading

1ucian0 Oct 16, 2023 •

edited

Loading

1ucian0 Oct 16, 2023 •

edited

Loading