fix outstanding issues

lium-lst · Feb 20, 2020 · 03d0213 · 03d0213
1 parent 409590f
commit 03d0213
Show file tree

Hide file tree

Showing 7 changed files with 4 additions and 66 deletions.
diff --git a/nmtpytorch/datasets/__init__.py b/nmtpytorch/datasets/__init__.py
@@ -3,7 +3,6 @@
 from .kaldi import KaldiDataset
 from .imagefolder import ImageFolderDataset
 from .text import TextDataset
-from .onehot import OneHotDataset
 from .numpy_sequence import NumpySequenceDataset
 from .label import LabelDataset
 from .shelve import ShelveDataset
@@ -16,7 +15,6 @@ def get_dataset(type_):
         'kaldi': KaldiDataset,
         'imagefolder': ImageFolderDataset,
         'text': TextDataset,
-        'onehot': OneHotDataset,
         'label': LabelDataset,
         'shelve': ShelveDataset,
     }[type_.lower()]

diff --git a/nmtpytorch/datasets/onehot.py b/nmtpytorch/datasets/onehot.py
diff --git a/nmtpytorch/layers/encoders/__init__.py b/nmtpytorch/layers/encoders/__init__.py
@@ -1,4 +1,3 @@
-from .feature import FeatureEncoder
 from .image import ImageEncoder
 from .text import TextEncoder
 from .bilstmp import BiLSTMp

diff --git a/nmtpytorch/models/asr.py b/nmtpytorch/models/asr.py
@@ -86,7 +86,7 @@ def __init__(self, opts):
 
         # Load vocabularies here
         for name, fname in self.opts.vocabulary.items():
-            self.vocabs[name] = Vocabulary(fname, name=name)
+            self.vocabs[name] = Vocabulary(fname)
 
         # Inherently non multi-lingual aware
         self.src = self.topology.first_src

diff --git a/nmtpytorch/models/nmt.py b/nmtpytorch/models/nmt.py
@@ -86,8 +86,7 @@ def __init__(self, opts):
 
         # Load vocabularies here
         for name, fname in self.opts.vocabulary.items():
-            self.vocabs[name] = Vocabulary(
-                fname, name=name, short_list=self.opts.model['short_list'])
+            self.vocabs[name] = Vocabulary(fname, short_list=self.opts.model['short_list'])
 
         # Inherently non multi-lingual aware
         slangs = self.topology.get_src_langs()

diff --git a/nmtpytorch/models/stale/acapt.py b/nmtpytorch/models/stale/acapt.py
@@ -79,7 +79,7 @@ def __init__(self, opts):
 
         # Load vocabularies here
         for name, fname in self.opts.vocabulary.items():
-            self.vocabs[name] = Vocabulary(fname, name=name)
+            self.vocabs[name] = Vocabulary(fname)
 
         # Inherently non multi-lingual aware
         tlangs = self.topology.get_trg_langs()

diff --git a/nmtpytorch/models/stale/nli.py b/nmtpytorch/models/stale/nli.py
@@ -67,7 +67,7 @@ def __init__(self, opts):
 
         # Load vocabularies here
         for name, fname in self.opts.vocabulary.items():
-            self.vocabs[name] = Vocabulary(fname, name=name)
+            self.vocabs[name] = Vocabulary(fname)
 
     def __repr__(self):
         s = super().__repr__() + '\n'