From 7f55ea63b6b4b0028b886572fbd4f62cc030d361 Mon Sep 17 00:00:00 2001
From: ET <57718207+turbotimon@users.noreply.github.com>
Date: Tue, 26 Sep 2023 08:54:54 +0000
Subject: [PATCH 1/5] improve plot_loss

---
 fastai/learner.py | 22 +++++++++++++++++-----
 1 file changed, 17 insertions(+), 5 deletions(-)

diff --git a/fastai/learner.py b/fastai/learner.py
index dabee8898e..c37b7fb45b 100644
--- a/fastai/learner.py
+++ b/fastai/learner.py
@@ -594,13 +594,25 @@ def _valid_mets(self):
         if getattr(self, 'cancel_valid', False): return L()
         return (L(self.loss) + self.metrics if self.valid_metrics else L())
 
-    def plot_loss(self, skip_start=5, with_valid=True):
-        plt.plot(list(range(skip_start, len(self.losses))), self.losses[skip_start:], label='train')
+    def plot_loss(self, skip_start=5, with_valid=True, log=False, show_epochs=False, ax=None):
+        if not ax:
+            ax=plt.gca()
+        if log:
+            ax.loglog(list(range(skip_start, len(self.losses))), self.losses[skip_start:], label='train')
+        else:
+            ax.plot(list(range(skip_start, len(self.losses))), self.losses[skip_start:], label='train')
+        if show_epochs:
+            for x in self.iters:
+                ax.axvline(x, color='grey', ls=':')
+        ax.set_ylabel('loss')
+        ax.set_xlabel('steps')
+        ax.set_title('learning curve')
         if with_valid:
             idx = (np.array(self.iters)<skip_start).sum()
             valid_col = self.metric_names.index('valid_loss') - 1 
-            plt.plot(self.iters[idx:], L(self.values[idx:]).itemgot(valid_col), label='valid')
-            plt.legend()
+            ax.plot(self.iters[idx:], L(self.values[idx:]).itemgot(valid_col), label='valid')
+            ax.legend()
+        return ax
 
 # %% ../nbs/13a_learner.ipynb 136
 add_docs(Recorder,
@@ -610,7 +622,7 @@ def plot_loss(self, skip_start=5, with_valid=True):
          after_validate = "Log loss and metric values on the validation set",
          after_cancel_train = "Ignore training metrics for this epoch",
          after_cancel_validate = "Ignore validation metrics for this epoch",
-         plot_loss = "Plot the losses from `skip_start` and onward")
+         plot_loss = "Plot the losses from `skip_start` and onward. Optionally `log=True` for logarithmic axis, `show_epochs=True` for indicate epochs and a matplotlib axis `ax` to plot on.")
 
 if Recorder not in defaults.callbacks: defaults.callbacks.append(Recorder)
 

From f121be93a5729b9ac902a288a44e0aed77245896 Mon Sep 17 00:00:00 2001
From: ET <57718207+turbotimon@users.noreply.github.com>
Date: Mon, 16 Oct 2023 16:23:48 +0000
Subject: [PATCH 2/5] move changes to nbs

---
 fastai/learner.py     | 22 +++++-----------------
 nbs/13a_learner.ipynb | 22 +++++++++++++++++-----
 2 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/fastai/learner.py b/fastai/learner.py
index c37b7fb45b..dabee8898e 100644
--- a/fastai/learner.py
+++ b/fastai/learner.py
@@ -594,25 +594,13 @@ def _valid_mets(self):
         if getattr(self, 'cancel_valid', False): return L()
         return (L(self.loss) + self.metrics if self.valid_metrics else L())
 
-    def plot_loss(self, skip_start=5, with_valid=True, log=False, show_epochs=False, ax=None):
-        if not ax:
-            ax=plt.gca()
-        if log:
-            ax.loglog(list(range(skip_start, len(self.losses))), self.losses[skip_start:], label='train')
-        else:
-            ax.plot(list(range(skip_start, len(self.losses))), self.losses[skip_start:], label='train')
-        if show_epochs:
-            for x in self.iters:
-                ax.axvline(x, color='grey', ls=':')
-        ax.set_ylabel('loss')
-        ax.set_xlabel('steps')
-        ax.set_title('learning curve')
+    def plot_loss(self, skip_start=5, with_valid=True):
+        plt.plot(list(range(skip_start, len(self.losses))), self.losses[skip_start:], label='train')
         if with_valid:
             idx = (np.array(self.iters)<skip_start).sum()
             valid_col = self.metric_names.index('valid_loss') - 1 
-            ax.plot(self.iters[idx:], L(self.values[idx:]).itemgot(valid_col), label='valid')
-            ax.legend()
-        return ax
+            plt.plot(self.iters[idx:], L(self.values[idx:]).itemgot(valid_col), label='valid')
+            plt.legend()
 
 # %% ../nbs/13a_learner.ipynb 136
 add_docs(Recorder,
@@ -622,7 +610,7 @@ def plot_loss(self, skip_start=5, with_valid=True, log=False, show_epochs=False,
          after_validate = "Log loss and metric values on the validation set",
          after_cancel_train = "Ignore training metrics for this epoch",
          after_cancel_validate = "Ignore validation metrics for this epoch",
-         plot_loss = "Plot the losses from `skip_start` and onward. Optionally `log=True` for logarithmic axis, `show_epochs=True` for indicate epochs and a matplotlib axis `ax` to plot on.")
+         plot_loss = "Plot the losses from `skip_start` and onward")
 
 if Recorder not in defaults.callbacks: defaults.callbacks.append(Recorder)
 
diff --git a/nbs/13a_learner.ipynb b/nbs/13a_learner.ipynb
index 9b2af93f98..ad9b936cbb 100644
--- a/nbs/13a_learner.ipynb
+++ b/nbs/13a_learner.ipynb
@@ -2924,13 +2924,25 @@
     "        if getattr(self, 'cancel_valid', False): return L()\n",
     "        return (L(self.loss) + self.metrics if self.valid_metrics else L())\n",
     "\n",
-    "    def plot_loss(self, skip_start=5, with_valid=True):\n",
-    "        plt.plot(list(range(skip_start, len(self.losses))), self.losses[skip_start:], label='train')\n",
+    "    def plot_loss(self, skip_start=5, with_valid=True, log=False, show_epochs=False, ax=None):\n",
+    "        if not ax:\n",
+    "            ax=plt.gca()\n",
+    "        if log:\n",
+    "            ax.loglog(list(range(skip_start, len(self.losses))), self.losses[skip_start:], label='train')\n",
+    "        else:\n",
+    "            ax.plot(list(range(skip_start, len(self.losses))), self.losses[skip_start:], label='train')\n",
+    "        if show_epochs:\n",
+    "            for x in self.iters:\n",
+    "                ax.axvline(x, color='grey', ls=':')\n",
+    "        ax.set_ylabel('loss')\n",
+    "        ax.set_xlabel('steps')\n",
+    "        ax.set_title('learning curve')\n",
     "        if with_valid:\n",
     "            idx = (np.array(self.iters)<skip_start).sum()\n",
     "            valid_col = self.metric_names.index('valid_loss') - 1 \n",
-    "            plt.plot(self.iters[idx:], L(self.values[idx:]).itemgot(valid_col), label='valid')\n",
-    "            plt.legend()"
+    "            ax.plot(self.iters[idx:], L(self.values[idx:]).itemgot(valid_col), label='valid')\n",
+    "            ax.legend()\n",
+    "        return ax"
    ]
   },
   {
@@ -2947,7 +2959,7 @@
     "         after_validate = \"Log loss and metric values on the validation set\",\n",
     "         after_cancel_train = \"Ignore training metrics for this epoch\",\n",
     "         after_cancel_validate = \"Ignore validation metrics for this epoch\",\n",
-    "         plot_loss = \"Plot the losses from `skip_start` and onward\")\n",
+    "         plot_loss = \"Plot the losses from `skip_start` and onward. Optionally `log=True` for logarithmic axis, `show_epochs=True` for indicate epochs and a matplotlib axis `ax` to plot on.\")\n",
     "\n",
     "if Recorder not in defaults.callbacks: defaults.callbacks.append(Recorder)"
    ]

From a703e4b4742a42174e8226a703fa971976f397af Mon Sep 17 00:00:00 2001
From: ET <57718207+turbotimon@users.noreply.github.com>
Date: Tue, 17 Oct 2023 08:04:28 +0000
Subject: [PATCH 3/5] run nbdev_export

---
 fastai/_modidx.py |  2 +-
 fastai/learner.py | 22 +++++++++++++++++-----
 fastai/metrics.py |  2 +-
 3 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/fastai/_modidx.py b/fastai/_modidx.py
index f86fda8c9f..2bea67ec8a 100644
--- a/fastai/_modidx.py
+++ b/fastai/_modidx.py
@@ -2691,4 +2691,4 @@
                                        'fastai.vision.widgets._update_children': ( 'vision.widgets.html#_update_children',
                                                                                    'fastai/vision/widgets.py'),
                                        'fastai.vision.widgets.carousel': ('vision.widgets.html#carousel', 'fastai/vision/widgets.py'),
-                                       'fastai.vision.widgets.widget': ('vision.widgets.html#widget', 'fastai/vision/widgets.py')}}}
+                                       'fastai.vision.widgets.widget': ('vision.widgets.html#widget', 'fastai/vision/widgets.py')}}}
\ No newline at end of file
diff --git a/fastai/learner.py b/fastai/learner.py
index dabee8898e..c37b7fb45b 100644
--- a/fastai/learner.py
+++ b/fastai/learner.py
@@ -594,13 +594,25 @@ def _valid_mets(self):
         if getattr(self, 'cancel_valid', False): return L()
         return (L(self.loss) + self.metrics if self.valid_metrics else L())
 
-    def plot_loss(self, skip_start=5, with_valid=True):
-        plt.plot(list(range(skip_start, len(self.losses))), self.losses[skip_start:], label='train')
+    def plot_loss(self, skip_start=5, with_valid=True, log=False, show_epochs=False, ax=None):
+        if not ax:
+            ax=plt.gca()
+        if log:
+            ax.loglog(list(range(skip_start, len(self.losses))), self.losses[skip_start:], label='train')
+        else:
+            ax.plot(list(range(skip_start, len(self.losses))), self.losses[skip_start:], label='train')
+        if show_epochs:
+            for x in self.iters:
+                ax.axvline(x, color='grey', ls=':')
+        ax.set_ylabel('loss')
+        ax.set_xlabel('steps')
+        ax.set_title('learning curve')
         if with_valid:
             idx = (np.array(self.iters)<skip_start).sum()
             valid_col = self.metric_names.index('valid_loss') - 1 
-            plt.plot(self.iters[idx:], L(self.values[idx:]).itemgot(valid_col), label='valid')
-            plt.legend()
+            ax.plot(self.iters[idx:], L(self.values[idx:]).itemgot(valid_col), label='valid')
+            ax.legend()
+        return ax
 
 # %% ../nbs/13a_learner.ipynb 136
 add_docs(Recorder,
@@ -610,7 +622,7 @@ def plot_loss(self, skip_start=5, with_valid=True):
          after_validate = "Log loss and metric values on the validation set",
          after_cancel_train = "Ignore training metrics for this epoch",
          after_cancel_validate = "Ignore validation metrics for this epoch",
-         plot_loss = "Plot the losses from `skip_start` and onward")
+         plot_loss = "Plot the losses from `skip_start` and onward. Optionally `log=True` for logarithmic axis, `show_epochs=True` for indicate epochs and a matplotlib axis `ax` to plot on.")
 
 if Recorder not in defaults.callbacks: defaults.callbacks.append(Recorder)
 
diff --git a/fastai/metrics.py b/fastai/metrics.py
index cc204bdd37..bd4b3a92cb 100644
--- a/fastai/metrics.py
+++ b/fastai/metrics.py
@@ -428,7 +428,7 @@ def accumulate(self, learn):
                     c,t = self.get_correct_ngrams(pred, targ, i+1, max_n=self.vocab_sz)
                     if c == 0:
                         smooth_mteval *= 2
-                        c = 1 / smooth_mteval    # exp smoothing, method 3 from https://aclanthology.org/W14-3346/
+                        c = 1 / smooth_mteval    # exp smoothing, method 3 from http://acl2014.org/acl2014/W14-33/pdf/W14-3346.pdf
                     self.corrects[i] += c
                     self.counts[i]   += t
 

From c8651c50b4e9460de5416ea83c9eb8b386cfc240 Mon Sep 17 00:00:00 2001
From: ET <57718207+turbotimon@users.noreply.github.com>
Date: Thu, 16 Nov 2023 13:30:02 +0000
Subject: [PATCH 4/5] execute nbdev_export (manually reset _modidx.py)

---
 fastai/learner.py | 22 +++++++++++++++++-----
 1 file changed, 17 insertions(+), 5 deletions(-)

diff --git a/fastai/learner.py b/fastai/learner.py
index dabee8898e..c37b7fb45b 100644
--- a/fastai/learner.py
+++ b/fastai/learner.py
@@ -594,13 +594,25 @@ def _valid_mets(self):
         if getattr(self, 'cancel_valid', False): return L()
         return (L(self.loss) + self.metrics if self.valid_metrics else L())
 
-    def plot_loss(self, skip_start=5, with_valid=True):
-        plt.plot(list(range(skip_start, len(self.losses))), self.losses[skip_start:], label='train')
+    def plot_loss(self, skip_start=5, with_valid=True, log=False, show_epochs=False, ax=None):
+        if not ax:
+            ax=plt.gca()
+        if log:
+            ax.loglog(list(range(skip_start, len(self.losses))), self.losses[skip_start:], label='train')
+        else:
+            ax.plot(list(range(skip_start, len(self.losses))), self.losses[skip_start:], label='train')
+        if show_epochs:
+            for x in self.iters:
+                ax.axvline(x, color='grey', ls=':')
+        ax.set_ylabel('loss')
+        ax.set_xlabel('steps')
+        ax.set_title('learning curve')
         if with_valid:
             idx = (np.array(self.iters)<skip_start).sum()
             valid_col = self.metric_names.index('valid_loss') - 1 
-            plt.plot(self.iters[idx:], L(self.values[idx:]).itemgot(valid_col), label='valid')
-            plt.legend()
+            ax.plot(self.iters[idx:], L(self.values[idx:]).itemgot(valid_col), label='valid')
+            ax.legend()
+        return ax
 
 # %% ../nbs/13a_learner.ipynb 136
 add_docs(Recorder,
@@ -610,7 +622,7 @@ def plot_loss(self, skip_start=5, with_valid=True):
          after_validate = "Log loss and metric values on the validation set",
          after_cancel_train = "Ignore training metrics for this epoch",
          after_cancel_validate = "Ignore validation metrics for this epoch",
-         plot_loss = "Plot the losses from `skip_start` and onward")
+         plot_loss = "Plot the losses from `skip_start` and onward. Optionally `log=True` for logarithmic axis, `show_epochs=True` for indicate epochs and a matplotlib axis `ax` to plot on.")
 
 if Recorder not in defaults.callbacks: defaults.callbacks.append(Recorder)
 

From f20692835425637038ad8e69ee687fd94db330ab Mon Sep 17 00:00:00 2001
From: ET <57718207+turbotimon@users.noreply.github.com>
Date: Thu, 16 Nov 2023 13:40:24 +0000
Subject: [PATCH 5/5] reset _modidx.py

---
 fastai/_modidx.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fastai/_modidx.py b/fastai/_modidx.py
index 0459768a76..5a1b6f7b33 100644
--- a/fastai/_modidx.py
+++ b/fastai/_modidx.py
@@ -2691,4 +2691,4 @@
                                        'fastai.vision.widgets._update_children': ( 'vision.widgets.html#_update_children',
                                                                                    'fastai/vision/widgets.py'),
                                        'fastai.vision.widgets.carousel': ('vision.widgets.html#carousel', 'fastai/vision/widgets.py'),
-                                       'fastai.vision.widgets.widget': ('vision.widgets.html#widget', 'fastai/vision/widgets.py')}}}
\ No newline at end of file
+                                       'fastai.vision.widgets.widget': ('vision.widgets.html#widget', 'fastai/vision/widgets.py')}}}