Skip to content

Commit

Permalink
Merge branch 'main' into rust-qv
Browse files Browse the repository at this point in the history
  • Loading branch information
mtreinish authored Sep 30, 2024
2 parents 32b4c1f + be96aec commit bcb67a1
Show file tree
Hide file tree
Showing 5 changed files with 58 additions and 5 deletions.
7 changes: 5 additions & 2 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion crates/accelerate/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ itertools.workspace = true
qiskit-circuit.workspace = true
thiserror.workspace = true
ndarray_einsum_beta = "0.7"
once_cell = "1.20.0"
once_cell = "1.20.1"

[dependencies.smallvec]
workspace = true
Expand Down
34 changes: 33 additions & 1 deletion qiskit/circuit/library/standard_gates/u1.py
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ class U1Gate(Gate):
.. code-block:: python
circuit = QuantumCircuit(1)
circuit.p(lambda, 0) # or circuit.u(0, 0, lambda)
circuit.p(lambda, 0) # or circuit.u(0, 0, lambda, 0)
Expand Down Expand Up @@ -177,6 +177,22 @@ class CU1Gate(ControlledGate):
This is a diagonal and symmetric gate that induces a
phase on the state of the target qubit, depending on the control state.
.. warning::
This gate is deprecated. Instead, the :class:`.CPhaseGate` should be used
.. math::
CU1(\lambda) = CP(\lambda)
.. code-block:: python
circuit = QuantumCircuit(2)
circuit.cp(lambda, 0, 1)
**Circuit symbol:**
.. parsed-literal::
Expand Down Expand Up @@ -332,6 +348,22 @@ class MCU1Gate(ControlledGate):
This is a diagonal and symmetric gate that induces a
phase on the state of the target qubit, depending on the state of the control qubits.
.. warning::
This gate is deprecated. Instead, the following replacements should be used
.. math::
MCU1(\lambda) = MCP(\lambda)
.. code-block:: python
circuit = QuantumCircuit(5)
circuit.mcp(lambda, list(range(4)), 4)
**Circuit symbol:**
.. parsed-literal::
Expand Down
17 changes: 17 additions & 0 deletions qiskit/circuit/library/standard_gates/u3.py
Original file line number Diff line number Diff line change
Expand Up @@ -186,6 +186,23 @@ class CU3Gate(ControlledGate):
It is restricted to 3 parameters, and so cannot cover generic two-qubit
controlled gates).
.. warning::
This gate is deprecated. Instead, the :class:`.CUGate` should be used
.. math::
CU3(\theta, \phi, \lambda) = CU(\theta, \phi, \lambda, 0)
.. code-block:: python
circuit = QuantumCircuit(2)
gamma = 0
circuit.cu(theta, phi, lambda, gamma, 0, 1)
**Circuit symbol:**
.. parsed-literal::
Expand Down
3 changes: 2 additions & 1 deletion qiskit_bot.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ notifications:
"(?!.*pulse.*)\\bvisualization\\b":
- "@enavarro51"
"^docs/":
- "@javabster"
- "@Eric-Arellano"
- "@abbycross"
- "@beckykd"
always_notify: true

0 comments on commit bcb67a1

Please sign in to comment.