projects
/
picoclvr.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Update.
[picoclvr.git]
/
stack.py
diff --git
a/stack.py
b/stack.py
index
dc494bb
..
312b39f
100755
(executable)
--- a/
stack.py
+++ b/
stack.py
@@
-13,44
+13,52
@@
import torch, torchvision
# CODE_VAL=val + 2 * nb_stacks
# CODE_VAL=val + 2 * nb_stacks
-def generate
(nb, nb_steps, nb_stacks, nb_values
):
+def generate
_sequences(nb, nb_steps, nb_stacks, nb_values, device=torch.device("cpu")
):
stack = torch.empty(nb, nb_stacks, nb_steps, dtype=torch.int64)
stack = torch.empty(nb, nb_stacks, nb_steps, dtype=torch.int64)
- stack_
pointer
s = torch.zeros(nb, nb_stacks, dtype=torch.int64)
+ stack_
count
s = torch.zeros(nb, nb_stacks, dtype=torch.int64)
k = torch.arange(nb)
result = torch.empty(nb, 2 * nb_steps, dtype=torch.int64)
k = torch.arange(nb)
result = torch.empty(nb, 2 * nb_steps, dtype=torch.int64)
-
depth
_counts = torch.zeros(nb, 2 * nb_steps, dtype=torch.int64)
+
recorded_stack
_counts = torch.zeros(nb, 2 * nb_steps, dtype=torch.int64)
for t in range(nb_steps):
op = torch.randint(2, (nb,))
st = torch.randint(nb_stacks, (nb,))
for t in range(nb_steps):
op = torch.randint(2, (nb,))
st = torch.randint(nb_stacks, (nb,))
- op = op * (stack_
pointer
s[k, st] > 0)
+ op = op * (stack_
count
s[k, st] > 0)
val_push = torch.randint(nb_values, (nb,))
val_pop = stack[
k,
st,
val_push = torch.randint(nb_values, (nb,))
val_pop = stack[
k,
st,
- (stack_
pointer
s[k, st] - 1).clamp(min=0),
+ (stack_
count
s[k, st] - 1).clamp(min=0),
]
]
- stack[k, st, stack_
pointer
s[k, st]] = val_push
-
depth_counts[:, 2 * t + 1] = stack_pointer
s[k, st]
- stack_
pointer
s[k[op == 0], st[op == 0]] += 1
- stack_
pointer
s[k[op == 1], st[op == 1]] -= 1
+ stack[k, st, stack_
count
s[k, st]] = val_push
+
recorded_stack_counts[:, 2 * t + 1] = stack_count
s[k, st]
+ stack_
count
s[k[op == 0], st[op == 0]] += 1
+ stack_
count
s[k[op == 1], st[op == 1]] -= 1
result[:, 2 * t] = st * 2 + op
result[:, 2 * t + 1] = (op * val_pop + (1 - op) * val_push) + 2 * nb_stacks
result[:, 2 * t] = st * 2 + op
result[:, 2 * t + 1] = (op * val_pop + (1 - op) * val_push) + 2 * nb_stacks
- return result
, depth_counts
+ return result
.to(device), recorded_stack_counts.to(device)
-def seq_to_str(seq, depth_counts=None):
+def remove_poped_values(seq, nb_stacks):
+ m = torch.logical_and(seq % 2 == 1, seq < 2 * nb_stacks).long()
+ seq[:, 1:] = -m[:, :-1] + (1 - m[:, :-1]) * seq[:, 1:]
+
+
+def seq_to_str(seq, recorded_stack_counts=None):
assert seq.size(0) % 2 == 0
s = ""
for t in range(seq.size(0) // 2):
op = seq[2 * t]
assert seq.size(0) % 2 == 0
s = ""
for t in range(seq.size(0) // 2):
op = seq[2 * t]
- op = f"POP_{op//2}" if op % 2 == 1 else f"PUSH_{op//2}"
- val = seq[2 * t + 1] - 2 * nb_stacks
+ op = f"POP_{op//2}" if op % 2 == 1 else f"PSH_{op//2}"
+ if seq[2 * t + 1] == -1:
+ val = "?"
+ else:
+ val = seq[2 * t + 1] - 2 * nb_stacks
if t > 0:
s += " "
if t > 0:
s += " "
- if
depth
_counts is not None:
- s += f"[{
depth
_counts[2*t+1]}] "
+ if
recorded_stack
_counts is not None:
+ s += f"[{
recorded_stack
_counts[2*t+1]}] "
s += f"{op} {val}"
return s
s += f"{op} {val}"
return s
@@
-59,9
+67,17
@@
def seq_to_str(seq, depth_counts=None):
if __name__ == "__main__":
nb, nb_steps, nb_stacks, nb_values = 150000, 10, 1, 5
if __name__ == "__main__":
nb, nb_steps, nb_stacks, nb_values = 150000, 10, 1, 5
- seq,
depth_counts = generate
(
+ seq,
recorded_stack_counts = generate_sequences
(
nb=nb, nb_steps=nb_steps, nb_stacks=nb_stacks, nb_values=nb_values
)
for n in range(min(10, seq.size(0))):
nb=nb, nb_steps=nb_steps, nb_stacks=nb_stacks, nb_values=nb_values
)
for n in range(min(10, seq.size(0))):
- print(seq_to_str(seq[n], depth_counts[n]))
+ # print(seq_to_str(seq[n], recorded_stack_counts[n]))
+ print(seq_to_str(seq[n]))
+
+ print("--------------------------------------")
+
+ remove_poped_values(seq, nb_stacks)
+
+ for n in range(min(10, seq.size(0))):
+ print(seq_to_str(seq[n]))