Skip to content

Update CaDiCaL from 1.5.3 to 1.7.2 #7884

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.

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

Merged
merged 1 commit into from
Sep 12, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
45 changes: 0 additions & 45 deletions scripts/cadical-1.5.3-patch

This file was deleted.

22 changes: 22 additions & 0 deletions scripts/cadical-1.7.2-patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
diff --git a/scripts/make-build-header.sh b/scripts/make-build-header.sh
index e8f6746..1290024 100755
--- a/scripts/make-build-header.sh
+++ b/scripts/make-build-header.sh
@@ -20,7 +20,7 @@ warning () {

#--------------------------------------------------------------------------#

-[ ! -f VERSION -a ! -f ../VERSION ] && \
+[ ! -f VERSION.txt -a ! -f ../VERSION.txt ] && \
die "needs to be called from build sub-directory"

[ -f makefile ] || \
@@ -29,7 +29,7 @@ warning "could not find 'makefile'"
#--------------------------------------------------------------------------#
# The version.
#
-VERSION="`cat ../VERSION`"
+VERSION="`cat ../VERSION.txt`"
if [ x"$VERSION" = x ]
then
warning "could not determine 'VERSION'"
4 changes: 2 additions & 2 deletions src/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -181,14 +181,14 @@ glucose-download:
@(cd ../glucose-syrup; patch -p1 < ../scripts/glucose-syrup-patch)
@$(RM) $(glucose_rev).tar.gz

cadical_release = rel-1.5.3
cadical_release = rel-1.7.2
cadical-download:
@echo "Downloading CaDiCaL $(cadical_release)"
@$(DOWNLOADER) https://github.com/arminbiere/cadical/archive/$(cadical_release).tar.gz
@$(TAR) xfz $(cadical_release).tar.gz
@rm -Rf ../cadical
@mv cadical-$(cadical_release) ../cadical
@(cd ../cadical; patch -p1 < ../scripts/cadical-1.5.3-patch)
@(cd ../cadical; patch -p1 < ../scripts/cadical-1.7.2-patch)
@(cd ../cadical && ./configure)
# Need to rename VERSION so that it isn't picked up by `#include<version>` on
# macOS which is case insensitive
Expand Down
12 changes: 6 additions & 6 deletions src/solvers/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -124,11 +124,11 @@ foreach(SOLVER ${sat_impl})
message(STATUS "Building solvers with cadical")

download_project(PROJ cadical
URL https://github.com/arminbiere/cadical/archive/rel-1.5.3.tar.gz
PATCH_COMMAND patch -p1 -i ${CBMC_SOURCE_DIR}/../scripts/cadical-1.5.3-patch
URL https://github.com/arminbiere/cadical/archive/rel-1.7.2.tar.gz
PATCH_COMMAND patch -p1 -i ${CBMC_SOURCE_DIR}/../scripts/cadical-1.7.2-patch
COMMAND cmake -E copy ${CBMC_SOURCE_DIR}/../scripts/cadical_CMakeLists.txt CMakeLists.txt
COMMAND ./configure
URL_MD5 265b1a715000ed3c5b6de36ddd1278a0
URL_MD5 be646831a017f81b300664e58deba1b5
)

add_subdirectory(${cadical_SOURCE_DIR} ${cadical_BINARY_DIR})
Expand All @@ -147,10 +147,10 @@ foreach(SOLVER ${sat_impl})
message(STATUS "Building with IPASIR solver linking against: CaDiCaL")

download_project(PROJ cadical
URL https://github.com/arminbiere/cadical/archive/rel-1.5.3.tar.gz
PATCH_COMMAND patch -p1 -i ${CBMC_SOURCE_DIR}/../scripts/cadical-1.5.3-patch
URL https://github.com/arminbiere/cadical/archive/rel-1.7.2.tar.gz
PATCH_COMMAND patch -p1 -i ${CBMC_SOURCE_DIR}/../scripts/cadical-1.7.2-patch
COMMAND ./configure
URL_MD5 265b1a715000ed3c5b6de36ddd1278a0
URL_MD5 be646831a017f81b300664e58deba1b5
)

message(STATUS "Building CaDiCaL")
Expand Down