ggerganov commited on
Commit
d717a20
·
unverified ·
1 Parent(s): c012035

whisper : fix overriding the audio context

Browse files
Files changed (1) hide show
  1. whisper.cpp +10 -12
whisper.cpp CHANGED
@@ -1732,22 +1732,20 @@ static struct ggml_cgraph * whisper_build_graph_conv(
1732
  // convolution + gelu
1733
  {
1734
  cur = ggml_conv_1d_ph(ctx0, model.e_conv_1_w, mel, 1, 1);
1735
- cur = ggml_add(ctx0, cur, model.e_conv_1_b);
1736
- //cur = ggml_add(ctx0,
1737
- // ggml_repeat(ctx0,
1738
- // model.e_conv_1_b,
1739
- // cur),
1740
- // cur);
1741
 
1742
  cur = ggml_gelu(ctx0, cur);
1743
 
1744
  cur = ggml_conv_1d_ph(ctx0, model.e_conv_2_w, cur, 2, 1);
1745
- cur = ggml_add(ctx0, cur, model.e_conv_2_b);
1746
- //cur = ggml_add(ctx0,
1747
- // ggml_repeat(ctx0,
1748
- // model.e_conv_2_b,
1749
- // cur),
1750
- // cur);
1751
 
1752
  cur = ggml_gelu(ctx0, cur);
1753
  }
 
1732
  // convolution + gelu
1733
  {
1734
  cur = ggml_conv_1d_ph(ctx0, model.e_conv_1_w, mel, 1, 1);
1735
+ if (n_ctx == hparams.n_audio_ctx) {
1736
+ cur = ggml_add(ctx0, cur, model.e_conv_1_b);
1737
+ } else {
1738
+ cur = ggml_add(ctx0, cur, ggml_cont(ctx0, ggml_view_2d(ctx0, model.e_conv_1_b, cur->ne[0], cur->ne[1], model.e_conv_1_b->nb[1], 0)));
1739
+ }
 
1740
 
1741
  cur = ggml_gelu(ctx0, cur);
1742
 
1743
  cur = ggml_conv_1d_ph(ctx0, model.e_conv_2_w, cur, 2, 1);
1744
+ if (n_ctx == hparams.n_audio_ctx) {
1745
+ cur = ggml_add(ctx0, cur, model.e_conv_2_b);
1746
+ } else {
1747
+ cur = ggml_add(ctx0, cur, ggml_cont(ctx0, ggml_view_2d(ctx0, model.e_conv_2_b, cur->ne[0], cur->ne[1], model.e_conv_2_b->nb[1], 0)));
1748
+ }
 
1749
 
1750
  cur = ggml_gelu(ctx0, cur);
1751
  }