JacobLinCool commited on
Commit
caeb41d
·
verified ·
1 Parent(s): c4ed75c

Fixed-BPM grid + piecewise fit + dual-mode support

Browse files
Files changed (1) hide show
  1. softchart/model.py +17 -2
softchart/model.py CHANGED
@@ -18,6 +18,21 @@ def sinusoidal(length, dim):
18
  return emb
19
 
20
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
21
  class ChartModel(nn.Module):
22
  def __init__(
23
  self,
@@ -139,8 +154,8 @@ class ChartModel(nn.Module):
139
  def enable_ptr(self):
140
  self.ptr = nn.Linear(self.d_model, self.d_model)
141
 
142
- def enable_beat(self):
143
- self.beat = nn.Linear(self.d_model, 2)
144
 
145
  def forward(self, mel, tgt, return_aux=False, gsum=None, pos_bucket=None,
146
  return_extras=False, in_tgt=None):
 
18
  return emb
19
 
20
 
21
+ class BeatHiRes(nn.Module):
22
+ """Frame-resolution beat/downbeat head: encoder states (T/4) are
23
+ upsampled 4x so supervision and peaks live on the 11.6 ms frame grid
24
+ instead of 46 ms encoder bins (4x finer timing per peak)."""
25
+
26
+ def __init__(self, d):
27
+ super().__init__()
28
+ self.up = nn.ConvTranspose1d(d, d // 2, 4, stride=4)
29
+ self.out = nn.Conv1d(d // 2, 2, 3, padding=1)
30
+
31
+ def forward(self, mem): # (B, L, d) -> (B, 4L, 2)
32
+ h = nn.functional.gelu(self.up(mem.transpose(1, 2)))
33
+ return self.out(h).transpose(1, 2)
34
+
35
+
36
  class ChartModel(nn.Module):
37
  def __init__(
38
  self,
 
154
  def enable_ptr(self):
155
  self.ptr = nn.Linear(self.d_model, self.d_model)
156
 
157
+ def enable_beat(self, hires=False):
158
+ self.beat = BeatHiRes(self.d_model) if hires else nn.Linear(self.d_model, 2)
159
 
160
  def forward(self, mel, tgt, return_aux=False, gsum=None, pos_bucket=None,
161
  return_extras=False, in_tgt=None):