Add a new argument concurrent_measurements to target class #10258

to24toro · 2023-06-12T01:59:27Z

Summary

Make the Target class be aware of meas_map (concurrent_measurements is an alias). I added a new attribute concurrent_measurements to the from_configuration function and we can prepare for the Target class that has the info of the ScheduleConfig.

Details and comments

Need to review after #10150.
related to #10200.

qiskit-bot · 2023-06-12T01:59:30Z

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

@Qiskit/terra-core
@nkanazawa1989

TsafrirA

I have some minor suggestions for the doc strings which relate to the next point.

This goes beyond the scope of this PR, but I am not a fan of the fact that we use meas_map to describe two different representations (list vs. dict). At the very least, I think we should be clearly documenting this - What is accepted as input? What is the actual format used later on?

TsafrirA · 2023-06-15T07:03:04Z

qiskit/transpiler/target.py

@@ -287,6 +290,7 @@ def __init__(
                matches the qubit number the properties are defined for. If some
                qubits don't have properties available you can set that entry to
                ``None``
+            meas_map(list, dict): List of sets of qubits that must be measured together.


The two representations of meas_map are accepted as input, but only one is documented here.

So far, most part of the meas_map type is list and this is converted into Dict in inner codes. However, I think that 'meas_map' accepts Dict, e.g. macros.measure, in some cases because Dict of meas_map is easy to understand intuitively rather than List if there exist hardware constraints.

I treated the meas_map type as Dict and implemented macros.measure in backendV2. (It seems that format_measmap was implemented because it is easier to use for Dict than for List.)
So, if the input is a List, I would like to use format_measmap to convert the List to a Dict, and accept both List and Dict as input.

TsafrirA · 2023-06-15T07:05:25Z

qiskit/transpiler/target.py

@@ -1263,6 +1269,7 @@ def from_configuration(
            instruction_durations: Optional instruction durations for instructions. If specified
                it will take priority for setting the ``duration`` field in the
                :class:`~InstructionProperties` objects for the instructions in the target.
+            meas_map: List of sets of qubits that must be measured together.


Again, only one of the two accepted formats is documented here.

As you pointed out, the document is not easy for users or developers to understand.
I fixed at 407f87d .

TsafrirA · 2023-06-15T07:08:16Z

qiskit/transpiler/target.py

@@ -322,6 +326,7 @@ def __init__(
                        "length of the input qubit_properties list"
                    )
        self.qubit_properties = qubit_properties
+        self.meas_map = format_meas_map(meas_map) if isinstance(meas_map, list) else meas_map


Despite documenting the list option in the doc string, we actually convert to the dictionary option here.

Do we need to convert the data format here? Probably this is bit confusing to users if input data is implicitly modified. Since formatted meas map is useful for implementing pulse scheduling, probably we can do this format in the scheduler. Then we can restrict the input to list format.

I fixed at dc45405.

TsafrirA · 2023-06-15T07:08:54Z

qiskit/transpiler/target.py

@@ -1306,6 +1313,7 @@ def from_configuration(
            pulse_alignment=pulse_alignment,
            acquire_alignment=acquire_alignment,
            qubit_properties=qubit_properties,
+            meas_map=format_meas_map(meas_map) if isinstance(meas_map, list) else meas_map,


And again, the inconsistency between the doc string and the actual format used later.

coveralls · 2023-06-18T10:10:06Z

Pull Request Test Coverage Report for Build 5597675106

4 of 5 (80.0%) changed or added relevant lines in 3 files are covered.
17 unchanged lines in 3 files lost coverage.
Overall coverage decreased (-0.007%) to 86.048%

Changes Missing Coverage	Covered Lines	Changed/Added Lines	%
qiskit/providers/fake_provider/utils/backend_converter.py	0	1	0.0%

Files with Coverage Reduction	New Missed Lines	%
qiskit/extensions/quantum_initializer/squ.py	2	80.0%
crates/qasm2/src/lex.rs	3	91.14%
crates/qasm2/src/parse.rs	12	96.18%

Totals
Change from base Build 5597428209:	-0.007%
Covered Lines:	72684
Relevant Lines:	84469

💛 - Coveralls

nkanazawa1989

This looks good to me. Just to make sure

@mtreinish Are you fine with updating the Target model at Qiskit level? Alternatively we can do this in IBM provider, however pulse and circuit scheduler may rely on this constraint and exposing this in general Target makes sense to me (as long as Qiskit provides schedulers).

@wshanks We assume concurrent_measurements (aka meas_map) is just a static list of sub qubits measured together. Can future/non-IBM backend expose different constraints? If so probably we should make Target.concurrent_measurements a method so that we can do some formatting/operation in future.

qiskit/transpiler/target.py

wshanks · 2023-07-18T14:11:54Z

We assume concurrent_measurements (aka meas_map) is just a static list of sub qubits measured together. Can future/non-IBM backend expose different constraints? If so probably we should make Target.concurrent_measurements a method so that we can do some formatting/operation in future.

@nkanazawa1989 Do you have anything specific in mind? The current status is that all IBM hardware backends currently put all qubits into one measurement group. I think this is mainly a software constraint left over from how the system was originally designed with a single acquisition trigger. Beyond that, I could imagine qubits being split into groups based on multiplexed readout -- requiring qubits on the same output line to be measured simultaneously (I could also imagine not having this constraint). Those are the most concrete constraints I can suggest. I don't know other qubit architectures that well though.

mtreinish · 2023-07-18T19:45:09Z

@mtreinish Are you fine with updating the Target model at Qiskit level? Alternatively we can do this in IBM provider, however pulse and circuit scheduler may rely on this constraint and exposing this in general Target makes sense to me (as long as Qiskit provides schedulers).

I'm fine with adding it. I'll defer to both you and @wshanks on how common you think it'll be. If you guys think it's a common constraint that is not just a custom implementation detail for IBM hardware then I'm fine adding it as an optional field to the target. My thinking is for multiplexed readout it feels like this would be a common thing if other hardware does that and we want to support scheduling for that. But I'm also much less familiar with these hardware constraints.

Co-authored-by: Naoki Kanazawa <nkanazawa1989@gmail.com>

nkanazawa1989 · 2023-07-19T08:16:03Z

Thanks @wshanks , @mtreinish sounds like we can go with current assumption. What I had in mind was some edge case that cannot bootstrap sub-qubit lists, e.g. qubit group may change depending on inclusion of a particular qubit -- in this case concurrent_measurements should take some input (it's pretty tough to promote attribute to method). Likely this is just an overengineering.

I'll merge this PR as-is. Thanks for your input!

…skit#10258) * fix measure_v2 * modify measure_all * dispatch backend * add test of the builder with backendV2 * reconfigure test codes and some func * refactoring * add reno * fix _measure_v2 * fix backend.meas_map in measure_v2 * fix reno * delete get_qubit_channels from utils * add get_qubits_channels in qubit_channels * recostruct test about the builder with backendV2 * add meas_map to Target class * fix after mergin main branch * fix documents about meas_map * format target.py * add reno * add meas_map to target in convert_to_target * add the more description about meas_map * Update releasenotes/notes/enable_target_aware_meas_map-0d8542402a74e9d8.yaml Co-authored-by: Naoki Kanazawa <nkanazawa1989@gmail.com> * fix test_meas_map * remove format_meas_map * rename meas_map in target to concurrent_measuments * change reno * remove Unused Union Dict * concurrent_measurements set as getattr(configuration, meas_map) * Update qiskit/transpiler/target.py Co-authored-by: Naoki Kanazawa <nkanazawa1989@gmail.com> * Update qiskit/transpiler/target.py Co-authored-by: Naoki Kanazawa <nkanazawa1989@gmail.com> * format --------- Co-authored-by: Naoki Kanazawa <nkanazawa1989@gmail.com>

) * fix measure_v2 * modify measure_all * dispatch backend * add test of the builder with backendV2 * reconfigure test codes and some func * refactoring * add reno * fix _measure_v2 * fix backend.meas_map in measure_v2 * fix reno * delete get_qubit_channels from utils * add get_qubits_channels in qubit_channels * recostruct test about the builder with backendV2 * add meas_map to Target class * fix after mergin main branch * fix documents about meas_map * format target.py * add reno * add meas_map to target in convert_to_target * add the more description about meas_map * Update releasenotes/notes/enable_target_aware_meas_map-0d8542402a74e9d8.yaml Co-authored-by: Naoki Kanazawa <nkanazawa1989@gmail.com> * fix test_meas_map * remove format_meas_map * rename meas_map in target to concurrent_measuments * change reno * remove Unused Union Dict * concurrent_measurements set as getattr(configuration, meas_map) * Update qiskit/transpiler/target.py Co-authored-by: Naoki Kanazawa <nkanazawa1989@gmail.com> * Update qiskit/transpiler/target.py Co-authored-by: Naoki Kanazawa <nkanazawa1989@gmail.com> * format --------- Co-authored-by: Naoki Kanazawa <nkanazawa1989@gmail.com>

…skit#10258) * fix measure_v2 * modify measure_all * dispatch backend * add test of the builder with backendV2 * reconfigure test codes and some func * refactoring * add reno * fix _measure_v2 * fix backend.meas_map in measure_v2 * fix reno * delete get_qubit_channels from utils * add get_qubits_channels in qubit_channels * recostruct test about the builder with backendV2 * add meas_map to Target class * fix after mergin main branch * fix documents about meas_map * format target.py * add reno * add meas_map to target in convert_to_target * add the more description about meas_map * Update releasenotes/notes/enable_target_aware_meas_map-0d8542402a74e9d8.yaml Co-authored-by: Naoki Kanazawa <nkanazawa1989@gmail.com> * fix test_meas_map * remove format_meas_map * rename meas_map in target to concurrent_measuments * change reno * remove Unused Union Dict * concurrent_measurements set as getattr(configuration, meas_map) * Update qiskit/transpiler/target.py Co-authored-by: Naoki Kanazawa <nkanazawa1989@gmail.com> * Update qiskit/transpiler/target.py Co-authored-by: Naoki Kanazawa <nkanazawa1989@gmail.com> * format --------- Co-authored-by: Naoki Kanazawa <nkanazawa1989@gmail.com>

to24toro added 14 commits May 22, 2023 10:42

fix measure_v2

6a3b145

modify measure_all

3cd1192

dispatch backend

58023f5

add test of the builder with backendV2

93a9262

reconfigure test codes and some func

2cc5451

refactoring

a21cc84

add reno

b3607ee

fix _measure_v2

bd1e169

fix backend.meas_map in measure_v2

d70796f

fix reno

2a651dd

delete get_qubit_channels from utils

8d92531

add get_qubits_channels in qubit_channels

9b2b80d

recostruct test about the builder with backendV2

891c1bd

add meas_map to Target class

83a31b3

to24toro requested review from a team, eggerdj and wshanks as code owners June 12, 2023 01:59

nkanazawa1989 self-assigned this Jun 12, 2023

nkanazawa1989 added the mod: pulse Related to the Pulse module label Jun 12, 2023

to24toro changed the title ~~Add a new argument meas_map to target.from_configuration~~ Add a new argument meas_map to target class Jun 12, 2023

nkanazawa1989 added the Changelog: New Feature Include in the "Added" section of the changelog label Jun 12, 2023

to24toro and others added 2 commits June 13, 2023 15:17

Merge branch 'main' into feature/target_from_cofiguration

f7a1cdb

fix after mergin main branch

cf4357b

TsafrirA reviewed Jun 15, 2023

View reviewed changes

fix documents about meas_map

407f87d

to24toro and others added 3 commits June 27, 2023 16:50

Merge branch 'main' into feature/target_from_cofiguration

609cfc3

format target.py

0b34040

add reno

985a552

to24toro mentioned this pull request Jul 10, 2023

Bug fix macros.measure with backendv2 #9987

Merged

to24toro and others added 5 commits July 12, 2023 16:01

rename meas_map in target to concurrent_measuments

e49b319

Merge branch 'main' into feature/target_from_cofiguration

6a2c9a1

change reno

3ce53fa

remove Unused Union Dict

3d4d0a3

concurrent_measurements set as getattr(configuration, meas_map)

dc3838d

nkanazawa1989 previously approved these changes Jul 18, 2023

View reviewed changes

qiskit/transpiler/target.py Outdated Show resolved Hide resolved

qiskit/transpiler/target.py Outdated Show resolved Hide resolved

Update qiskit/transpiler/target.py

837ba2a

Co-authored-by: Naoki Kanazawa <nkanazawa1989@gmail.com>

to24toro dismissed nkanazawa1989’s stale review via 837ba2a July 19, 2023 01:59

to24toro and others added 3 commits July 19, 2023 10:59

Update qiskit/transpiler/target.py

a054b2b

Co-authored-by: Naoki Kanazawa <nkanazawa1989@gmail.com>

Merge branch 'main' into feature/target_from_cofiguration

8f1770b

format

d949c59

nkanazawa1989 enabled auto-merge July 19, 2023 08:16

nkanazawa1989 disabled auto-merge July 19, 2023 08:17

nkanazawa1989 changed the title ~~Add a new argument meas_map to target class~~ Add a new argument concurrent_measurements to target class Jul 19, 2023

nkanazawa1989 enabled auto-merge July 19, 2023 08:19

Merge branch 'main' into feature/target_from_cofiguration

e44756a

mtreinish added this to the 0.25.0 milestone Jul 19, 2023

nkanazawa1989 added this pull request to the merge queue Jul 20, 2023

nkanazawa1989 approved these changes Jul 20, 2023

View reviewed changes

Merged via the queue into Qiskit:main with commit f492c45 Jul 20, 2023
13 checks passed

to24toro mentioned this pull request Aug 4, 2023

Schedule with backend v2 #10564

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add a new argument concurrent_measurements to target class #10258

Add a new argument concurrent_measurements to target class #10258

to24toro commented Jun 12, 2023 •

edited by nkanazawa1989

Loading

qiskit-bot commented Jun 12, 2023

TsafrirA left a comment

TsafrirA Jun 15, 2023

to24toro Jun 18, 2023

TsafrirA Jun 15, 2023

to24toro Jun 18, 2023

TsafrirA Jun 15, 2023

nkanazawa1989 Jun 30, 2023

to24toro Jul 12, 2023

TsafrirA Jun 15, 2023

coveralls commented Jun 18, 2023 •

edited

Loading

nkanazawa1989 left a comment

wshanks commented Jul 18, 2023

mtreinish commented Jul 18, 2023

nkanazawa1989 commented Jul 19, 2023

Add a new argument concurrent_measurements to target class #10258

Add a new argument concurrent_measurements to target class #10258

Conversation

to24toro commented Jun 12, 2023 • edited by nkanazawa1989 Loading

Summary

Details and comments

qiskit-bot commented Jun 12, 2023

TsafrirA left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

coveralls commented Jun 18, 2023 • edited Loading

Pull Request Test Coverage Report for Build 5597675106

💛 - Coveralls

nkanazawa1989 left a comment

Choose a reason for hiding this comment

wshanks commented Jul 18, 2023

mtreinish commented Jul 18, 2023

nkanazawa1989 commented Jul 19, 2023

to24toro commented Jun 12, 2023 •

edited by nkanazawa1989

Loading

coveralls commented Jun 18, 2023 •

edited

Loading