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]
/
main.py
diff --git
a/main.py
b/main.py
index
ba8843b
..
b9b52d6
100755
(executable)
--- a/
main.py
+++ b/
main.py
@@
-12,7
+12,7
@@
from torch import nn
from torch.nn import functional as F
import ffutils
from torch.nn import functional as F
import ffutils
-import mygpt, tasks
+import mygpt, tasks
, problems
######################################################################
######################################################################
@@
-81,13
+81,15
@@
parser.add_argument("--checkpoint_name", type=str, default="checkpoint.pth")
##############################
# rpl options
##############################
# rpl options
-parser.add_argument("--rpl
-
nb_starting_values", type=int, default=5)
+parser.add_argument("--rpl
_
nb_starting_values", type=int, default=5)
-parser.add_argument("--rpl
-
max_input", type=int, default=9)
+parser.add_argument("--rpl
_
max_input", type=int, default=9)
-parser.add_argument("--rpl
-
prog_len", type=int, default=10)
+parser.add_argument("--rpl
_
prog_len", type=int, default=10)
-parser.add_argument("--rpl-nb_runs", type=int, default=8)
+parser.add_argument("--rpl_nb_runs", type=int, default=8)
+
+parser.add_argument("--rpl_no_prog", action="store_true", default=False)
##############################
# sandbox options
##############################
# sandbox options
@@
-333,19
+335,19
@@
picoclvr_pruner_eval = (
if args.task == "sandbox":
if args.sandbox_level == 0:
if args.task == "sandbox":
if args.sandbox_level == 0:
- problem =
task
s.ProblemLevel0(
+ problem =
problem
s.ProblemLevel0(
nb_sentences=args.sandbox_levels_nb_items,
len_prompt=args.sandbox_levels_len_source,
len_result=args.sandbox_levels_len_result,
)
elif args.sandbox_level == 1:
nb_sentences=args.sandbox_levels_nb_items,
len_prompt=args.sandbox_levels_len_source,
len_result=args.sandbox_levels_len_result,
)
elif args.sandbox_level == 1:
- problem =
task
s.ProblemLevel1(
+ problem =
problem
s.ProblemLevel1(
nb_operators=args.sandbox_levels_nb_items,
len_source=args.sandbox_levels_len_source,
len_result=args.sandbox_levels_len_result,
)
elif args.sandbox_level == 2:
nb_operators=args.sandbox_levels_nb_items,
len_source=args.sandbox_levels_len_source,
len_result=args.sandbox_levels_len_result,
)
elif args.sandbox_level == 2:
- problem =
task
s.ProblemLevel2(
+ problem =
problem
s.ProblemLevel2(
len_source=args.sandbox_levels_len_source,
len_result=args.sandbox_levels_len_result,
)
len_source=args.sandbox_levels_len_source,
len_result=args.sandbox_levels_len_result,
)
@@
-353,8
+355,9
@@
if args.task == "sandbox":
raise ValueError(f"Unknown sandbox level {args.sandbox_level}")
task = tasks.SandBox(
raise ValueError(f"Unknown sandbox level {args.sandbox_level}")
task = tasks.SandBox(
- problem,
- # tasks.ProblemAddition(zero_padded=False, inverted_result=False),
+ # problem,
+ # problems.ProblemAddition(zero_padded=False, inverted_result=False),
+ problems.ProblemLenId(len_max=args.sandbox_levels_len_source),
nb_train_samples=args.nb_train_samples,
nb_test_samples=args.nb_test_samples,
batch_size=args.batch_size,
nb_train_samples=args.nb_train_samples,
nb_test_samples=args.nb_test_samples,
batch_size=args.batch_size,
@@
-442,6
+445,7
@@
elif args.task == "rpl":
max_input=args.rpl_max_input,
prog_len=args.rpl_prog_len,
nb_runs=args.rpl_nb_runs,
max_input=args.rpl_max_input,
prog_len=args.rpl_prog_len,
nb_runs=args.rpl_nb_runs,
+ no_prog=args.rpl_no_prog,
logger=log_string,
device=device,
)
logger=log_string,
device=device,
)
@@
-515,12
+519,12
@@
else:
if args.task == "expr" and args.expr_input_file is not None:
task.produce_results(
if args.task == "expr" and args.expr_input_file is not None:
task.produce_results(
- nb_epochs_finished,
- model,
- args.result_dir,
- log_string,
- args.deterministic_synthesis,
- args.expr_input_file,
+ n
_epoch=n
b_epochs_finished,
+ model
=model
,
+
result_dir=
args.result_dir,
+ log
ger=log
_string,
+
deterministic_synthesis=
args.deterministic_synthesis,
+
input_file=
args.expr_input_file,
)
exit(0)
)
exit(0)
@@
-596,11
+600,11
@@
nb_samples_seen = 0
if nb_epochs_finished >= nb_epochs:
task.produce_results(
if nb_epochs_finished >= nb_epochs:
task.produce_results(
- nb_epochs_finished,
- model,
- args.result_dir,
- log_string,
- args.deterministic_synthesis,
+ n
_epoch=n
b_epochs_finished,
+ model
=model
,
+
result_dir=
args.result_dir,
+ log
ger=log
_string,
+
deterministic_synthesis=
args.deterministic_synthesis,
)
for n_epoch in range(nb_epochs_finished, nb_epochs):
)
for n_epoch in range(nb_epochs_finished, nb_epochs):
@@
-654,7
+658,11
@@
for n_epoch in range(nb_epochs_finished, nb_epochs):
)
task.produce_results(
)
task.produce_results(
- n_epoch, model, args.result_dir, log_string, args.deterministic_synthesis
+ n_epoch=n_epoch,
+ model=model,
+ result_dir=args.result_dir,
+ logger=log_string,
+ deterministic_synthesis=args.deterministic_synthesis,
)
checkpoint = {
)
checkpoint = {