X-Git-Url: https://fleuret.org/cgi-bin/gitweb/gitweb.cgi?p=pysvrt.git;a=blobdiff_plain;f=cnn-svrt.py;h=a6b9cabdb8e1ebbf2c961549bd0764d8c0466e05;hp=0c63b85f184470bfed0e9d8daf7bb1e395234bda;hb=HEAD;hpb=24789240ca5395a857c16e602a2d0f5e8cb176d8

diff --git a/cnn-svrt.py b/cnn-svrt.py
index 0c63b85..a6b9cab 100755
--- a/cnn-svrt.py
+++ b/cnn-svrt.py
@@ -29,10 +29,7 @@ import distutils.util
 import re
 import signal
 
-try:
-    from colorama import Fore, Back, Style
-except ImportError:
-    Fore, Back, Style = '', '', ''
+from colorama import Fore, Back, Style
 
 # Pytorch
 
@@ -445,7 +442,7 @@ class vignette_logger():
             )
             self.last_t = t
 
-def save_examplar_vignettes(data_set, nb, name):
+def save_exemplar_vignettes(data_set, nb, name):
     n = torch.randperm(data_set.nb_samples).narrow(0, 0, nb)
 
     for k in range(0, nb):
@@ -496,7 +493,7 @@ for problem_number in map(int, args.problems.split(',')):
 
     model_filename = model.name + '_pb:' + \
                      str(problem_number) + '_ns:' + \
-                     int_to_suffix(args.nb_train_samples) + '.state'
+                     int_to_suffix(args.nb_train_samples) + '.pth'
 
     nb_parameters = 0
     for p in model.parameters(): nb_parameters += p.numel()
@@ -532,8 +529,8 @@ for problem_number in map(int, args.problems.split(',')):
         )
 
         if args.nb_exemplar_vignettes > 0:
-            save_examplar_vignettes(train_set, args.nb_exemplar_vignettes,
-                                    'examplar_{:d}.png'.format(problem_number))
+            save_exemplar_vignettes(train_set, args.nb_exemplar_vignettes,
+                                    'exemplar_{:d}.png'.format(problem_number))
 
         if args.validation_error_threshold > 0.0:
             validation_set = VignetteSet(problem_number,