--- MANIFEST.in.orig 2023-10-11 13:00:15.000000000 -0600
+++ MANIFEST.in 2024-01-10 11:44:53.578034884 -0700
@@ -3,5 +3,4 @@ global-exclude *.timeout
global-exclude *.in
global-exclude *.txt
recursive-include src/ *.h *.hpp
-recursive-include src/picosat/ *.h *.hpp
recursive-include src/oracle/ *.h *.hpp
--- setup.py.orig 2024-01-10 11:44:53.578034884 -0700
+++ setup.py 2024-01-10 11:45:46.576284465 -0700
@@ -36,16 +36,6 @@ def _parse_toml(pyproject_path):
pyproject_data = toml.loads(pyproject_text)
return pyproject_data['project']['version']
-picosatlib = ('picosatlib', {
- 'sources': [
- "src/picosat/picosat.c",
- "src/picosat/version.c"],
- 'language' : "c",
- 'define_macros' : [("TRACE", "ON")],
- 'include_dirs' : ["src/picosat/"]
- })
-
-
def gen_modules(version):
modules = Extension(
name = "pycryptosat",
@@ -96,6 +86,7 @@ def gen_modules(version):
extra_compile_args = ['-I../', '-Isrc/', '-std=c++17'],
define_macros=[("TRACE", ""), ("CMS_FULL_VERSION", "\""+version+"\"")],
language = "c++",
+ libraries = ['picosat-trace'],
)
return modules
@@ -105,5 +96,4 @@ if __name__ == '__main__':
modules = gen_modules(version)
setup(
ext_modules = [modules],
- libraries = [picosatlib],
)
--- src/CMakeLists.txt.orig 2023-10-11 13:00:15.000000000 -0600
+++ src/CMakeLists.txt 2024-01-10 11:44:53.578034884 -0700
@@ -141,8 +141,6 @@ set(cryptoms_lib_files
gaussian.cpp
packedrow.cpp
matrixfinder.cpp
- picosat/picosat.c
- picosat/version.c
oracle/oracle.cpp
${CMAKE_CURRENT_BINARY_DIR}/GitSHA1.cpp
)
@@ -165,7 +163,7 @@ if (GPU)
)
endif()
-set(cryptoms_lib_link_libs "")
+set(cryptoms_lib_link_libs picosat-trace)
set(cryptoms_lib_link_libs
${cryptoms_lib_link_libs}
@@ -278,7 +276,7 @@ endif()
# indicate that we depend on pthread, and compile in the actual library
target_link_libraries(cryptominisat5
- LINK_PUBLIC ${cryptoms_lib_link_libs}
+ LINK_PRIVATE ${cryptoms_lib_link_libs}
LINK_PUBLIC ${LOUVAIN_COMMUNITIES_LIBRARIES}
LINK_PUBLIC ${CMAKE_THREAD_LIBS_INIT}
)
--- src/occsimplifier.cpp.orig 2023-10-11 13:00:15.000000000 -0600
+++ src/occsimplifier.cpp 2024-01-10 11:44:53.579034870 -0700
@@ -56,7 +56,7 @@ THE SOFTWARE.
#include "bva.h"
#include "trim.h"
extern "C" {
-#include "picosat/picosat.h"
+#include <picosat.h>
}
//#define VERBOSE_DEBUG
--- src/solver.cpp.orig 2023-10-11 13:00:15.000000000 -0600
+++ src/solver.cpp 2024-01-10 11:44:53.580034856 -0700
@@ -79,7 +79,7 @@ THE SOFTWARE.
#include "community_finder.h"
#include "oracle/oracle.h"
extern "C" {
-#include "picosat/picosat.h"
+#include <picosat.h>
}
#include "cryptominisat.h"