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

diff --git a/cnn-svrt.py b/cnn-svrt.py
index 6645ac1..aa3690d 100755
--- a/cnn-svrt.py
+++ b/cnn-svrt.py
@@ -78,11 +78,20 @@ args = parser.parse_args()
 ######################################################################
 
 log_file = open(args.log_file, 'w')
+pred_log_t = None
 
 print(Fore.RED + 'Logging into ' + args.log_file + Style.RESET_ALL)
 
 def log_string(s):
-    s = Fore.GREEN + time.ctime() + Style.RESET_ALL + ' ' + s
+    global pred_log_t
+    t = time.time()
+
+    if pred_log_t is None:
+        elapsed = 'start'
+    else:
+        elapsed = '+{:.02f}s'.format(t - pred_log_t)
+    pred_log_t = t
+    s = Fore.BLUE + time.ctime() + ' ' + Fore.GREEN + elapsed + Style.RESET_ALL + ' ' + s
     log_file.write(s + '\n')
     log_file.flush()
     print(s)
@@ -171,28 +180,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 +221,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)