X-Git-Url: https://www.fleuret.org/cgi-bin/gitweb/gitweb.cgi?a=blobdiff_plain;f=main.py;h=b579177623ba6c7bbf897b06279be6f4d6ed663a;hb=02a6cbfdda55ba2ce13ff0f925009c15cc2a0a90;hp=a18beb1ecc97ea456f3ea24ea1b518f05379db65;hpb=73507ec9ff7677eefdafabe4123c9b05cab28f8f;p=mygpt.git

diff --git a/main.py b/main.py
index a18beb1..b579177 100755
--- a/main.py
+++ b/main.py
@@ -72,9 +72,18 @@ parser.add_argument('--synthesis_sampling',
 parser.add_argument('--checkpoint_name',
                     type = str, default = 'checkpoint.pth')
 
+##############################
+# picoclvr options
+
 parser.add_argument('--picoclvr_many_colors',
                     action='store_true', default = False)
 
+parser.add_argument('--picoclvr_height',
+                    type = int, default = 12)
+
+parser.add_argument('--picoclvr_width',
+                    type = int, default = 16)
+
 ######################################################################
 
 args = parser.parse_args()
@@ -118,21 +127,23 @@ import picoclvr
 class TaskPicoCLVR(Task):
 
     def __init__(self, batch_size,
-                 height = 6, width = 8, many_colors = False,
+                 height, width, many_colors = False,
                  device = torch.device('cpu')):
 
+        self.height = height
+        self.width = width
         self.batch_size = batch_size
         self.device = device
         nb = args.data_size if args.data_size > 0 else 250000
 
         descr = picoclvr.generate(
             nb,
-            height = height, width = width,
+            height = self.height, width = self.width,
             many_colors = many_colors
         )
 
-        self.test_descr = descr[:nb // 5]
-        self.train_descr = descr[nb // 5:]
+        # self.test_descr = descr[:nb // 5]
+        # self.train_descr = descr[nb // 5:]
 
         descr = [ s.strip().split(' ') for s in descr ]
         l = max([ len(s) for s in descr ])
@@ -180,7 +191,9 @@ class TaskPicoCLVR(Task):
 
         return ' '.join(t_primer + t_generated)
 
-    def produce_results(self, n_epoch, model, nb_tokens = 50):
+    def produce_results(self, n_epoch, model, nb_tokens = None):
+        if nb_tokens is None:
+            nb_tokens = self.height * self.width + 3
         descr = [ ]
         nb_per_primer = 8
 
@@ -194,14 +207,23 @@ class TaskPicoCLVR(Task):
             for k in range(nb_per_primer):
                 descr.append(self.generate(primer, model, nb_tokens))
 
-        img = [ picoclvr.descr2img(d) for d in descr ]
+        img = [ picoclvr.descr2img(d, height = self.height, width = self.width) for d in descr ]
         img = torch.cat(img, 0)
         file_name = f'result_picoclvr_{n_epoch:04d}.png'
-        torchvision.utils.save_image(img / 255.,
-                                     file_name, nrow = nb_per_primer, pad_value = 0.8)
+        torchvision.utils.save_image(
+            img / 255.,
+            file_name, nrow = nb_per_primer, pad_value = 0.8
+        )
         log_string(f'wrote {file_name}')
 
-        log_string(f'nb_misssing {picoclvr.nb_missing_properties(descr)}')
+        nb_missing = sum( [
+            x[2] for x in picoclvr.nb_missing_properties(
+                descr,
+                height = self.height, width = self.width
+            )
+        ] )
+
+        log_string(f'nb_missing {nb_missing / len(descr):.02f}')
 
 ######################################################################
 
@@ -364,7 +386,11 @@ if args.data == 'wiki103':
 elif args.data == 'mnist':
     task = TaskMNIST(batch_size = args.batch_size, device = device)
 elif args.data == 'picoclvr':
-    task = TaskPicoCLVR(batch_size = args.batch_size, many_colors = args.picoclvr_many_colors, device = device)
+    task = TaskPicoCLVR(batch_size = args.batch_size,
+                        height = args.picoclvr_height,
+                        width = args.picoclvr_width,
+                        many_colors = args.picoclvr_many_colors,
+                        device = device)
 else:
     raise ValueError(f'Unknown dataset {args.data}.')