Fix Spectrogram transform and SpecBlock

warner-benjamin · May 18, 2024 · e6b2c39 · e6b2c39
2 parents 7c52688 + b7a37df
commit e6b2c39
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 10 deletions.
diff --git a/fastxtend/audio/data.py b/fastxtend/audio/data.py
@@ -58,7 +58,6 @@ def __init__(self,
         center:Listified[bool]=True,
         pad_mode:Listified[str]="reflect",
         onesided:Listified[bool]=True,
-        norm:Listified[str]|None=None
     ):
         super().__init__()
         listify_store_attr()
@@ -73,15 +72,15 @@ def __init__(self,
                                                      window_fn=self.window_fn[i], power=self.power[i],
                                                      normalized=self.normalized[i], wkwargs=self.wkwargs[i],
                                                      center=self.center[i], pad_mode=self.pad_mode[i],
-                                                     onesided=self.onesided[i], norm=self.norm[i]))
+                                                     onesided=self.onesided[i]))
 
                 self._attrs.append({k:v[i] for k,v in self._get_attrs().items()})
         else:
             self.multiple = False
             self.spec = tatfms.Spectrogram(n_fft=self.n_fft, win_length=self.win_length, hop_length=self.hop_length,
                                            pad=self.pad, window_fn=self.window_fn, power=self.power,
                                            normalized=self.normalized, wkwargs=self.wkwargs, center=self.center,
-                                           pad_mode=self.pad_mode, onesided=self.onesided, norm=self.norm)
+                                           pad_mode=self.pad_mode, onesided=self.onesided)
 
             self._attrs = {k:v for k,v in self._get_attrs().items()}
 
@@ -195,13 +194,12 @@ def SpecBlock(cls=TensorAudio,
     wkwargs:Listified[dict]|None=None,
     center:Listified[bool]=True,
     pad_mode:Listified[str]="reflect",
-    norm:Listified[str]|None=None
 ):
     "A `TransformBlock` to read `TensorAudio` and then use the GPU to turn audio into one or more `Spectrogram`s"
     return TransformBlock(type_tfms=cls.create,
                           batch_tfms=[Spectrogram(n_fft=n_fft, win_length=win_length, hop_length=hop_length,
                                                   pad=pad, window_fn=window_fn, power=power, normalized=normalized,
-                                                  wkwargs=wkwargs, center=center, pad_mode=pad_mode, norm=norm)])
+                                                  wkwargs=wkwargs, center=center, pad_mode=pad_mode)])
 
 # %% ../../nbs/audio.02_data.ipynb 14
 def MelSpecBlock(cls=TensorAudio,

diff --git a/nbs/audio.02_data.ipynb b/nbs/audio.02_data.ipynb
@@ -121,7 +121,6 @@
     "        center:Listified[bool]=True,\n",
     "        pad_mode:Listified[str]=\"reflect\",\n",
     "        onesided:Listified[bool]=True,\n",
-    "        norm:Listified[str]|None=None\n",
     "    ):\n",
     "        super().__init__()\n",
     "        listify_store_attr()\n",
@@ -136,15 +135,15 @@
     "                                                     window_fn=self.window_fn[i], power=self.power[i],\n",
     "                                                     normalized=self.normalized[i], wkwargs=self.wkwargs[i],\n",
     "                                                     center=self.center[i], pad_mode=self.pad_mode[i],\n",
-    "                                                     onesided=self.onesided[i], norm=self.norm[i]))\n",
+    "                                                     onesided=self.onesided[i]))\n",
     "\n",
     "                self._attrs.append({k:v[i] for k,v in self._get_attrs().items()})\n",
     "        else:\n",
     "            self.multiple = False\n",
     "            self.spec = tatfms.Spectrogram(n_fft=self.n_fft, win_length=self.win_length, hop_length=self.hop_length,\n",
     "                                           pad=self.pad, window_fn=self.window_fn, power=self.power,\n",
     "                                           normalized=self.normalized, wkwargs=self.wkwargs, center=self.center,\n",
-    "                                           pad_mode=self.pad_mode, onesided=self.onesided, norm=self.norm)\n",
+    "                                           pad_mode=self.pad_mode, onesided=self.onesided)\n",
     "\n",
     "            self._attrs = {k:v for k,v in self._get_attrs().items()}\n",
     "\n",
@@ -294,13 +293,12 @@
     "    wkwargs:Listified[dict]|None=None,\n",
     "    center:Listified[bool]=True,\n",
     "    pad_mode:Listified[str]=\"reflect\",\n",
-    "    norm:Listified[str]|None=None\n",
     "):\n",
     "    \"A `TransformBlock` to read `TensorAudio` and then use the GPU to turn audio into one or more `Spectrogram`s\"\n",
     "    return TransformBlock(type_tfms=cls.create,\n",
     "                          batch_tfms=[Spectrogram(n_fft=n_fft, win_length=win_length, hop_length=hop_length,\n",
     "                                                  pad=pad, window_fn=window_fn, power=power, normalized=normalized,\n",
-    "                                                  wkwargs=wkwargs, center=center, pad_mode=pad_mode, norm=norm)])"
+    "                                                  wkwargs=wkwargs, center=center, pad_mode=pad_mode)])"
    ]
   },
   {