rpms/cvc4
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add -cryptominisat patch to adapt to changes in 5.7.0.

Browse Source
This commit is contained in:
Jerry James 2020-04-26 17:26:14 -06:00
parent 3054e2d081
commit eb73525431
3 changed files with 123 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
cvc4-cryptominisat.patch Normal file
View File

@ -0,0 +1,53 @@
--- src/prop/cryptominisat.cpp.orig 2019-04-09 10:14:31.000000000 -0600
+++ src/prop/cryptominisat.cpp 2020-04-26 14:04:26.086833393 -0600
@@ -68,15 +68,8 @@ CryptoMinisatSolver::CryptoMinisatSolver
d_okay(true),
d_statistics(registry, name)
{
- d_true = newVar();
- d_false = newVar();
-
- std::vector<CMSat::Lit> clause(1);
- clause[0] = CMSat::Lit(d_true, false);
- d_solver->add_clause(clause);
-
- clause[0] = CMSat::Lit(d_false, true);
- d_solver->add_clause(clause);
+ d_true = undefSatVariable;
+ d_false = undefSatVariable;
}
@@ -154,10 +147,32 @@ SatVariable CryptoMinisatSolver::newVar
}
SatVariable CryptoMinisatSolver::trueVar() {
+ if (d_true == undefSatVariable) {
+ d_true = newVar();
+ d_false = newVar();
+
+ std::vector<CMSat::Lit> clause(1);
+ clause[0] = CMSat::Lit(d_true, false);
+ d_solver->add_clause(clause);
+
+ clause[0] = CMSat::Lit(d_false, true);
+ d_solver->add_clause(clause);
+ }
return d_true;
}
SatVariable CryptoMinisatSolver::falseVar() {
+ if (d_true == undefSatVariable) {
+ d_true = newVar();
+ d_false = newVar();
+
+ std::vector<CMSat::Lit> clause(1);
+ clause[0] = CMSat::Lit(d_true, false);
+ d_solver->add_clause(clause);
+
+ clause[0] = CMSat::Lit(d_false, true);
+ d_solver->add_clause(clause);
+ }
return d_false;
}

69
cvc4-flags.patch
View File

@ -1,5 +1,17 @@
--- CMakeLists.txt.orig 2019-04-16 15:54:30.334111544 -0600 --- cmake/ConfigProduction.cmake.orig 2019-04-09 10:14:31.000000000 -0600
+++ CMakeLists.txt 2019-04-17 11:23:52.404867885 -0600 +++ cmake/ConfigProduction.cmake 2020-04-26 17:24:03.338855205 -0600
@@ -1,7 +1,7 @@
-# OPTLEVEL=3
+# OPTLEVEL=2
# enable_optimized=yes
cvc4_set_option(ENABLE_OPTIMIZED ON)
-set(OPTIMIZATION_LEVEL 3)
+set(OPTIMIZATION_LEVEL 2)
# enable_debug_symbols=no
cvc4_set_option(ENABLE_DEBUG_SYMBOLS OFF)
# enable_statistics=yes
--- CMakeLists.txt.orig 2019-04-09 10:14:31.000000000 -0600
+++ CMakeLists.txt 2020-04-26 17:23:30.427884359 -0600
@@ -125,7 +125,7 @@ option(BUILD_BINDINGS_PYTHON "Build Pyth @@ -125,7 +125,7 @@ option(BUILD_BINDINGS_PYTHON "Build Pyth
#-----------------------------------------------------------------------------# #-----------------------------------------------------------------------------#
# Internal cmake variables # Internal cmake variables
@ -33,6 +45,59 @@
CFLAGS += -I$(MROOT) -D __STDC_LIMIT_MACROS -D __STDC_FORMAT_MACROS CFLAGS += -I$(MROOT) -D __STDC_LIMIT_MACROS -D __STDC_FORMAT_MACROS
LFLAGS += -lz LFLAGS += -lz
--- src/prop/cryptominisat.cpp.orig 2019-04-09 10:14:31.000000000 -0600
+++ src/prop/cryptominisat.cpp 2020-04-26 14:04:26.086833393 -0600
@@ -68,15 +68,8 @@ CryptoMinisatSolver::CryptoMinisatSolver
d_okay(true),
d_statistics(registry, name)
{
- d_true = newVar();
- d_false = newVar();
-
- std::vector<CMSat::Lit> clause(1);
- clause[0] = CMSat::Lit(d_true, false);
- d_solver->add_clause(clause);
-
- clause[0] = CMSat::Lit(d_false, true);
- d_solver->add_clause(clause);
+ d_true = undefSatVariable;
+ d_false = undefSatVariable;
}
@@ -154,10 +147,32 @@ SatVariable CryptoMinisatSolver::newVar
}
SatVariable CryptoMinisatSolver::trueVar() {
+ if (d_true == undefSatVariable) {
+ d_true = newVar();
+ d_false = newVar();
+
+ std::vector<CMSat::Lit> clause(1);
+ clause[0] = CMSat::Lit(d_true, false);
+ d_solver->add_clause(clause);
+
+ clause[0] = CMSat::Lit(d_false, true);
+ d_solver->add_clause(clause);
+ }
return d_true;
}
SatVariable CryptoMinisatSolver::falseVar() {
+ if (d_true == undefSatVariable) {
+ d_true = newVar();
+ d_false = newVar();
+
+ std::vector<CMSat::Lit> clause(1);
+ clause[0] = CMSat::Lit(d_true, false);
+ d_solver->add_clause(clause);
+
+ clause[0] = CMSat::Lit(d_false, true);
+ d_solver->add_clause(clause);
+ }
return d_false;
}
--- src/prop/minisat/mtl/template.mk.orig 2019-04-09 10:14:31.000000000 -0600 --- src/prop/minisat/mtl/template.mk.orig 2019-04-09 10:14:31.000000000 -0600
+++ src/prop/minisat/mtl/template.mk 2019-04-17 11:22:15.879002442 -0600 +++ src/prop/minisat/mtl/template.mk 2019-04-17 11:22:15.879002442 -0600
@@ -22,7 +22,7 @@ CXX ?= g++ @@ -22,7 +22,7 @@ CXX ?= g++

3
cvc4.spec
View File

@ -26,6 +26,8 @@ Patch2: %{name}-swig4.patch
# Fix drat signature wrt side condition return types # Fix drat signature wrt side condition return types
# https://github.com/CVC4/CVC4/commit/57524fd9f204f8e85e5e37af1444a6f76d809aee # https://github.com/CVC4/CVC4/commit/57524fd9f204f8e85e5e37af1444a6f76d809aee
Patch3: %{name}-drat.patch Patch3: %{name}-drat.patch
# Adapt to cryptominisat 5.7
Patch4: %{name}-cryptominisat.patch
BuildRequires: abc-devel BuildRequires: abc-devel
BuildRequires: antlr3-C-devel BuildRequires: antlr3-C-devel
@ -222,6 +224,7 @@ make check
%changelog %changelog
* Sat Apr 25 2020 Jerry James <loganjerry@gmail.com> - 1.7-9 * Sat Apr 25 2020 Jerry James <loganjerry@gmail.com> - 1.7-9
- Rebuild for cryptominisat 5.7.0 - Rebuild for cryptominisat 5.7.0
- Add -cryptominisat patch to adapt to changes in 5.7.0
* Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.7-8 * Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.7-8
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild