Update CaDiCaL to pre-release 2.0.0 to fix a problem

pindakaashq · Jun 5, 2024 · ea9c76f · ea9c76f
1 parent f750e52
commit ea9c76f
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 5 deletions.
diff --git a/crates/pindakaas-cadical/Cargo.toml b/crates/pindakaas-cadical/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "pindakaas-cadical"
-version = "1.9.5"
+version = "2.0.0"
 edition = "2021"
 build = "build.rs"
 links = "cadical"

diff --git a/crates/pindakaas-cadical/build.rs b/crates/pindakaas-cadical/build.rs
@@ -1,5 +1,7 @@
 fn main() {
 	let src = [
+		"src/ccadical_override.cpp",
+		"vendor/cadical/contrib/craigtracer.cpp",
 		"vendor/cadical/src/analyze.cpp",
 		"vendor/cadical/src/arena.cpp",
 		"vendor/cadical/src/assume.cpp",
@@ -30,12 +32,13 @@ fn main() {
 		"vendor/cadical/src/file.cpp",
 		"vendor/cadical/src/flags.cpp",
 		"vendor/cadical/src/flip.cpp",
-		"vendor/cadical/src/frattracer.cpp",
 		"vendor/cadical/src/format.cpp",
+		"vendor/cadical/src/frattracer.cpp",
 		"vendor/cadical/src/gates.cpp",
 		"vendor/cadical/src/idruptracer.cpp",
 		"vendor/cadical/src/instantiate.cpp",
 		"vendor/cadical/src/internal.cpp",
+		"vendor/cadical/src/lidruptracer.cpp",
 		"vendor/cadical/src/limit.cpp",
 		"vendor/cadical/src/logging.cpp",
 		"vendor/cadical/src/lookahead.cpp",
@@ -72,19 +75,19 @@ fn main() {
 		"vendor/cadical/src/terminal.cpp",
 		"vendor/cadical/src/ternary.cpp",
 		"vendor/cadical/src/transred.cpp",
-		"vendor/cadical/src/veripbtracer.cpp",
 		"vendor/cadical/src/util.cpp",
 		"vendor/cadical/src/var.cpp",
+		"vendor/cadical/src/veripbtracer.cpp",
 		"vendor/cadical/src/version.cpp",
 		"vendor/cadical/src/vivify.cpp",
 		"vendor/cadical/src/walk.cpp",
 		"vendor/cadical/src/watch.cpp",
-		"src/ccadical_override.cpp",
 	];
 
 	let mut builder = cc::Build::new();
 	let build = builder
 		.cpp(true)
+		.include("vendor/cadical/src")
 		.flag_if_supported("-std=c++11")
 		.define("NBUILD", None)
 		.define("NUNLOCKED", None)

diff --git a/crates/pindakaas-cadical/vendor/cadical b/crates/pindakaas-cadical/vendor/cadical
+1 −0		.dockerignore
+34 −0		Dockerfile
+4 −4		LICENSE
+18 −1		NEWS.md
+1 −1		VERSION
+56 −0		configure
+15 −0		contrib/craigtracer.LICENSE.APACHE
+9 −0		contrib/craigtracer.LICENSE.MIT
+986 −0		contrib/craigtracer.cpp
+200 −0		contrib/craigtracer.hpp
+177 −0		contrib/craigtracer.md
+37 −23		makefile.in
+3 −0		scripts/make-build-header.sh
+30 −17		src/assume.cpp
+13 −4		src/cadical.cpp
+45 −12		src/clause.hpp
+2 −1		src/decompose.cpp
+1 −11		src/external.cpp
+9 −5		src/external_propagate.cpp
+1 −1		src/file.cpp
+3 −1		src/flags.hpp
+28 −6		src/idruptracer.cpp
+1 −1		src/idruptracer.hpp
+17 −1		src/internal.cpp
+7 −7		src/internal.hpp
+630 −0		src/lidruptracer.cpp
+115 −0		src/lidruptracer.hpp
+52 −30		src/minimize.cpp
+75 −49		src/mobical.cpp
+2 −1		src/options.hpp
+4 −0		src/proof.cpp
+1 −0		src/propagate.cpp
+9 −0		src/radix.hpp
+2 −2		src/resources.cpp
+12 −11		src/restart.cpp
+2 −1		src/shrink.cpp
+3 −0		src/solver.cpp
+0 −3		src/stats.cpp
+14 −15		src/stats.hpp
+24 −20		src/subsume.cpp
+3 −3		src/util.hpp
+9 −3		src/version.cpp
+60 −26		src/vivify.cpp
+1 −0		src/vivify.hpp
+8 −0		test/contrib/README.md
+39 −0		test/contrib/craigtracer.cpp
+73 −0		test/contrib/craigtracer_incremental.cpp
+3 −0		test/contrib/makefile
+118 −0		test/contrib/run.sh
+1 −1		test/icnf/makefile
+4 −2		test/makefile
+9 −0		test/trace/reg0077.trace
+8 −0		test/trace/reg0078.trace