X-Git-Url: https://fleuret.org/cgi-bin/gitweb/gitweb.cgi?a=blobdiff_plain;f=cnn-svrt.py;h=283f02ba22ac7b3ad9825fea05f699db82e70bda;hb=c5660d2adc37f116088867ae71f66a89b34c94f1;hp=8b8ec124e0545feb873d059491032c4277159299;hpb=0b891219d91e981f96e5321bcf0db6c3beea0017;p=pysvrt.git

diff --git a/cnn-svrt.py b/cnn-svrt.py
index 8b8ec12..283f02b 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)
@@ -167,47 +176,72 @@ def nb_errors(model, data_set):
 for arg in vars(args):
     log_string('argument ' + str(arg) + ' ' + str(getattr(args, arg)))
 
+######################################################################
+
 for problem_number in range(1, 24):
-    if args.compress_vignettes:
-        train_set = CompressedVignetteSet(problem_number, args.nb_train_batches, args.batch_size,
-                                          cuda=torch.cuda.is_available())
-        test_set = CompressedVignetteSet(problem_number, args.nb_test_batches, args.batch_size,
-                                         cuda=torch.cuda.is_available())
-    else:
-        train_set = VignetteSet(problem_number, args.nb_train_batches, args.batch_size,
-                                          cuda=torch.cuda.is_available())
-        test_set = VignetteSet(problem_number, args.nb_test_batches, args.batch_size,
-                                          cuda=torch.cuda.is_available())
+
+    log_string('**** problem ' + str(problem_number) + ' ****')
 
     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()
+    for p in model.parameters(): nb_parameters += p.numel()
     log_string('nb_parameters {:d}'.format(nb_parameters))
 
-    model_filename = model.name + '_' + str(problem_number) + '_' + str(train_set.nb_batches) + '.param'
-
+    need_to_train = False
     try:
         model.load_state_dict(torch.load(model_filename))
         log_string('loaded_model ' + model_filename)
     except:
-        log_string('training_model')
+        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,
+                                              cuda=torch.cuda.is_available())
+        else:
+            train_set = VignetteSet(problem_number,
+                                    args.nb_train_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)
 
-    nb_train_errors = nb_errors(model, train_set)
+        nb_train_errors = nb_errors(model, train_set)
 
-    log_string('train_error {:d} {:.02f}% {:d} {:d}'.format(
-        problem_number,
-        100 * nb_train_errors / train_set.nb_samples,
-        nb_train_errors,
-        train_set.nb_samples)
-    )
+        log_string('train_error {:d} {:.02f}% {:d} {:d}'.format(
+            problem_number,
+            100 * nb_train_errors / train_set.nb_samples,
+            nb_train_errors,
+            train_set.nb_samples)
+        )
+
+    if args.compress_vignettes:
+        test_set = CompressedVignetteSet(problem_number,
+                                         args.nb_test_batches, args.batch_size,
+                                         cuda=torch.cuda.is_available())
+    else:
+        test_set = VignetteSet(problem_number,
+                               args.nb_test_batches, args.batch_size,
+                               cuda=torch.cuda.is_available())
 
     nb_test_errors = nb_errors(model, test_set)
 
@@ -218,4 +252,5 @@ for problem_number in range(1, 24):
         test_set.nb_samples)
     )
 
+
 ######################################################################