Skip to content

Commit

Permalink
Merge pull request #13 from frankharkins/FH/qiskit-1.0
Browse files Browse the repository at this point in the history
Update for Qiskit 1.0
  • Loading branch information
Zhaoyilunnn authored Mar 11, 2024
2 parents 5881b91 + 25f0398 commit 36cd249
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 6 deletions.
3 changes: 2 additions & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@ dependencies = [
"cirq_core==1.1.0",
"matplotlib==3.6.3",
"numpy==1.23.4",
"qiskit-aer==0.13.0",
"qiskit>=1.0",
"qiskit-aer>=0.13.0",
"setuptools>=65.5.1",
"sympy==1.11.1",
"pyquafu==0.3.5",
Expand Down
4 changes: 2 additions & 2 deletions qdao/qiskit/gate.py
Original file line number Diff line number Diff line change
Expand Up @@ -63,12 +63,12 @@ def power(self, exponent: float):
exponent (float): Gate^exponent
Returns:
qiskit.extensions.UnitaryGate: To which `to_matrix` is self.to_matrix^exponent.
qiskit.circuit.library.UnitaryGate: To which `to_matrix` is self.to_matrix^exponent.
Raises:
CircuitError: If Gate is not unitary
"""
from qiskit.extensions.unitary import (
from qiskit.circuit.library import (
UnitaryGate,
) # pylint: disable=cyclic-import
from qiskit.quantum_info.operators import (
Expand Down
4 changes: 2 additions & 2 deletions qdao/qiskit/instruction.py
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
from qiskit.circuit.operation import Operation
from qiskit.circuit.parameter import ParameterExpression
from qiskit.circuit.quantumregister import QuantumRegister
from qiskit.qasm.exceptions import QasmError
from qiskit.qasm2 import QASM2Error
from qiskit.qobj.qasm_qobj import QasmQobjInstruction

from .tools import pi_check
Expand Down Expand Up @@ -476,7 +476,7 @@ def _qasmif(self, string):
if self.condition is None:
return string
if not isinstance(self.condition[0], ClassicalRegister):
raise QasmError(
raise Qasm2Error(
"OpenQASM 2 can only condition on registers, but got '{self.condition[0]}'"
)
return "if(%s==%d) " % (self.condition[0].name, self.condition[1]) + string
Expand Down
3 changes: 2 additions & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
cirq_core==1.1.0
matplotlib==3.6.3
numpy==1.23.4
qiskit-aer==0.13.0
qiskit>=1.0
qiskit-aer>=0.13.0
setuptools>=65.5.1
sympy==1.11.1
pyquafu==0.3.5

0 comments on commit 36cd249

Please sign in to comment.