Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Handle gates with ctrl_stete=0 #2148

Merged
merged 13 commits into from
May 30, 2024
Merged

Handle gates with ctrl_stete=0 #2148

merged 13 commits into from
May 30, 2024

Conversation

doichanj
Copy link
Collaborator

@doichanj doichanj commented May 24, 2024 •
edited

Summary

This PR fixes #2127

Details and comments

This PR compiles gates including ctrl_state=0 before passing C++ simulator
For example, cx(0, 1, ctrl_state=0) is compiled into x(0), cx(0,1) and x(0) gates

@doichanj doichanj added stable-backport-potential The issue or PR might be minimal and/or import enough to backport to stable Changelog: New Feature Include in the Added section of the changelog labels May 24, 2024
@doichanj doichanj requested a review from hhorii May 24, 2024 09:47
@doichanj doichanj mentioned this pull request May 24, 2024
Merged
atharva-satpute
atharva-satpute reviewed May 26, 2024
View reviewed changes
qiskit_aer/backends/aer_compiler.py Outdated
@@ -823,6 +823,14 @@ def _assemble_op(
}:
aer_circ.gate(name, qubits, params, [], conditional_reg, aer_cond_expr,
label if label else name)
elif name == "cx_o0":
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Shouldn't we check this for other gates as well? The same would be applicable to cy, cz and other gates (with ctrl_state arg) right?

hhorii
hhorii reviewed May 27, 2024
View reviewed changes
qiskit_aer/backends/aer_compiler.py Outdated
qubits_0 = [qubits[0]]
aer_circ.gate("x", qubits_0, params, [], conditional_reg, aer_cond_expr,
label if label else "x")
aer_circ.gate(orig_name, qubits, params, [], conditional_reg, aer_cond_expr,
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think we need to check orig_name is in supported gates in AerCircuit. In addition, mc* will use more variation of ctrl_state in addition to _o0 (such as _o0101).

I think transpiler is good to decompose gates with basis gates. Or we say "gate with ctrl_state is not supported".

@doichanj doichanj changed the title Handle cx gate with ctrl_stete=0 Handle gates with ctrl_stete=0 May 28, 2024
@hhorii
Copy link
Collaborator

hhorii commented May 28, 2024 •
edited 

from qiskit import QuantumCircuit, transpile
from qiskit_aer import AerSimulator

qc = QuantumCircuit(3)
qc.x(0) # 0q is 1
qc.x(1) # 1q is 1
qc.mcx([0, 1], 2, ctrl_state="01") # 2q must be 0
qc.measure_all()

simulator = AerSimulator()

print("actual: ", simulator.run(qc).result().get_counts())                      # actual:  {'111': 1024}
print("ideal: ", simulator.run(transpile(qc, simulator)).result().get_counts()) # ideal:  {'011': 1024}

6918b90 shows inconsistent results.

hhorii
hhorii approved these changes May 29, 2024
View reviewed changes
Copy link
Collaborator

@hhorii hhorii left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I confirmed that the above sample works well.

@doichanj doichanj merged commit 0062f64 into Qiskit:main May 30, 2024
38 checks passed
doichanj added a commit to doichanj/qiskit-aer that referenced this pull request May 30, 2024
@doichanj
Handle gates with ctrl_stete=0 (Qiskit#2148)
61547d7 
* handle cx gate with ctrl_stete=0

* add handling *_o0, add test for cx_o0

* format

* fix test

* fix test

* fix test cx

* fix to handle multiple control states

* fix ctrl_state

* format

* resolve conflict again

* fix aer_compiler
doichanj added a commit that referenced this pull request May 31, 2024
@doichanj @mtreinish
@hhorii @1ucian0 @t-imamichi
Release 0.14.2 (#2145)
b77f005 
* release 0.14.2

* Disable test shot_branching on MacOS (#2143)

* remove test_shot_branching

* disable sho_branching tests on MacOS

* fix test

* fix test

* format

* fix test_shot_branching

* fix test_runtime_parameterization

* fix tests for the latest Qiskit (#2138)

* Remove qiskit aer translation stage (#2142)

This commit removes the qiskit aer translation plugin. This was added as
a workaround for a Qiskit/qiskit#11351. This has been fixed in Qiskit
since 0.45.2 and is no longer necessary. The mechanism by which the
workaround worked was unsound in practice as it was mutating the target
and also explicitly using private attributes of the Target. This is
causing real issues now as it only worked by assuming the target wasn't
shared between passmanagers which is never guaranteed. Similarly the
reliance on internal private attributes of the Target class will cause
issues in the future when the target internals change (see
Qiskit/qiskit#12292). This commit opts to remove the plugin in its
entirity as it's no longer necessary and actively causing issues with
Qiskit 1.1 and transpiling targeting aer backends with >1 circuit. As
it's private internal detail there isn't a release note.

Fixes Qiskit/qiskit#12425
Fixes #2141

* Fix issue 2084 again (#2119)

* Fix issue 2084 again

* format

* fix test

* fix test

* Always hook omp functions in Mac (#2128)

* always hook omp functions in Mac

* fix recent test failures with the latest qiskit

---------

Co-authored-by: Jun Doi <doichan@jp.ibm.com>

* Add simulator_metadata in metadata of SamplerV2 (#2109)

Co-authored-by: Hiroshi Horii <hhorii@users.noreply.github.com>

* Fix cuStateVec_enable option (#2146)

* Fix cuStateVec_enable option

* fix function name

* Add support for rotation gates (#2147)

* add rotation gates

* add cr* gates to operations.hpp

* fix test for stabilkize/extended-stabilizer

* fix test again

* Fix deterministic measure of stabilizer (#2132)

* Fix deterministic measure of stabilizer

* fix accumulation in loop

* format

---------

Co-authored-by: Hiroshi Horii <hhorii@users.noreply.github.com>

* Fix init of EstimatorV2 and SamplerV2 (#2120)

* fix init of EstimatorV2 and SamplerV2 to handle method

* add release note

* fix from_backend and example in README

* remove setting density_matrix

* Fix deploy.yml (#2110)

Co-authored-by: Hiroshi Horii <hhorii@users.noreply.github.com>
Co-authored-by: Luciano Bello <bel@zurich.ibm.com>

* Add support for ECR gate to MPS (#2137)

* Add support for ECR gate

* replace is not to !=

* fix release note

* Fix ecr implementation for stabilizer/extended-stabilizer

* Handle gates with ctrl_stete=0 (#2148)

* handle cx gate with ctrl_stete=0

* add handling *_o0, add test for cx_o0

* format

* fix test

* fix test

* fix test cx

* fix to handle multiple control states

* fix ctrl_state

* format

* resolve conflict again

* fix aer_compiler

* fix random seed (#2151)

Co-authored-by: Hiroshi Horii <hhorii@users.noreply.github.com>

* Move delay gate to custom instructions (#2153)

---------

Co-authored-by: Matthew Treinish <mtreinish@kortar.org>
Co-authored-by: Hiroshi Horii <hhorii@users.noreply.github.com>
Co-authored-by: Luciano Bello <bel@zurich.ibm.com>
Co-authored-by: Takashi Imamichi <31178928+t-imamichi@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@atharva-satpute atharva-satpute atharva-satpute left review comments

@hhorii hhorii hhorii approved these changes

Assignees
No one assigned
Labels
Changelog: New Feature Include in the Added section of the changelog stable-backport-potential The issue or PR might be minimal and/or import enough to backport to stable
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

qc.cx(0, 1, ctrl_state=0) fails - AerError: 'unknown instruction: cx_o0'
3 participants
@doichanj @hhorii @atharva-satpute