Merge branch 'master' into tree_mcm_tests

PennyLaneAI · Sep 14, 2024 · caf70ba · caf70ba
2 parents c5f962b + 43cac72
commit caf70ba
Show file tree

Hide file tree

Showing 100 changed files with 1,049 additions and 18,516 deletions.
diff --git a/.github/workflows/interface-unit-tests.yml b/.github/workflows/interface-unit-tests.yml
@@ -379,8 +379,7 @@ jobs:
  # catalyst requires the latest version of pennylane that is about to be released.
  # Installing catalyst after pennylane to make sure that the latest catalyst is used.
  install_catalyst_nightly: true
- # using lightning master does not work for the tests with external libraries
- install_pennylane_lightning_master: false
+ install_pennylane_lightning_master: true
  pytest_coverage_flags: ${{ inputs.pytest_coverage_flags }}
  pytest_markers: external
  additional_pip_packages: pyzx matplotlib stim quimb mitiq pennylane-qiskit ply

diff --git a/Makefile b/Makefile
@@ -60,12 +60,10 @@ clean-docs:
 
 test:
  $(PYTHON) $(TESTRUNNER)
- $(PYTHON) $(PLUGIN_TESTRUNNER) --device=default.qubit.autograd
 
 coverage:
  @echo "Generating coverage report..."
  $(PYTHON) $(TESTRUNNER) $(COVERAGE)
- $(PYTHON) $(PLUGIN_TESTRUNNER) --device=default.qubit.autograd $(COVERAGE) --cov-append
 
 .PHONY:format
 format:

diff --git a/doc/development/deprecations.rst b/doc/development/deprecations.rst
@@ -9,17 +9,18 @@ deprecations are listed below.
 Pending deprecations
 --------------------
 
-* All of the legacy devices (any with the name ``default.qubit.{autograd,torch,tf,jax,legacy}``) are deprecated. Use ``default.qubit`` instead,
- as it supports backpropagation for the many backends the legacy devices support.
+* ``Device``, ``QubitDevice``, and ``QutritDevice`` will no longer be imported top level in v0.40. They instead
+ we be available as ``qml.devices.LegacyDevice``, ``qml.devices.QubitDevice``, and ``qml.devices.QutritDevice``
+ respectively.
 
- - Deprecated in v0.38
- - Will be removed in v0.39
+ - Deprecated top level access in v0.39
+ - Top level access removed in v0.40
 
-* The logic for internally switching a device for a different backpropagation
- compatible device is now deprecated, as it was in place for the deprecated ``default.qubit.legacy``.
+* `QNode.gradient_fn` is deprecated. Please use `QNode.diff_method` instead. `QNode.get_gradient_fn` can also be used to
+ process the diff method.
 
- - Deprecated in v0.38
- - Will be removed in v0.39 
+ - Deprecated in v0.39
+ - Will be removed in v0.40
 
 * The ``decomp_depth`` argument in ``qml.device`` is deprecated. 
 
@@ -82,6 +83,23 @@ Other deprecations
 Completed deprecation cycles
 ----------------------------
 
+* All of the legacy devices (any with the name ``default.qubit.{autograd,torch,tf,jax,legacy}``) are removed. Use ``default.qubit`` instead,
+ as it supports backpropagation for the many backends the legacy devices support.
+
+ - Deprecated in v0.38
+ - Removed in v0.39
+
+* The logic for internally switching a device for a different backpropagation
+ compatible device is removed, as it was in place for removed ``default.qubit.legacy``.
+
+ - Deprecated in v0.38
+ - Removed in v0.39
+
+* `Operator.expand` is now removed. Use `qml.tape.QuantumScript(op.deocomposition())` instead.
+
+ - Deprecated in v0.38
+ - Removed in v0.39
+
 * The ``expansion_strategy`` attribute of ``qml.QNode`` is removed.
  Users should make use of ``qml.workflow.construct_batch``, should they require fine control over the output tape(s).
 

diff --git a/doc/development/guide/logging.rst b/doc/development/guide/logging.rst
@@ -298,7 +298,7 @@ process, and surrounding operations:
 
  # Get logger for use by this script only.
  logger = logging.getLogger(__name__)
- dev_name = "default.qubit.jax"
+ dev_name = "default.qubit"
  num_wires = 2
  num_shots = None
 

diff --git a/doc/development/release_notes.md b/doc/development/release_notes.md
@@ -5,6 +5,8 @@ This page contains the release notes for PennyLane.
 
 .. mdinclude:: ../releases/changelog-dev.md
 
+.. mdinclude:: ../releases/changelog-0.38.1.md
+
 .. mdinclude:: ../releases/changelog-0.38.0.md
 
 .. mdinclude:: ../releases/changelog-0.37.0.md

diff --git a/doc/introduction/interfaces/jax.rst b/doc/introduction/interfaces/jax.rst
@@ -54,7 +54,7 @@ a JAX-capable QNode in PennyLane. Simply specify the ``interface='jax'`` keyword
 
 .. code-block:: python
 
- dev = qml.device('default.qubit.jax', wires=2)
+ dev = qml.device('default.qubit', wires=2)
 
  @qml.qnode(dev, interface='jax')
  def circuit1(phi, theta):
@@ -85,7 +85,7 @@ For example:
 
 .. code-block:: python
 
- dev = qml.device('default.qubit.jax', wires=2)
+ dev = qml.device('default.qubit', wires=2)
 
  @qml.qnode(dev, interface='jax')
  def circuit3(phi, theta):
@@ -119,7 +119,7 @@ the ``@jax.jit`` decorator can be directly applied to the QNode.
 
 .. code-block:: python
 
- dev = qml.device('default.qubit.jax', wires=2)
+ dev = qml.device('default.qubit', wires=2)
 
  @jax.jit # QNode calls will now be jitted, and should run faster.
  @qml.qnode(dev, interface='jax')
@@ -176,7 +176,7 @@ Example:
 
  # Device construction should happen inside a `jax.jit` decorated
  # method when using a PRNGKey.
- dev = qml.device('default.qubit.jax', wires=2, prng_key=key, shots=100)
+ dev = qml.device('default.qubit', wires=2, prng_key=key, shots=100)
 
 
  @qml.qnode(dev, interface='jax', diff_method=None)

diff --git a/doc/releases/changelog-0.38.0.md b/doc/releases/changelog-0.38.0.md
@@ -1,6 +1,6 @@
 :orphan:
 
-# Release 0.38.0 (current release)
+# Release 0.38.0
 
 <h3>New features since last release</h3>
 

diff --git a/doc/releases/changelog-0.38.1.md b/doc/releases/changelog-0.38.1.md
@@ -0,0 +1,14 @@
+:orphan:
+
+# Release 0.38.1 (current release)
+
+<h3>Bug fixes 🐛</h3>
+
+* Fix float-to-complex casting in various places across PennyLane.
+ [(#6260)](https://github.com/PennyLaneAI/pennylane/pull/6260)
+
+<h3>Contributors ✍️</h3>
+
+This release contains contributions from (in alphabetical order):
+
+Mudit Pandey
diff --git a/doc/releases/changelog-dev.md b/doc/releases/changelog-dev.md
@@ -36,6 +36,9 @@
  `from pennylane.capture.primitives import *`.
  [(#6129)](https://github.com/PennyLaneAI/pennylane/pull/6129)
 
+* `FermiWord` and `FermiSentence` classes now have methods to compute adjoints.
+ [(#6166)](https://github.com/PennyLaneAI/pennylane/pull/6166)
+
 * The `SampleMP.process_samples` method is updated to support using JAX tracers
  for samples, allowing compatiblity with Catalyst workflows.
  [(#6211)](https://github.com/PennyLaneAI/pennylane/pull/6211)
@@ -56,9 +59,12 @@
 * Remove support for Python 3.9.
  [(#6223)](https://github.com/PennyLaneAI/pennylane/pull/6223)
 
-* `DefaultQubitTF` and `DefaultQubitTorch` are removed. Please use `default.qubit` for all interfaces.
+* `DefaultQubitTF`, `DefaultQubitTorch`, `DefaultQubitJax`, and `DefaultQubitAutograd` are removed.
+ Please use `default.qubit` for all interfaces.
  [(#6207)](https://github.com/PennyLaneAI/pennylane/pull/6207)
  [(#6208)](https://github.com/PennyLaneAI/pennylane/pull/6208)
+ [(#6209)](https://github.com/PennyLaneAI/pennylane/pull/6209)
+ [(#6210)](https://github.com/PennyLaneAI/pennylane/pull/6210)
 
 * `expand_fn`, `max_expansion`, `override_shots`, and `device_batch_transform` are removed from the
  signature of `qml.execute`.
@@ -74,12 +80,27 @@
  Please use `qml.transforms.split_non_commuting` instead.
  [(#6204)](https://github.com/PennyLaneAI/pennylane/pull/6204)
 
+* `Operator.expand` is now removed. Use `qml.tape.QuantumScript(op.deocomposition())` instead.
+ [(#6227)](https://github.com/PennyLaneAI/pennylane/pull/6227)
+
+
 <h3>Deprecations 👋</h3>
 
+* `Device`, `QubitDevice`, and `QutritDevice` will no longer be accessible via top-level import in v0.40.
+ They will still be accessible as `qml.devices.LegacyDevice`, `qml.devices.QubitDevice`, and `qml.devices.QutritDevice`
+ respectively.
+ [(#6238)](https://github.com/PennyLaneAI/pennylane/pull/6238/)
+
+* `QNode.gradient_fn` is deprecated. Please use `QNode.diff_method` and `QNode.get_gradient_fn` instead.
+ [(#6244)](https://github.com/PennyLaneAI/pennylane/pull/6244)
+
 <h3>Documentation 📝</h3>
 
 <h3>Bug fixes 🐛</h3>
 
+* Fix a bug where zero-valued JVPs were calculated wrongly in the presence of shot vectors.
+ [(#6219)](https://github.com/PennyLaneAI/pennylane/pull/6219)
+
 * Fix `qml.PrepSelPrep` template to work with `torch`:
  [(#6191)](https://github.com/PennyLaneAI/pennylane/pull/6191)
 
@@ -92,6 +113,9 @@
 * The ``qml.Qubitization`` template now orders the ``control`` wires first and the ``hamiltonian`` wires second, which is the expected according to other templates.
  [(#6229)](https://github.com/PennyLaneAI/pennylane/pull/6229)
 
+* The ``qml.FABLE`` template now returns the correct value when JIT is enabled.
+ [(#6263)](https://github.com/PennyLaneAI/pennylane/pull/6263)
+
 * <h3>Contributors ✍️</h3>
 
 This release contains contributions from (in alphabetical order):

diff --git a/pennylane/__init__.py b/pennylane/__init__.py
@@ -16,8 +16,6 @@
 PennyLane can be directly imported.
 """
 
-import numpy as _np
-
 
 from pennylane.boolean_fn import BooleanFn
 import pennylane.numpy
@@ -180,13 +178,30 @@ def __getattr__(name):
  if name == "plugin_devices":
  return pennylane.devices.device_constructor.plugin_devices
 
+ from warnings import warn # pylint: disable=import-outside-toplevel
+
  if name == "QubitDevice":
+ warn(
+ "QubitDevice will no longer be accessible top level. Please access "
+ " the class as pennylane.devices.QubitDevice",
+ PennyLaneDeprecationWarning,
+ )
  return pennylane.devices._qubit_device.QubitDevice # pylint:disable=protected-access
 
  if name == "QutritDevice":
+ warn(
+ "QutritDevice will no longer be accessible top level. Please access "
+ " the class as pennylane.devices.QutritDevice",
+ PennyLaneDeprecationWarning,
+ )
  return pennylane.devices._qutrit_device.QutritDevice # pylint:disable=protected-access
 
  if name == "Device":
+ warn(
+ "Device will no longer be accessible top level. Please access "
+ " the class as pennylane.devices.LegacyDevice",
+ PennyLaneDeprecationWarning,
+ )
  return pennylane.devices._legacy_device.Device # pylint:disable=protected-access
 
  raise AttributeError(f"module 'pennylane' has no attribute '{name}'")

diff --git a/pennylane/_version.py b/pennylane/_version.py
@@ -16,4 +16,4 @@
 Version number (major.minor.patch[-label])
 """
 
-__version__ = "0.39.0-dev10"
+__version__ = "0.39.0-dev14"
diff --git a/pennylane/devices/__init__.py b/pennylane/devices/__init__.py
@@ -27,8 +27,6 @@
 
  default_qubit
  default_qubit_legacy
- default_qubit_jax
- default_qubit_autograd
  default_gaussian
  default_mixed
  default_qutrit
@@ -154,9 +152,6 @@ def execute(self, circuits, execution_config = qml.devices.DefaultExecutionConfi
 from .default_qubit import DefaultQubit
 from .legacy_facade import LegacyDeviceFacade
 
-# DefaultQubitTF and DefaultQubitAutograd not imported here since this
-# would lead to an automatic import of tensorflow and autograd, which are
-# not PennyLane core dependencies.
 # DefaultTensor is not imported here to avoid warnings
 # from quimb in case it is installed on the system.
 from .default_qubit_legacy import DefaultQubitLegacy

diff --git a/pennylane/devices/_qubit_device.py b/pennylane/devices/_qubit_device.py
@@ -1110,7 +1110,11 @@ def classical_shadow(self, obs, circuit):
  n_snapshots = self.shots
  seed = obs.seed
 
- with qml.workflow.set_shots(self, shots=1):
+ original_shots = self.shots
+ original_shot_vector = self._shot_vector
+
+ try:
+ self.shots = 1
  # slow implementation but works for all devices
  n_qubits = len(wires)
  mapped_wires = np.array(self.map_wires(wires))
@@ -1139,6 +1143,10 @@ def classical_shadow(self, obs, circuit):
  )
 
  outcomes[t] = self.generate_samples()[0][mapped_wires]
+ finally:
+ self.shots = original_shots
+ # pylint: disable=attribute-defined-outside-init
+ self._shot_vector = original_shot_vector
 
  return self._cast(self._stack([outcomes, recipes]), dtype=np.int8)