X-Git-Url: https://www.fleuret.org/cgi-bin/gitweb/gitweb.cgi?a=blobdiff_plain;f=cnn-svrt.py;h=694f035edde45339823fef4e1671ec241e0a00e2;hb=abbbb61852f54e90df6ac5b5f4dcb71d06f88f49;hp=6645ac15a55a44d40edbbde18115b8dcb9ca029c;hpb=61e13c9a3cba66d1b6dafaa14efb71e979b8af08;p=pysvrt.git

diff --git a/cnn-svrt.py b/cnn-svrt.py
index 6645ac1..694f035 100755
--- a/cnn-svrt.py
+++ b/cnn-svrt.py
@@ -171,28 +171,32 @@ for arg in vars(args):
 
 for problem_number in range(1, 24):
 
-    model_filename = model.name + '_' + \
-                     str(problem_number) + '_' + \
-                     str(args.nb_train_batches) + '.param'
-
     model = AfrozeShallowNet()
 
     if torch.cuda.is_available():
         model.cuda()
 
+    model_filename = model.name + '_' + \
+                     str(problem_number) + '_' + \
+                     str(args.nb_train_batches) + '.param'
+
     nb_parameters = 0
     for p in model.parameters(): nb_parameters += p.numel()
     log_string('nb_parameters {:d}'.format(nb_parameters))
 
+    need_to_train = False
     try:
-
         model.load_state_dict(torch.load(model_filename))
         log_string('loaded_model ' + model_filename)
-
     except:
+        need_to_train = True
+
+    if need_to_train:
 
         log_string('training_model ' + model_filename)
 
+        t = time.time()
+
         if args.compress_vignettes:
             train_set = CompressedVignetteSet(problem_number,
                                               args.nb_train_batches, args.batch_size,
@@ -208,6 +212,10 @@ for problem_number in range(1, 24):
                                    args.nb_test_batches, args.batch_size,
                                    cuda=torch.cuda.is_available())
 
+        log_string('data_generation {:0.2f} samples / s'.format(
+            (train_set.nb_samples + test_set.nb_samples) / (time.time() - t))
+        )
+
         train_model(model, train_set)
         torch.save(model.state_dict(), model_filename)
         log_string('saved_model ' + model_filename)