Merge branch 'master' into interactive_NMT

# Conflicts: # model_zoo.py
lvapeab · Apr 20, 2017 · 8c2cd97 · 8c2cd97
2 parents d1b8c97 + e615382
commit 8c2cd97
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 367 deletions.
diff --git a/main.py b/main.py
@@ -64,7 +64,7 @@ def train_model(params):
 
     # Build model
     if params['RELOAD'] == 0:  # build new model
-        nmt_model = TranslationModel(params, type=params['MODEL_TYPE'], verbose=params['VERBOSE'],
+        nmt_model = TranslationModel(params, model_type=params['MODEL_TYPE'], verbose=params['VERBOSE'],
                                      model_name=params['MODEL_NAME'], vocabularies=dataset.vocabulary,
                                      store_path=params['STORE_PATH'])
         dict2pkl(params, params['STORE_PATH'] + '/config')
@@ -86,7 +86,7 @@ def train_model(params):
 
     else:  # resume from previously trained model
         nmt_model = TranslationModel(params,
-                                     type=params['MODEL_TYPE'],
+                                     model_type=params['MODEL_TYPE'],
                                      verbose=params['VERBOSE'],
                                      model_name=params['MODEL_NAME'],
                                      vocabularies=dataset.vocabulary,