X-Git-Url: https://fleuret.org/cgi-bin/gitweb/gitweb.cgi?a=blobdiff_plain;f=tasks.py;h=8b22cadc62f51e097b7fb70c6747aea7158a0804;hb=22b841a39cc73310cd03dbd1d32fb387f68521d0;hp=e5d3a7e66a77c769d970da8c0268f7fee307b7b9;hpb=1eef58fd084437bbcd2041b946b468615e203dd8;p=picoclvr.git

diff --git a/tasks.py b/tasks.py
index e5d3a7e..8b22cad 100755
--- a/tasks.py
+++ b/tasks.py
@@ -71,7 +71,7 @@ class Task:
 
 
 class TaskFromFile(Task):
-    def tensorize(self, pairs):
+    def tensorize(self, pairs, shuffle):
         len_max = max([len(x[0]) for x in pairs])
 
         input = torch.cat(
@@ -98,6 +98,11 @@ class TaskFromFile(Task):
             0,
         ).to("cpu")
 
+        if shuffle:
+            i = torch.randperm(input.size(0))
+            input = input[i].contiguous()
+            pred_mask = pred_mask[i].contiguous()
+
         return input, pred_mask
 
     # trim all the tensors in the tuple z to remove as much token from
@@ -122,6 +127,7 @@ class TaskFromFile(Task):
         nb_train_samples,
         nb_test_samples,
         batch_size,
+        shuffle=False,
         device=torch.device("cpu"),
     ):
         self.batch_size = batch_size
@@ -156,8 +162,12 @@ class TaskFromFile(Task):
         self.char2id = dict([(c, n) for n, c in enumerate(symbols)])
         self.id2char = dict([(n, c) for c, n in self.char2id.items()])
 
-        self.train_input, self.train_pred_masks = self.tensorize(train_pairs)
-        self.test_input, self.test_pred_masks = self.tensorize(test_pairs)
+        self.train_input, self.train_pred_masks = self.tensorize(
+            train_pairs, shuffle=shuffle
+        )
+        self.test_input, self.test_pred_masks = self.tensorize(
+            test_pairs, shuffle=shuffle
+        )
 
     def batches(self, split="train", nb_to_use=-1, desc=None):
         assert split in {"train", "test"}
@@ -1851,3 +1861,61 @@ class QMLP(Task):
 
 
 ######################################################################
+
+import escape
+
+
+class Escape(Task):
+    def __init__(
+        self,
+        nb_train_samples,
+        nb_test_samples,
+        batch_size,
+        height,
+        width,
+        T,
+        logger=None,
+        device=torch.device("cpu"),
+    ):
+        super().__init__()
+
+        self.batch_size = batch_size
+        self.device = device
+
+        states, actions, rewards = escape.generate_episodes(
+            nb_train_samples + nb_test_samples, height, width, T
+        )
+        seq = escape.episodes2seq(states, actions, rewards)
+        self.train_input = seq[:nb_train_samples]
+        self.test_input = seq[nb_train_samples:]
+
+        self.nb_codes = max(self.train_input.max(), self.test_input.max()) + 1
+
+        # if logger is not None:
+        # for s, a in zip(self.train_input[:100], self.train_ar_mask[:100]):
+        # logger(f"train_sequences {self.problem.seq2str(s)}")
+        # a = "".join(["01"[x.item()] for x in a])
+        # logger(f"                {a}")
+
+    def batches(self, split="train", nb_to_use=-1, desc=None):
+        assert split in {"train", "test"}
+        input = self.train_input if split == "train" else self.test_input
+        if nb_to_use > 0:
+            input = input[:nb_to_use]
+        if desc is None:
+            desc = f"epoch-{split}"
+        for batch in tqdm.tqdm(
+            input.split(self.batch_size), dynamic_ncols=True, desc=desc
+        ):
+            yield batch
+
+    def vocabulary_size(self):
+        return self.nb_codes
+
+    def produce_results(
+        self, n_epoch, model, result_dir, logger, deterministic_synthesis, nmax=1000
+    ):
+        pass
+
+
+######################################################################