Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade to why3 1.8 #674

Merged
merged 1 commit into from
Jan 17, 2025
Merged

Upgrade to why3 1.8 #674

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion dune-project
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
dune-site
(ocaml-inifiles (>= 1.2))
(pcre (>= 7))
(why3 (and (>= 1.7.0) (< 1.8)))
(why3 (and (>= 1.8.0) (< 1.9)))
yojson
(zarith (>= 1.10))
))
2 changes: 1 addition & 1 deletion easycrypt.opam
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ depends: [
"dune-site"
"ocaml-inifiles" {>= "1.2"}
"pcre" {>= "7"}
"why3" {>= "1.7.0" & < "1.8"}
"why3" {>= "1.8.0" & < "1.9"}
"yojson"
"zarith" {>= "1.10"}
"odoc" {with-doc}
Expand Down
4 changes: 2 additions & 2 deletions src/ecCoq.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ let run_batch ~(script : string) ~(coqenv : coqenv) (task : WTask.task) =
let config = Why3.Whyconf.get_main coqenv.config in
let config_mem = Why3.Whyconf.memlimit config in
let config_time = Why3.Whyconf.timelimit config in
let limit =
let limits =
Why3.Call_provers.{
limit_time = config_time;
limit_steps = 0;
Expand All @@ -50,7 +50,7 @@ let run_batch ~(script : string) ~(coqenv : coqenv) (task : WTask.task) =
let call =
Why3.Driver.prove_task_prepared
~old:script ~inplace:true
~command ~limit ~config coqenv.driver task
~command ~limits ~config coqenv.driver task
in call_prover_task ~coqenv call

(* -------------------------------------------------------------------- *)
Expand Down
10 changes: 5 additions & 5 deletions src/ecProvers.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -513,17 +513,17 @@ let run_prover
let pc =
let command = pr.Whyconf.command in

let limit = { Call_provers.empty_limit with
let limits = { Call_provers.empty_limits with
Call_provers.limit_time =
let limit = pi.pr_timelimit * pi.pr_cpufactor in
if limit <= 0 then 0. else float_of_int limit;
let limits = pi.pr_timelimit * pi.pr_cpufactor in
if limits <= 0 then 0. else float_of_int limits;
} in

let rec doit gcdone =
try
Driver.prove_task
~config:(Config.main ())
~command ~limit dr task
~command ~limits dr task
with Unix.Unix_error (Unix.ENOMEM, "fork", _) when not gcdone ->
Gc.compact (); doit true
in
Expand Down Expand Up @@ -618,7 +618,7 @@ let execute_task ?(notify : notify option) (pi : prover_infos) task =
let fmt = Format.formatter_of_buffer buf in
Format.fprintf fmt "prover %s disproved this goal." prover;
Buffer.contents buf)));
| (CP.Failure _ | CP.HighFailure) as answer->
| (CP.Failure _ | CP.HighFailure _) as answer->
notify |> oiter (fun notify -> notify `Warning (lazy (
let buf = Buffer.create 0 in
let fmt = Format.formatter_of_buffer buf in
Expand Down