Skip to content

Instantly share code, notes, and snippets.

@rgov
Created August 2, 2015 05:13
Show Gist options
  • Save rgov/b7bbd2eb67e8f51ccabe to your computer and use it in GitHub Desktop.
Save rgov/b7bbd2eb67e8f51ccabe to your computer and use it in GitHub Desktop.
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 27fd96f..1cc8f01 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -320,14 +320,6 @@ endif()
# -----------------------------------------------------------------------------
# Find Minisat
# -----------------------------------------------------------------------------
-find_package(minisat)
-set(MINISAT_INCLUDE_DIRS "" CACHE PATH "MiniSat include directory")
-set(MINISAT_LIBDIR "" CACHE PATH "MiniSat library directory")
-if (NOT MINISAT_FOUND)
- message(FATAL_ERROR "You must install minisat from https://github.com/niklasso/minisat")
-else()
- message(STATUS "OK, found Minisat library under ${MINISAT_LIBRARIES} and Minisat include dirs under ${MINISAT_INCLUDE_DIR}")
-endif()
include_directories(${MINISAT_INCLUDE_DIR})
set(LIBS ${LIBS} ${MINISAT_LIBRARIES})
diff --git a/cmake/modules/Findminisat.cmake b/cmake/modules/Findminisat.cmake
index ac0d4dc..8ffa5bf 100644
--- a/cmake/modules/Findminisat.cmake
+++ b/cmake/modules/Findminisat.cmake
@@ -10,6 +10,8 @@ set(MINISAT_DEFINITIONS "")
find_path(MINISAT_INCLUDE_DIR minisat/core/Solver.h
HINTS ${MINISAT_INCLUDE_DIRS}
PATH_SUFFIXES minisat minisat2 )
+message(STATUS "MINISAT_INCLUDE_DIRS = " ${MINISAT_INCLUDE_DIRS})
+message(STATUS "MINISAT_INCLUDE_DIR = " ${MINISAT_INCLUDE_DIR})
if (Minisat_USE_STATIC_LIBS)
message(STATUS "Finding static minisat libs...")
diff --git a/lib/extlib-abc/kit.h b/lib/extlib-abc/kit.h
index 59c07fa..7f96557 100644
--- a/lib/extlib-abc/kit.h
+++ b/lib/extlib-abc/kit.h
@@ -505,27 +505,35 @@ static inline void Kit_TruthIthVar( unsigned * pTruth, int nVars, int iVar )
/// FUNCTION DECLARATIONS ///
////////////////////////////////////////////////////////////////////////
-#if 0
-
/*=== kitBdd.c ==========================================================*/
+#if 0
extern DdNode * Kit_SopToBdd( DdManager * dd, Kit_Sop_t * cSop, int nVars );
extern DdNode * Kit_GraphToBdd( DdManager * dd, Kit_Graph_t * pGraph );
extern DdNode * Kit_TruthToBdd( DdManager * dd, unsigned * pTruth, int nVars, int fMSBonTop );
+#endif
/*=== kitCloud.c ==========================================================*/
+#if 0
extern CloudNode * Kit_TruthToCloud( CloudManager * dd, unsigned * pTruth, int nVars );
extern unsigned * Kit_CloudToTruth( Vec_Int_t * vNodes, int nVars, Vec_Ptr_t * vStore, int fInv );
extern int Kit_CreateCloud( CloudManager * dd, CloudNode * pFunc, Vec_Int_t * vNodes );
extern int Kit_CreateCloudFromTruth( CloudManager * dd, unsigned * pTruth, int nVars, Vec_Int_t * vNodes );
extern unsigned * Kit_TruthCompose( CloudManager * dd, unsigned * pTruth, int nVars, unsigned ** pInputs, int nVarsAll, Vec_Ptr_t * vStore, Vec_Int_t * vNodes );
extern void Kit_TruthCofSupports( Vec_Int_t * vBddDir, Vec_Int_t * vBddInv, int nVars, Vec_Int_t * vMemory, unsigned * puSupps );
+#endif
/*=== kitDsd.c ==========================================================*/
+#if 0
extern Kit_DsdMan_t * Kit_DsdManAlloc( int nVars, int nNodes );
extern void Kit_DsdManFree( Kit_DsdMan_t * p );
+#endif
extern Kit_DsdNtk_t * Kit_DsdDeriveNtk( unsigned * pTruth, int nVars, int nLutSize );
+#if 0
extern unsigned * Kit_DsdTruthCompute( Kit_DsdMan_t * p, Kit_DsdNtk_t * pNtk );
+#endif
extern void Kit_DsdTruth( Kit_DsdNtk_t * pNtk, unsigned * pTruthRes );
+#if 0
extern void Kit_DsdTruthPartial( Kit_DsdMan_t * p, Kit_DsdNtk_t * pNtk, unsigned * pTruthRes, unsigned uSupp );
extern void Kit_DsdTruthPartialTwo( Kit_DsdMan_t * p, Kit_DsdNtk_t * pNtk, unsigned uSupp, int iVar, unsigned * pTruthCo, unsigned * pTruthDec );
+#endif
extern void Kit_DsdPrint( FILE * pFile, Kit_DsdNtk_t * pNtk );
extern void Kit_DsdPrintExpanded( Kit_DsdNtk_t * pNtk );
extern void Kit_DsdPrintFromTruth( unsigned * pTruth, int nVars );
@@ -608,8 +616,6 @@ extern char * Kit_TruthDumpToFile( unsigned * pTruth, int nVars, int nF
#ifdef __cplusplus
}
#endif
-
-#endif
#endif
////////////////////////////////////////////////////////////////////////
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment