diff options
| author | Gereon Kremer <gereon.kremer@cs.rwth-aachen.de> | 2021-03-31 22:00:54 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-03-31 20:00:54 +0000 |
| commit | 39ea1d8a1497a83d1efc649bd10da82916e5db5f (patch) | |
| tree | 3fb701819277f3683f0baf40147a5eb94789009d /contrib | |
| parent | b7210ed60d517aebb25c23a2f407ee59562587dd (diff) | |
Refactor dependencies for external SAT solvers (#6215)
This PR refactors how we obtain, build and use the external SAT solvers used by CVC4: CaDiCaL, CryptoMiniSat and Kissat.
All three contrib scripts are removed and instead an external project is integrated into the cmake find scripts.
Diffstat (limited to 'contrib')
| -rwxr-xr-x | contrib/get-cadical | 21 | ||||
| -rwxr-xr-x | contrib/get-cryptominisat | 27 | ||||
| -rwxr-xr-x | contrib/get-kissat | 24 |
3 files changed, 0 insertions, 72 deletions
diff --git a/contrib/get-cadical b/contrib/get-cadical deleted file mode 100755 index bb3fab2fa..000000000 --- a/contrib/get-cadical +++ /dev/null @@ -1,21 +0,0 @@ -#!/usr/bin/env bash -# -source "$(dirname "$0")/get-script-header.sh" - -CADICAL_DIR="$DEPS_DIR/cadical" -version="rel-1.2.1" - -setup_dep \ - "https://github.com/arminbiere/cadical/archive/$version.tar.gz" "$CADICAL_DIR" -cd "$CADICAL_DIR" - -CXXFLAGS="-fPIC" ./configure && make -j$(nproc) - -install_lib build/libcadical.a -install_includes src/cadical.hpp - -echo -echo "Using CaDiCaL version $version" -echo -echo ===================== Now configure CVC4 with ===================== -echo ./configure.sh --cadical diff --git a/contrib/get-cryptominisat b/contrib/get-cryptominisat deleted file mode 100755 index 655a76eae..000000000 --- a/contrib/get-cryptominisat +++ /dev/null @@ -1,27 +0,0 @@ -#!/usr/bin/env bash -# -source "$(dirname "$0")/get-script-header.sh" - -CMS_DIR="$DEPS_DIR/cryptominisat5" -version="5.8.0" - -setup_dep \ - "https://github.com/msoos/cryptominisat/archive/$version.tar.gz" \ - "$CMS_DIR" -cd "$CMS_DIR" - -mkdir build -cd build -cmake -DENABLE_PYTHON_INTERFACE=OFF \ - -DSTATICCOMPILE=ON \ - -DNOM4RI=ON \ - -DNOSQLITE=ON \ - -DONLY_SIMPLE=ON \ - -DCMAKE_INSTALL_PREFIX="$INSTALL_DIR" \ - .. - -make install -j$(nproc) - -echo -echo ===================== Now configure CVC4 with ===================== -echo ./configure.sh --cryptominisat diff --git a/contrib/get-kissat b/contrib/get-kissat deleted file mode 100755 index 2e21bb69b..000000000 --- a/contrib/get-kissat +++ /dev/null @@ -1,24 +0,0 @@ -#!/usr/bin/env bash - -set -e -o pipefail - -source "$(dirname "$0")/get-script-header.sh" - -KISSAT_DIR="${DEPS_DIR}/kissat" -version="sc2020-039805f2" - -# Download and build Kissat -setup_dep \ - "http://fmv.jku.at/kissat/kissat-$version.tar.xz" "$KISSAT_DIR" -cd "${KISSAT_DIR}" - -./configure -fPIC --quiet -make -j${NPROC} -install_lib build/libkissat.a -install_includes src/kissat.h kissat - -echo -echo "Using Kissat version $version" -echo -echo ===================== Now configure CVC4 with ===================== -echo ./configure.sh --kissat |