Commit 2fbfda0d authored by Myle Ott's avatar Myle Ott
Browse files

Merge internal changes

parent 93fec886

fairseq/data/__init__.py

+1 −1
Changes for fairseq/data/__init__.py: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ 


from .dictionary import Dictionary

from .fairseq_dataset import FairseqDataset

from .indexed_dataset import IndexedInMemoryDataset, IndexedRawTextDataset

from .indexed_dataset import IndexedDataset, IndexedInMemoryDataset, IndexedRawTextDataset  # noqa: F401

from .language_pair_dataset import LanguagePairDataset

from .monolingual_dataset import MonolingualDataset

from .token_block_dataset import TokenBlockDataset

fairseq/models/fconv.py

+9 −9
Changes for fairseq/models/fconv.py: 9 added lines, 9 removed lines.
Original line number Diff line number Diff line
@@ -268,16 +268,16 @@ class FConvEncoder(FairseqEncoder): 
            'encoder_padding_mask': encoder_padding_mask,  # B x T

        }



    def reorder_encoder_out(self, encoder_out_dict, new_order):

        if encoder_out_dict['encoder_out'] is not None:

            encoder_out_dict['encoder_out'] = (

                encoder_out_dict['encoder_out'][0].index_select(0, new_order),

                encoder_out_dict['encoder_out'][1].index_select(0, new_order),

    def reorder_encoder_out(self, encoder_out, new_order):

        if encoder_out['encoder_out'] is not None:

            encoder_out['encoder_out'] = (

                encoder_out['encoder_out'][0].index_select(0, new_order),

                encoder_out['encoder_out'][1].index_select(0, new_order),

            )

        if encoder_out_dict['encoder_padding_mask'] is not None:

            encoder_out_dict['encoder_padding_mask'] = \

                encoder_out_dict['encoder_padding_mask'].index_select(0, new_order)

        return encoder_out_dict

        if encoder_out['encoder_padding_mask'] is not None:

            encoder_out['encoder_padding_mask'] = \

                encoder_out['encoder_padding_mask'].index_select(0, new_order)

        return encoder_out



    def max_positions(self):

        """Maximum input length supported by the encoder."""

fairseq/models/fconv_self_att.py

+7 −7
Changes for fairseq/models/fconv_self_att.py: 7 added lines, 7 removed lines.
Original line number Diff line number Diff line
@@ -226,18 +226,18 @@ class FConvEncoder(FairseqEncoder): 
            'encoder_out': (x, y),

        }



    def reorder_encoder_out(self, encoder_out_dict, new_order):

        encoder_out_dict['encoder_out'] = tuple(

            eo.index_select(0, new_order) for eo in encoder_out_dict['encoder_out']

    def reorder_encoder_out(self, encoder_out, new_order):

        encoder_out['encoder_out'] = tuple(

            eo.index_select(0, new_order) for eo in encoder_out['encoder_out']

        )



        if 'pretrained' in encoder_out_dict:

            encoder_out_dict['pretrained']['encoder_out'] = tuple(

        if 'pretrained' in encoder_out:

            encoder_out['pretrained']['encoder_out'] = tuple(

                eo.index_select(0, new_order)

                for eo in encoder_out_dict['pretrained']['encoder_out']

                for eo in encoder_out['pretrained']['encoder_out']

            )



        return encoder_out_dict

        return encoder_out



    def max_positions(self):

        """Maximum input length supported by the encoder."""

fairseq/models/lstm.py

+7 −7
Changes for fairseq/models/lstm.py: 7 added lines, 7 removed lines.
Original line number Diff line number Diff line
@@ -237,15 +237,15 @@ class LSTMEncoder(FairseqEncoder): 
            'encoder_padding_mask': encoder_padding_mask if encoder_padding_mask.any() else None

        }



    def reorder_encoder_out(self, encoder_out_dict, new_order):

        encoder_out_dict['encoder_out'] = tuple(

    def reorder_encoder_out(self, encoder_out, new_order):

        encoder_out['encoder_out'] = tuple(

            eo.index_select(1, new_order)

            for eo in encoder_out_dict['encoder_out']

            for eo in encoder_out['encoder_out']

        )

        if encoder_out_dict['encoder_padding_mask'] is not None:

            encoder_out_dict['encoder_padding_mask'] = \

                encoder_out_dict['encoder_padding_mask'].index_select(1, new_order)

        return encoder_out_dict

        if encoder_out['encoder_padding_mask'] is not None:

            encoder_out['encoder_padding_mask'] = \

                encoder_out['encoder_padding_mask'].index_select(1, new_order)

        return encoder_out



    def max_positions(self):

        """Maximum input length supported by the encoder."""

fairseq/models/transformer.py

+8 −8
Changes for fairseq/models/transformer.py: 8 added lines, 8 removed lines.
Original line number Diff line number Diff line
@@ -225,14 +225,14 @@ class TransformerEncoder(FairseqEncoder): 
            'encoder_padding_mask': encoder_padding_mask,  # B x T

        }



    def reorder_encoder_out(self, encoder_out_dict, new_order):

        if encoder_out_dict['encoder_out'] is not None:

            encoder_out_dict['encoder_out'] = \

                encoder_out_dict['encoder_out'].index_select(1, new_order)

        if encoder_out_dict['encoder_padding_mask'] is not None:

            encoder_out_dict['encoder_padding_mask'] = \

                encoder_out_dict['encoder_padding_mask'].index_select(0, new_order)

        return encoder_out_dict

    def reorder_encoder_out(self, encoder_out, new_order):

        if encoder_out['encoder_out'] is not None:

            encoder_out['encoder_out'] = \

                encoder_out['encoder_out'].index_select(1, new_order)

        if encoder_out['encoder_padding_mask'] is not None:

            encoder_out['encoder_padding_mask'] = \

                encoder_out['encoder_padding_mask'].index_select(0, new_order)

        return encoder_out



    def max_positions(self):

        """Maximum input length supported by the encoder."""