Switch to JupyterLab interactive matplotlib

Author: Atcold

04-spiral_classification.ipynb

@@ -207,7 +207,7 @@
     "# Choice of free energy\n",
     "\n",
     "fe = 'cross-entropy'\n",
-    "# fe = 'negative logit'"
+    "fe = 'negative logit'"
    ]
   },
   {
@@ -270,8 +270,7 @@
    "outputs": [],
    "source": [
     "# Switch to interactive matplotlib\n",
-    "%matplotlib notebook\n",
-    "set_default()"
+    "%matplotlib widget"
    ]
   },
   {

res/plot_lib.py

@@ -95,9 +95,9 @@ def plot_2d_energy_levels(X, y, energy, v=None, l=None):
     if not l: levels = None
     else: levels = torch.arange(l[0], l[1], l[2])
     plt.figure(figsize=(12, 10))
-    plt.pcolormesh(xx, yy, F, vmin=vmin, vmax=vmax)
+    plt.pcolormesh(xx.numpy(), yy.numpy(), F, vmin=vmin, vmax=vmax)
     plt.colorbar()
-    cnt = plt.contour(xx, yy, F, colors='w', linewidths=1, levels=levels)
+    cnt = plt.contour(xx.numpy(), yy.numpy(), F, colors='w', linewidths=1, levels=levels)
     plt.clabel(cnt, inline=True, fontsize=10, colors='w')
     s = plot_data(X, y)
     plt.legend(*s.legend_elements(), title='Classes', loc='lower right')
@@ -116,7 +116,7 @@ def plot_3d_energy_levels(X, y, energy, v=None, l=None, cbl=None):
     else: levels = torch.arange(l[0], l[1], l[2])
     fig = plt.figure(figsize=(9.5, 6), facecolor='k')
     ax = fig.add_subplot(projection='3d')
-    cnt = ax.contour(xx, yy, F, levels=levels, vmin=vmin, vmax=vmax)
+    cnt = ax.contour(xx.numpy(), yy.numpy(), F, levels=levels, vmin=vmin, vmax=vmax)
     ax.scatter(X[:,0], X[:,1], zs=0, c=y, cmap=plt.cm.Spectral)
     ax.xaxis.set_pane_color(color=(0,0,0))
     ax.yaxis.set_pane_color(color=(0,0,0))
@@ -129,7 +129,7 @@ def plot_3d_energy_levels(X, y, energy, v=None, l=None, cbl=None):
     else: cbl = torch.arange(cbl[0], cbl[1], cbl[2])
     sm = plt.cm.ScalarMappable(norm=norm, cmap=cnt.cmap)
     sm.set_array([])
-    fig.colorbar(sm, ticks=cbl)
+    fig.colorbar(sm, ticks=cbl, ax=ax)
     ȳ = torch.zeros(K).int(); ȳ[k] = 1
     plt.title(f'Free energy F(x, y = {ȳ.tolist()})')
     plt.tight_layout()