Skip to content

Commit

Permalink
Merge branch 'main' into probs
Browse files Browse the repository at this point in the history
  • Loading branch information
speller26 authored Nov 14, 2024
2 parents 27bd6a9 + 278b2f6 commit 62d9021
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 3 deletions.
2 changes: 1 addition & 1 deletion src/braket/pennylane_plugin/ahs_device.py
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,8 @@

import numpy as np
import pennylane as qml
from pennylane import QubitDevice
from pennylane._version import __version__
from pennylane.devices import QubitDevice
from pennylane.measurements import MeasurementProcess, SampleMeasurement
from pennylane.ops import CompositeOp, Hamiltonian
from pennylane.pulse import ParametrizedEvolution
Expand Down
3 changes: 2 additions & 1 deletion src/braket/pennylane_plugin/braket_device.py
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,9 @@

import numpy as onp
import pennylane as qml
from pennylane import QuantumFunctionError, QubitDevice
from pennylane import QuantumFunctionError
from pennylane import numpy as np
from pennylane.devices import QubitDevice
from pennylane.gradients import param_shift
from pennylane.measurements import (
Counts,
Expand Down
3 changes: 2 additions & 1 deletion test/unit_tests/test_braket_device.py
Original file line number Diff line number Diff line change
Expand Up @@ -53,8 +53,9 @@
OQC_PULSE_PROPERTIES_ALL_FRAMES,
RESULT,
)
from pennylane import QuantumFunctionError, QubitDevice
from pennylane import QuantumFunctionError
from pennylane import numpy as np
from pennylane.devices import QubitDevice
from pennylane.pulse import ParametrizedEvolution
from pennylane.tape import QuantumScript, QuantumTape

Expand Down

0 comments on commit 62d9021

Please sign in to comment.