From a026ce1757679f19ae646221ac5c12058d449f28 Mon Sep 17 00:00:00 2001 From: Morgan Deters Date: Wed, 11 Jun 2014 22:13:48 -0400 Subject: [PATCH] more fix-ups --- Makefile | 4 +++- contrib/run-script-smtcomp2014 | 4 ++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 45e70d8e0..4e08075bc 100644 --- a/Makefile +++ b/Makefile @@ -60,12 +60,14 @@ submission: cp -p cvc4-smtcomp-main-$(YEAR)/bin/starexec_run_default cvc4-smtcomp-$(YEAR)/bin/starexec_run_default cp -p cvc4-smtcomp-application-$(YEAR)/bin/cvc4 cvc4-smtcomp-$(YEAR)/bin/cvc4-application cp -p cvc4-smtcomp-application-$(YEAR)/bin/starexec_run_default cvc4-smtcomp-$(YEAR)/bin/starexec_run_application - cp -p cvc4-smtcomp-parallel-$(YEAR)/bin/cvc4 cvc4-smtcomp-$(YEAR)/bin/pcvc4 + cp -p cvc4-smtcomp-parallel-$(YEAR)/bin/pcvc4 cvc4-smtcomp-$(YEAR)/bin/pcvc4 cp -p cvc4-smtcomp-parallel-$(YEAR)/bin/starexec_run_default cvc4-smtcomp-$(YEAR)/bin/starexec_run_parallel cat cvc4-smtcomp-main-$(YEAR)/starexec_description.txt \ cvc4-smtcomp-application-$(YEAR)/starexec_description.txt \ cvc4-smtcomp-parallel-$(YEAR)/starexec_description.txt \ > cvc4-smtcomp-$(YEAR)/starexec_description.txt + perl -pi -e 's,\,cvc4-main,g' cvc4-smtcomp-$(YEAR)/bin/starexec_run_default + perl -pi -e 's,\,cvc4-application,g' cvc4-smtcomp-$(YEAR)/bin/starexec_run_application cd cvc4-smtcomp-$(YEAR) && zip -r ../cvc4-smtcomp-$(YEAR).zip * submission-main: @if [ -d builds-smtcomp/main ]; then \ diff --git a/contrib/run-script-smtcomp2014 b/contrib/run-script-smtcomp2014 index ccb05733a..8f0e2cfcf 100755 --- a/contrib/run-script-smtcomp2014 +++ b/contrib/run-script-smtcomp2014 @@ -26,11 +26,11 @@ function finishwith { case "$logic" in QF_LRA) - finishwith --enable-miplib-trick --miplib-trick-subs=4 --use-approx --stats --lemmas-on-replay-failure --replay-early-close-depth=4 --replay-lemma-reject-cut=128 --replay-reject-cut=512 --unconstrained-simp --use-soi + finishwith --enable-miplib-trick --miplib-trick-subs=4 --use-approx --lemmas-on-replay-failure --replay-early-close-depth=4 --replay-lemma-reject-cut=128 --replay-reject-cut=512 --unconstrained-simp --use-soi ;; QF_LIA) # same as QF_LRA but add --pb-rewrites - finishwith --enable-miplib-trick --miplib-trick-subs=4 --use-approx --stats --lemmas-on-replay-failure --replay-early-close-depth=4 --replay-lemma-reject-cut=128 --replay-reject-cut=512 --unconstrained-simp --use-soi --pb-rewrites + finishwith --enable-miplib-trick --miplib-trick-subs=4 --use-approx --lemmas-on-replay-failure --replay-early-close-depth=4 --replay-lemma-reject-cut=128 --replay-reject-cut=512 --unconstrained-simp --use-soi --pb-rewrites ;; ALIA|AUFLIA|AUFLIRA|AUFNIRA|BV|UF|UFBV|UFIDL|UFLIA|UFLRA|UFNIA) # the following is designed for a run time of 1500s. -- 2.30.2