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