f

README.md

@@ -1,6 +1,6 @@
 ---
 title: Speech analysis
-emoji: 📉
+emoji: 💤
 colorFrom: gray
 colorTo: gray
 sdk: gradio

app.py

@@ -69,9 +69,8 @@ class AgeGenderModel(Wav2Vec2PreTrainedModel):
 
         return hidden_states, logits_age, logits_gender
     
-    
-    
-# Fusion = AgeWav2Vec2Model forward() will accept already computed CNN7 features from ExpressioNmodel forward()
+# AgeGenderModel.forward() is switched to accept computed frozen CNN7 features from ExpressioNmodel
+
 def _forward(
     self,
     frozen_cnn7=None,  # CNN7 fetures of wav2vec2 calc. from CNN7 feature extractor (once)
@@ -94,10 +93,6 @@ def _forward(
         return_dict=None,
     )[0]
 
-    if self.wav2vec2.adapter is not None:
-        raise ValueError
-        hidden_states = self.adapter(hidden_states)
-
     return hidden_states
 
 
@@ -125,13 +120,7 @@ def _forward_and_cnn7(
         return_dict=None,
     )[0]
 
-    if self.wav2vec2.adapter is not None:
-        raise ValueError
-        hidden_states = self.adapter(hidden_states)
-
-    return hidden_states, frozen_cnn7  # feature_proj is trainable thus we have to access the frozen_cnn7 before projection layer
-
-# Fusion ============================= End
+    return hidden_states, frozen_cnn7 #feature_proj is trainable thus we have to access the frozen_cnn7 before projection layer
 
 
 class ExpressionHead(nn.Module):