Merge branch 'master' into vectorize-sparse

PennyLaneAI · Aug 29, 2021 · 5b08e68 · 5b08e68
2 parents 96959f2 + 65320c9
commit 5b08e68
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 70 deletions.
diff --git a/.github/CHANGELOG.md b/.github/CHANGELOG.md
@@ -347,6 +347,9 @@ and requirements-ci.txt (unpinned). This latter would be used by the CI.
 
 <h3>Bug fixes</h3>
 
+* Remove `QFT` from possible operations in `default.qubit` and `default.mixed`.
+  [(#1600)](https://github.com/PennyLaneAI/pennylane/pull/1600)
+
 * Fix bug when computing expectations of Hamiltonians using TensorFlow.
   [(#1586)](https://github.com/PennyLaneAI/pennylane/pull/1586)
 
@@ -371,8 +374,8 @@ and requirements-ci.txt (unpinned). This latter would be used by the CI.
 This release contains contributions from (in alphabetical order):
 
 Vishnu Ajith, Akash Narayanan B, Thomas Bromley, Tanya Garg, Josh Izaac, Prateek Jain, Christina Lee,
-Johannes Jakob Meyer, Esteban Payares, Pratul Saini, Maria Schuld, Arshpreet Singh, Ingrid Strandberg,
-Slimane Thabet, David Wierichs, Vincent Wong.
+Johannes Jakob Meyer, Romain Moyard, Esteban Payares, Pratul Saini, Maria Schuld, Arshpreet Singh,
+Ingrid Strandberg, Slimane Thabet, David Wierichs, Vincent Wong.
 
 # Release 0.17.0 (current release)
 

diff --git a/README.md b/README.md
@@ -1,18 +1,3 @@
-<p align="center">
-  <a href="https://pennylane.ai/blog/2021/07/pennylane-code-together/">
-    <img width=50% src="https://pennylane.ai/blog/images/code_together.jpg">
-  </a>
-</p>
-
-<p align="center">
-  <strong>Announcing <a href="https://pennylane.ai/blog/2021/07/pennylane-code-together/">PennyLane: Code Together</a>!
-  Join us on GitHub August 16th-27th, see <a href="https://github.com/PennyLaneAI/pennylane/blob/master/code_together.md">event FAQ here</a></strong>.
-</p>
-
----
-
-
-
 <p align="center">
   <a href="https://pennylane.ai">
     <img width=80% src="https://raw.githubusercontent.com/PennyLaneAI/pennylane/master/doc/_static/pennylane_thin.png">

diff --git a/code_together.md b/code_together.md
diff --git a/pennylane/configuration.py b/pennylane/configuration.py
@@ -33,8 +33,8 @@ class Configuration:
 
     Args:
         name (str): filename of the configuration file.
-        This should be a valid TOML file. You may also pass an absolute
-        or a relative file path to the configuration file.
+            This should be a valid TOML file. You may also pass an absolute
+            or a relative file path to the configuration file.
     """
 
     def __init__(self, name):

diff --git a/pennylane/devices/default_mixed.py b/pennylane/devices/default_mixed.py
@@ -93,7 +93,6 @@ class DefaultMixed(QubitDevice):
         "PhaseFlip",
         "ResetError",
         "QubitChannel",
-        "QFT",
         "SingleExcitation",
         "SingleExcitationPlus",
         "SingleExcitationMinus",

diff --git a/pennylane/devices/default_qubit.py b/pennylane/devices/default_qubit.py
@@ -126,7 +126,6 @@ class DefaultQubit(QubitDevice):
         "CRY",
         "CRZ",
         "CRot",
-        "QFT",
         "IsingXX",
         "IsingYY",
         "IsingZZ",

diff --git a/tests/templates/test_subroutines/test_qpe.py b/tests/templates/test_subroutines/test_qpe.py
@@ -62,7 +62,8 @@ def test_phase_estimated(self, phase):
                 )
                 qml.probs(estimation_wires)
 
-            tape = tape.expand()
+            tape = tape.expand(depth=2, stop_at=lambda obj: obj.name in dev.operations)
+
             res = tape.execute(dev).flatten()
             initial_estimate = np.argmax(res) / 2 ** (wires - 1)
 
@@ -110,7 +111,7 @@ def test_phase_estimated_two_qubit(self):
                 )
                 qml.probs(estimation_wires)
 
-            tape = tape.expand(stop_at=lambda obj: obj.name in dev.operations)
+            tape = tape.expand(depth=2, stop_at=lambda obj: obj.name in dev.operations)
             res = tape.execute(dev).flatten()
 
             if phase < 0: