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

diff --git a/cnn-svrt.py b/cnn-svrt.py
index aa3690d..283f02b 100755
--- a/cnn-svrt.py
+++ b/cnn-svrt.py
@@ -180,6 +180,8 @@ for arg in vars(args):
 
 for problem_number in range(1, 24):
 
+    log_string('**** problem ' + str(problem_number) + ' ****')
+
     model = AfrozeShallowNet()
 
     if torch.cuda.is_available():
@@ -210,16 +212,10 @@ for problem_number in range(1, 24):
             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 + test_set.nb_samples) / (time.time() - t))
@@ -238,13 +234,23 @@ for problem_number in range(1, 24):
             train_set.nb_samples)
         )
 
-        nb_test_errors = nb_errors(model, test_set)
+    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)
+
+    log_string('test_error {:d} {:.02f}% {:d} {:d}'.format(
+        problem_number,
+        100 * nb_test_errors / test_set.nb_samples,
+        nb_test_errors,
+        test_set.nb_samples)
+    )
 
-        log_string('test_error {:d} {:.02f}% {:d} {:d}'.format(
-            problem_number,
-            100 * nb_test_errors / test_set.nb_samples,
-            nb_test_errors,
-            test_set.nb_samples)
-        )
 
 ######################################################################