Skip to content
Snippets Groups Projects
Commit 123f7782 authored by Michele Alberti's avatar Michele Alberti
Browse files

Do not set debug flag for autodetection in each verification.

parent 5d49fc1e
No related branches found
No related tags found
No related merge requests found
...@@ -44,8 +44,8 @@ let () = ...@@ -44,8 +44,8 @@ let () =
Language.register_onnx_support (); Language.register_onnx_support ();
Language.register_ovo_support () Language.register_ovo_support ()
let create_env loadpath = let create_env ?(debug = false) loadpath =
let config = Autodetect.autodetection ~debug:true () in let config = Autodetect.autodetection ~debug () in
let config = let config =
let main = Whyconf.get_main config in let main = Whyconf.get_main config in
let dft_memlimit = 4000 (* 4 GB *) in let dft_memlimit = 4000 (* 4 GB *) in
...@@ -204,7 +204,7 @@ let call_prover ~limit config (prover : Whyconf.config_prover) driver env ...@@ -204,7 +204,7 @@ let call_prover ~limit config (prover : Whyconf.config_prover) driver env
let verify ?(debug = false) format loadpath ?memlimit ?timeout prover let verify ?(debug = false) format loadpath ?memlimit ?timeout prover
?dataset_csv file = ?dataset_csv file =
if debug then Debug.set_flag (Debug.lookup_flag "call_prover"); if debug then Debug.set_flag (Debug.lookup_flag "call_prover");
let env, config = create_env loadpath in let env, config = create_env ~debug loadpath in
let steplimit = None in let steplimit = None in
let steps = match steplimit with Some 0 -> None | _ -> steplimit in let steps = match steplimit with Some 0 -> None | _ -> steplimit in
let limit = let limit =
......
...@@ -20,7 +20,20 @@ Test autodetect ...@@ -20,7 +20,20 @@ Test autodetect
$ PATH=$(pwd)/bin:$PATH $ PATH=$(pwd)/bin:$PATH
$ caisar config -d $ caisar config -d -vv 2>&1 | ./filter_tmpdir.sh
[caisar][DEBUG] Command `config'.
[caisar][DEBUG] Automatic detection.
<autodetect>Run: ($TESTCASE_ROOT/bin/pyrat.py --version) > $TMPFILE 2>&1
<autodetect>Run: ($TESTCASE_ROOT/bin/saver --version 2>&1 | head -n1 && (which saver > /dev/null 2>&1)) > $TMPFILE 2>&1
<autodetect>Run: ($TESTCASE_ROOT/bin/alt-ergo --version) > $TMPFILE 2>&1
<autodetect>Run: ($TESTCASE_ROOT/bin/Marabou --version) > $TMPFILE 2>&1
<autodetect>0 prover(s) added
<autodetect>Generating strategies:
<autodetect>Found prover Alt-Ergo version 2.4.0, OK.
<autodetect>Found prover Marabou version 1.0.+, OK.
<autodetect>Found prover PyRAT version 1.1, OK.
<autodetect>Found prover SAVer version v1.0, OK.
<autodetect>4 prover(s) added
[caisar] Alt-Ergo 2.4.0 [caisar] Alt-Ergo 2.4.0
Marabou 1.0.+ Marabou 1.0.+
PyRAT 1.1 PyRAT 1.1
......
...@@ -34,17 +34,6 @@ Test verify ...@@ -34,17 +34,6 @@ Test verify
> ((0.0:t) .< y1 \/ (0.5:t) .< y1) /\ (0.0:t) .< y2 .< (0.5:t) > ((0.0:t) .< y1 \/ (0.5:t) .< y1) /\ (0.0:t) .< y2 .< (0.5:t)
> end > end
> EOF > EOF
<autodetect>Run: ($TESTCASE_ROOT/bin/pyrat.py --version) > $TMPFILE 2>&1
<autodetect>Run: ($TESTCASE_ROOT/bin/saver --version 2>&1 | head -n1 && (which saver > /dev/null 2>&1)) > $TMPFILE 2>&1
<autodetect>Run: ($TESTCASE_ROOT/bin/alt-ergo --version) > $TMPFILE 2>&1
<autodetect>Run: ($TESTCASE_ROOT/bin/Marabou --version) > $TMPFILE 2>&1
<autodetect>0 prover(s) added
<autodetect>Generating strategies:
<autodetect>Found prover Alt-Ergo version 2.4.0, OK.
<autodetect>Found prover Marabou version 1.0.+, OK.
<autodetect>Found prover PyRAT version 1.1, OK.
<autodetect>Found prover SAVer version v1.0, OK.
<autodetect>4 prover(s) added
Goal G: Unknown Goal G: Unknown
() ()
Goal H: Unknown Goal H: Unknown
......
...@@ -37,17 +37,6 @@ Test verify ...@@ -37,17 +37,6 @@ Test verify
> ((0.0:t) .< y1 \/ (0.5:t) .< y1) /\ (0.0:t) .< y2 .< (0.5:t) > ((0.0:t) .< y1 \/ (0.5:t) .< y1) /\ (0.0:t) .< y2 .< (0.5:t)
> end > end
> EOF > EOF
<autodetect>Run: ($TESTCASE_ROOT/bin/pyrat.py --version) > $TMPFILE 2>&1
<autodetect>Run: ($TESTCASE_ROOT/bin/saver --version 2>&1 | head -n1 && (which saver > /dev/null 2>&1)) > $TMPFILE 2>&1
<autodetect>Run: ($TESTCASE_ROOT/bin/alt-ergo --version) > $TMPFILE 2>&1
<autodetect>Run: ($TESTCASE_ROOT/bin/Marabou --version) > $TMPFILE 2>&1
<autodetect>0 prover(s) added
<autodetect>Generating strategies:
<autodetect>Found prover Alt-Ergo version 2.4.0, OK.
<autodetect>Found prover Marabou version 1.0.+, OK.
<autodetect>Found prover PyRAT version 1.1, OK.
<autodetect>Found prover SAVer version v1.0, OK.
<autodetect>4 prover(s) added
Goal G: Unknown Goal G: Unknown
() ()
Goal H: Unknown Goal H: Unknown
......
...@@ -29,16 +29,5 @@ Test verify ...@@ -29,16 +29,5 @@ Test verify
> (0.0:t) .< y1 .< (0.5:t) > (0.0:t) .< y1 .< (0.5:t)
> end > end
> EOF > EOF
<autodetect>Run: ($TESTCASE_ROOT/bin/pyrat.py --version) > $TMPFILE 2>&1
<autodetect>Run: ($TESTCASE_ROOT/bin/saver --version 2>&1 | head -n1 && (which saver > /dev/null 2>&1)) > $TMPFILE 2>&1
<autodetect>Run: ($TESTCASE_ROOT/bin/alt-ergo --version) > $TMPFILE 2>&1
<autodetect>Run: ($TESTCASE_ROOT/bin/Marabou --version) > $TMPFILE 2>&1
<autodetect>0 prover(s) added
<autodetect>Generating strategies:
<autodetect>Found prover Alt-Ergo version 2.4.0, OK.
<autodetect>Found prover Marabou version 1.0.+, OK.
<autodetect>Found prover PyRAT version 1.1, OK.
<autodetect>Found prover SAVer version v1.0, OK.
<autodetect>4 prover(s) added
Goal G: Unknown Goal G: Unknown
() ()
...@@ -34,15 +34,4 @@ Test verify ...@@ -34,15 +34,4 @@ Test verify
> goal G: forall a : input_type. robust_to svm_apply a (8.0:t) > goal G: forall a : input_type. robust_to svm_apply a (8.0:t)
> end > end
> EOF > EOF
<autodetect>Run: ($TESTCASE_ROOT/bin/pyrat.py --version) > $TMPFILE 2>&1
<autodetect>Run: ($TESTCASE_ROOT/bin/saver --version 2>&1 | head -n1 && (which saver > /dev/null 2>&1)) > $TMPFILE 2>&1
<autodetect>Run: ($TESTCASE_ROOT/bin/alt-ergo --version) > $TMPFILE 2>&1
<autodetect>Run: ($TESTCASE_ROOT/bin/Marabou --version) > $TMPFILE 2>&1
<autodetect>0 prover(s) added
<autodetect>Generating strategies:
<autodetect>Found prover Alt-Ergo version 2.4.0, OK.
<autodetect>Found prover Marabou version 1.0.+, OK.
<autodetect>Found prover PyRAT version 1.1, OK.
<autodetect>Found prover SAVer version v1.0, OK.
<autodetect>4 prover(s) added
Goal G: High failure Goal G: High failure
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment