update

toolbox/torchaudio/models/spectrum_dfnet/modeling_spectrum_dfnet.py

@@ -387,11 +387,11 @@ class Encoder(nn.Module):
             nn.ReLU(inplace=True)
         )
 
-        # if config.encoder_combine_op == "concat":
-        #     self.embedding_input_size *= 2
-        #     self.combine = Concat()
-        # else:
-        #     self.combine = Add()
+        if config.encoder_combine_op == "concat":
+            self.embedding_input_size *= 2
+            self.combine = Concat()
+        else:
+            self.combine = Add()
 
         # emb_gru
         if config.spec_bins % 8 != 0:
@@ -431,18 +431,18 @@ class Encoder(nn.Module):
         # e2 shape: [batch_size, channels, time_steps, spec_dim // 4]
         # e3 shape: [batch_size, channels, time_steps, spec_dim // 4]
 
-        # # feat_spec, shape: (batch_size, 2, time_steps, df_bins)
-        # c0 = self.df_conv0(feat_spec)
-        # c1 = self.df_conv1(c0)
-        # # c0 shape: [batch_size, channels, time_steps, df_bins]
-        # # c1 shape: [batch_size, channels, time_steps, df_bins // 2]
-        #
-        # cemb = c1.permute(0, 2, 3, 1)
-        # # cemb shape: [batch_size, time_steps, df_bins // 2, channels]
-        # cemb = cemb.flatten(2)
-        # # cemb shape: [batch_size, time_steps, df_bins // 2 * channels]
-        # cemb = self.df_fc_emb(cemb)
-        # # cemb shape: [batch_size, time_steps, spec_dim // 4 * channels]
+        # feat_spec, shape: (batch_size, 2, time_steps, df_bins)
+        c0 = self.df_conv0(feat_spec)
+        c1 = self.df_conv1(c0)
+        # c0 shape: [batch_size, channels, time_steps, df_bins]
+        # c1 shape: [batch_size, channels, time_steps, df_bins // 2]
+
+        cemb = c1.permute(0, 2, 3, 1)
+        # cemb shape: [batch_size, time_steps, df_bins // 2, channels]
+        cemb = cemb.flatten(2)
+        # cemb shape: [batch_size, time_steps, df_bins // 2 * channels]
+        cemb = self.df_fc_emb(cemb)
+        # cemb shape: [batch_size, time_steps, spec_dim // 4 * channels]
 
         # e3 shape: [batch_size, channels, time_steps, spec_dim // 4]
         emb = e3.permute(0, 2, 3, 1)
@@ -450,7 +450,7 @@ class Encoder(nn.Module):
         emb = emb.flatten(2)
         # emb shape: [batch_size, time_steps, spec_dim // 4 * channels]
 
-        # emb = self.combine(emb, cemb)
+        emb = self.combine(emb, cemb)
         # if concat; emb shape: [batch_size, time_steps, spec_dim // 4 * channels * 2]
         # if add; emb shape: [batch_size, time_steps, spec_dim // 4 * channels]
 
@@ -461,8 +461,7 @@ class Encoder(nn.Module):
         lsnr = self.lsnr_fc(emb) * self.lsnr_scale + self.lsnr_offset
         # lsnr shape: [batch_size, time_steps, 1]
 
-        # return e0, e1, e2, e3, emb, c0, lsnr, h
-        return e0, e1, e2, e3, emb, lsnr, h
+        return e0, e1, e2, e3, emb, c0, lsnr, h
 
 
 class Decoder(nn.Module):