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

Fix instruction inheritance issues #1908

Merged
merged 11 commits into from
Mar 10, 2019
+4 −3
Merged

Fix instruction inheritance issues #1908

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
ed169e6
fix BasicAer sampling bug (#1624) (#1859)
mtreinish Mar 4, 2019
d5791fa
Bump version and prepare for 0.7.1 release (#1886)
mtreinish Mar 4, 2019
7f0e4e9
Addressed issue with instruction.py which prohibited inheritance of Q…
Woody1193 Mar 5, 2019
55c49d9
Updated changelog
Woody1193 Mar 5, 2019
69433b7
Fixed typo
Woody1193 Mar 5, 2019
a53a576
Merged with master
Woody1193 Mar 7, 2019
2b75f01
Reverted changes from merge with Stable
Woody1193 Mar 7, 2019
05d258d
Merge branch 'master' into fix-instruction-inheritance-issues
Woody1193 Mar 8, 2019
e9e25c8
Fixed changelog
Woody1193 Mar 9, 2019
12b51d8
Merge branch 'master' into fix-instruction-inheritance-issues
jaygambetta Mar 10, 2019
7c54d85
Merge branch 'master' into fix-instruction-inheritance-issues
ajavadia Mar 10, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion CHANGELOG.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,10 @@ The format is based on `Keep a Changelog`_.
- **Fixed**: for any bug fixes.
- **Security**: in case of vulnerabilities.


`UNRELEASED`_
=============


Added
-----

Expand Down Expand Up @@ -87,6 +87,7 @@ Deprecated
Fixed
-----

- Fixed #1892, whereby inheriting from QuantumRegister or ClassicalRegister would cause a QiskitError in instruction.py
- Fixed #829 by removing dependence on scipy unitary_group (#1857).
- Fixed a bug with measurement sampling optimization in BasicAer
qasm_simulator (#1624).
Expand Down
4 changes: 2 additions & 2 deletions qiskit/circuit/instruction.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,9 +48,9 @@ def __init__(self, name, params, qargs, cargs, circuit=None):
Raises:
QiskitError: when the register is not in the correct format.
"""
if not all((type(i[0]), type(i[1])) == (QuantumRegister, int) for i in qargs):
if not all(isinstance(i[0], QuantumRegister) and isinstance(i[1], int) for i in qargs):
raise QiskitError("qarg not (QuantumRegister, int) tuple")
if not all((type(i[0]), type(i[1])) == (ClassicalRegister, int) for i in cargs):
if not all(isinstance(i[0], ClassicalRegister) and isinstance(i[1], int) for i in cargs):
raise QiskitError("carg not (ClassicalRegister, int) tuple")
self.name = name
self.params = [] # a list of gate params stored
Expand Down