Merge pull request #314 from kylebgorman/error

Raises error with unsupported features encoders

Author: kylebgorman

yoyodyne/models/hard_attention.py

@@ -100,7 +100,7 @@ def _loss(
     def beam_decode(self, *args, **kwargs):
         """Overrides incompatible implementation inherited from RNNModel."""
         raise NotImplementedError(
-            f"Beam search not implemented for {self.name} model"
+            f"Beam search is not supported by {self.name} model"
         )
 
     def decode(

yoyodyne/models/pointer_generator.py

@@ -211,7 +211,7 @@ def _check_layer_sizes(self) -> None:
     def beam_decode(self, *args, **kwargs):
         """Overrides incompatible implementation inherited from RNNModel."""
         raise NotImplementedError(
-            f"Beam search not implemented for {self.name} model"
+            f"Beam search is not supported by {self.name} model"
         )
 
     @abc.abstractmethod

yoyodyne/models/rnn.py

@@ -59,7 +59,7 @@ def beam_decode(
         batch_size = encoder_mask.size(0)
         if batch_size != 1:
             raise NotImplementedError(
-                "Beam search is not implemented for batch_size > 1"
+                "Beam search is not supported for batch_size > 1"
             )
         # Initializes hidden states for decoder LSTM.
         decoder_hiddens = self.init_hiddens(batch_size)
@@ -176,7 +176,16 @@ def forward(
                 log-probabilities) for each prediction; greedy search returns
                 a tensor of predictions of shape
                 B x seq_len x target_vocab_size.
+
+        Raises:
+            NotImplementedError: separate features encoders are not supported.
         """
+        # TODO(#313): add support for this.
+        if self.has_features_encoder:
+            raise NotImplementedError(
+                "Separate features encoders are not supported "
+                f"by {self.name} model"
+            )
         encoder_out = self.source_encoder(batch.source).output
         # This function has a polymorphic return because beam search needs to
         # return two tensors. For greedy, the return has not been modified to

yoyodyne/models/transducer.py

@@ -62,7 +62,7 @@ def _get_loss_func(
     def beam_decode(self, *args, **kwargs):
         """Overrides incompatible implementation inherited from RNNModel."""
         raise NotImplementedError(
-            f"Beam search not implemented for {self.name} model"
+            f"Beam search is not supported by {self.name} model"
         )
 
     @property

yoyodyne/models/transformer.py

@@ -21,8 +21,7 @@ class TransformerModel(base.BaseModel):
     """
 
     # Model arguments.
-    source_attention_heads: int
-    # Constructed inside __init__.
+    source_attention_heads: int  # Constructed inside __init__.
     classifier: nn.Linear
 
     def __init__(
@@ -57,21 +56,27 @@ def init_embeddings(
 
     def beam_decode(self, *args, **kwargs):
         raise NotImplementedError(
-            f"Beam search not implemented for {self.name} model"
+            f"Beam search is not supported by {self.name} model"
         )
 
-    def forward(
-        self,
-        batch: data.PaddedBatch,
-    ) -> torch.Tensor:
+    def forward(self, batch: data.PaddedBatch) -> torch.Tensor:
         """Runs the encoder-decoder.
 
         Args:
             batch (data.PaddedBatch).
 
         Returns:
             torch.Tensor.
+
+        Raises:
+            NotImplementedError: separate features encoders are not supported.
         """
+        # TODO(#313): add support for this.
+        if self.has_features_encoder:
+            raise NotImplementedError(
+                "Separate features encoders are not supported by "
+                "{self.name} model"
+            )
         if self.training and self.teacher_forcing:
             assert (
                 batch.has_target