Merge branch 'master' into capture-grad-pytrees

.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

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:

doc/development/deprecations.rst

@@ -9,24 +9,19 @@ deprecations are listed below.
 Pending deprecations
 --------------------
 
+* ``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 top level access in v0.39
+ - Top level access removed in v0.40
+
 * `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.39
  - Will be removed in v0.40
 
-* 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.
-
- - Deprecated in v0.38
- - Will be removed in v0.39
-
-* 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``.
-
- - Deprecated in v0.38
- - Will be removed in v0.39 
-
 * The ``decomp_depth`` argument in ``qml.device`` is deprecated. 
 
  - Deprecated in v0.38
@@ -88,6 +83,18 @@ 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

doc/releases/changelog-dev.md

@@ -60,10 +60,12 @@
 * Remove support for Python 3.9.
  [(#6223)](https://github.com/PennyLaneAI/pennylane/pull/6223)
 
-* `DefaultQubitTF`, `DefaultQubitTorch`, and `DefaultQubitJax` 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`.
@@ -82,8 +84,14 @@
 * `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)
 

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}'")

pennylane/devices/__init__.py

@@ -27,7 +27,6 @@
 
  default_qubit
  default_qubit_legacy
- default_qubit_autograd
  default_gaussian
  default_mixed
  default_qutrit
@@ -153,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

pennylane/devices/default_qubit_legacy.py

@@ -713,9 +713,7 @@ def capabilities(cls):
  supports_analytic_computation=True,
  supports_broadcasting=True,
  returns_state=True,
- passthru_devices={
- "autograd": "default.qubit.autograd",
- },
+ passthru_devices={},
  )
  return capabilities