Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: msoos/cryptominisat
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 5.11.12
Choose a base ref
...
head repository: msoos/cryptominisat
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 5.11.13
Choose a head ref
  • 2 commits
  • 3 files changed
  • 1 contributor

Commits on Sep 21, 2023

  1. Don't mess with signal handlers in Python

    @msoos
    msoos committed Sep 21, 2023

    Verified

    This commit was signed with the committer’s verified signature.
    bizob2828 Bob Evans
    GPG key ID: 08668564ECC81709
    Verified
    Learn about vigilant mode
    Copy the full SHA
    fa80ca1 View commit details

  2. Bumping version

    @msoos
    msoos committed Sep 21, 2023

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature.
    GPG key ID: B5690EEEBB952194
    Verified
    Learn about vigilant mode
    Copy the full SHA
    ffc7f2b View commit details
Showing with 2 additions and 14 deletions.
  1. +1 −1 CMakeLists.txt
  2. +1 −1 pyproject.toml
  3. +0 −12 python/src/pycryptosat.cpp
2 changes: 1 addition & 1 deletion CMakeLists.txt
View file
Original file line number Diff line number Diff line change
@@ -452,7 +452,7 @@ else()
set(GIT_SHA "GIT-hash-notfound")
endif()

set(CMS_FULL_VERSION "5.11.12")
set(CMS_FULL_VERSION "5.11.13")

string(REPLACE "." ";" CMS_FULL_VERSION_LIST ${CMS_FULL_VERSION})
SetVersionNumber("PROJECT" ${CMS_FULL_VERSION_LIST})
2 changes: 1 addition & 1 deletion pyproject.toml
View file
Original file line number Diff line number Diff line change
@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"

[project]
name = "pycryptosat"
version = "5.11.12"
version = "5.11.13"
description = "Bindings to CryptoMiniSat, an advanced SAT solver"
keywords = ["sat", "cryptography"]
license = { file = "LICENSE.txt" }
12 changes: 0 additions & 12 deletions python/src/pycryptosat.cpp
View file
Original file line number Diff line number Diff line change
@@ -28,7 +28,6 @@ THE SOFTWARE.
#include <structmember.h>
#include <limits>
#include <cassert>
#include <signal.h>
#include <algorithm>
#include "../../src/cryptominisat.h"
using namespace CMSat;
@@ -642,20 +641,9 @@ Solve the system of equations that have been added with add_clause();\n\
);


static SATSolver* solverToInterrupt = NULL;
void SIGINT_handler(int)
{
SATSolver* solver = solverToInterrupt;
if (solverToInterrupt == NULL) { exit(-1); }
solver->interrupt_asap();
}

static PyObject* solve(Solver *self, PyObject *args, PyObject *kwds)
{
PyObject* assumptions = NULL;
solverToInterrupt = self->cmsat;
sighandler_t old_sig_int_handler = signal(SIGINT, SIGINT_handler);
sighandler_t old_sig_term_handler = signal(SIGTERM, SIGINT_handler);

int verbose = self->verbose;
double time_limit = self->time_limit;