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

diff --git a/cnn-svrt.py b/cnn-svrt.py
index 6645ac1..5913345 100755
--- a/cnn-svrt.py
+++ b/cnn-svrt.py
@@ -73,16 +73,29 @@ parser.add_argument('--compress_vignettes',
                     action='store_true', default = False,
                     help = 'Use lossless compression to reduce the memory footprint')
 
+parser.add_argument('--test_loaded_models',
+                    action='store_true', default = False,
+                    help = 'Should we compute the test error of models we load')
+
 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,42 +184,44 @@ 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'
+    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()
     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,
                                               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('data_generation {:0.2f} samples / s'.format(train_set.nb_samples / (time.time() - t)))
 
         train_model(model, train_set)
         torch.save(model.state_dict(), model_filename)
@@ -221,6 +236,21 @@ for problem_number in range(1, 24):
             train_set.nb_samples)
         )
 
+    if need_to_train or args.test_loaded_models:
+
+        t = time.time()
+
+        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())
+
+        log_string('data_generation {:0.2f} samples / s'.format(test_set.nb_samples / (time.time() - t)))
+
         nb_test_errors = nb_errors(model, test_set)
 
         log_string('test_error {:d} {:.02f}% {:d} {:d}'.format(