Daily rc sync to master (PennyLaneAI#4988)

Automatic sync from the release candidate to master during a feature freeze. --------- Co-authored-by: Christina Lee <[email protected]> Co-authored-by: Pieter Eendebak <[email protected]> Co-authored-by: Christina Lee <[email protected]> Co-authored-by: lillian542 <[email protected]> Co-authored-by: lillian542 <[email protected]> Co-authored-by: Tom Bromley <[email protected]> Co-authored-by: Isaac De Vlugt <[email protected]> Co-authored-by: Josh Izaac <[email protected]> Co-authored-by: GitHub Actions Bot <>
QSAR-UBC · Jan 4, 2024 · f6a7375 · f6a7375
1 parent 7242786
commit f6a7375
Show file tree

Hide file tree

Showing 13 changed files with 202 additions and 149 deletions.
diff --git a/doc/_static/draw_mpl/mid_measure.png b/doc/_static/draw_mpl/mid_measure.png
diff --git a/doc/_static/tape_mpl/decimals.png b/doc/_static/tape_mpl/decimals.png
diff --git a/doc/_static/tape_mpl/default.png b/doc/_static/tape_mpl/default.png
diff --git a/doc/_static/tape_mpl/mid_measure.png b/doc/_static/tape_mpl/mid_measure.png
diff --git a/doc/_static/tape_mpl/postprocessing.png b/doc/_static/tape_mpl/postprocessing.png
diff --git a/doc/_static/tape_mpl/rcparams.png b/doc/_static/tape_mpl/rcparams.png
diff --git a/doc/_static/tape_mpl/show_all_wires.png b/doc/_static/tape_mpl/show_all_wires.png
diff --git a/doc/_static/tape_mpl/sketch_style.png b/doc/_static/tape_mpl/sketch_style.png
diff --git a/doc/_static/tape_mpl/wire_order.png b/doc/_static/tape_mpl/wire_order.png
diff --git a/doc/_static/tape_mpl/wires_labels.png b/doc/_static/tape_mpl/wires_labels.png
diff --git a/doc/releases/changelog-0.34.0.md b/doc/releases/changelog-0.34.0.md
diff --git a/pennylane/drawer/mpldrawer.py b/pennylane/drawer/mpldrawer.py
@@ -269,7 +269,8 @@ def __init__(self, n_layers, n_wires, c_wires=0, wire_options=None, figsize=None
         ## Creating figure and ax
 
         if figsize is None:
-            figsize = (self.n_layers + 3, self.n_wires + self._cwire_scaling * c_wires + 1.5)
+            figheight = self.n_wires + self._cwire_scaling * c_wires + 1 + 0.5 * (c_wires > 0)
+            figsize = (self.n_layers + 3, figheight)
 
         if fig is None:
             self._fig = plt.figure(figsize=figsize)
@@ -282,7 +283,7 @@ def __init__(self, n_layers, n_wires, c_wires=0, wire_options=None, figsize=None
         self._ax = self._fig.add_axes(
             [0, 0, 1, 1],
             xlim=(-2, self.n_layers + 1),
-            ylim=(-1, self.n_wires + self._cwire_scaling * c_wires + 0.5),
+            ylim=(-1, self.n_wires + self._cwire_scaling * c_wires + 0.5 * (c_wires > 0)),
             xticks=[],
             yticks=[],
         )

diff --git a/tests/drawer/test_mpldrawer.py b/tests/drawer/test_mpldrawer.py
@@ -42,7 +42,7 @@ def test_figsize_wires(self, n_wires, n_layers):
         drawer = MPLDrawer(n_wires=n_wires, n_layers=n_layers)
 
         assert drawer.fig.get_figwidth() == (n_layers + 3)
-        assert drawer.fig.get_figheight() == (n_wires + 1.5)
+        assert drawer.fig.get_figheight() == (n_wires + 1)
 
         drawer = MPLDrawer(n_wires=n_wires, n_layers=n_layers)
 
@@ -55,6 +55,20 @@ def test_figsize_wires(self, n_wires, n_layers):
             assert line.get_ydata() == (wire, wire)
         plt.close()
 
+    def test_figsize_classical_wires(self):
+        """Test the figsize is correct if classical wires are present."""
+        n_wires = 4
+        c_wires = 4
+        n_layers = 1
+
+        drawer = MPLDrawer(n_wires=n_wires, n_layers=n_layers, c_wires=c_wires)
+
+        assert drawer.fig.get_figheight() == n_wires + 1 + 0.25 * 4 + 0.5
+        assert drawer.fig.get_figwidth() == n_layers + 3
+
+        assert drawer.ax.get_xlim() == (-2, 2)
+        assert drawer.ax.get_ylim() == (n_wires + 0.25 * 4 + 0.5, -1)
+
     def test_customfigsize(self):
         """Tests a custom figsize alters the size"""