5a3a024fae
Build now uses cmake. Tests now need boolector, which has license problems. Disable %%check for now unless we can find something useful to do.
81 lines
3.4 KiB
Diff
81 lines
3.4 KiB
Diff
diff --git a/src/extlib-abc/aig/aig/aigPart.c b/src/extlib-abc/aig/aig/aigPart.c
|
|
index a4cc116..c486a11 100644
|
|
--- a/src/extlib-abc/aig/aig/aigPart.c
|
|
+++ b/src/extlib-abc/aig/aig/aigPart.c
|
|
@@ -871,10 +871,6 @@ Vec_Ptr_t * Aig_ManMiterPartitioned( Aig_Man_t * p1, Aig_Man_t * p2, int nPartSi
|
|
***********************************************************************/
|
|
Aig_Man_t * Aig_ManChoicePartitioned( Vec_Ptr_t * vAigs, int nPartSize )
|
|
{
|
|
- extern int Cmd_CommandExecute( void * pAbc, char * sCommand );
|
|
- extern void * Abc_FrameGetGlobalFrame();
|
|
- extern Aig_Man_t * Fra_FraigChoice( Aig_Man_t * pManAig, int nConfMax );
|
|
-
|
|
Vec_Ptr_t * vOutsTotal, * vOuts;
|
|
Aig_Man_t * pAigTotal, * pAigPart, * pAig;
|
|
Vec_Int_t * vPart, * vPartSupp;
|
|
@@ -898,8 +894,6 @@ Aig_Man_t * Aig_ManChoicePartitioned( Vec_Ptr_t * vAigs, int nPartSize )
|
|
Aig_ManForEachPi( pAig, pObj, k )
|
|
pObj->pNext = (Aig_Obj_t *)(long)k;
|
|
|
|
- Cmd_CommandExecute( Abc_FrameGetGlobalFrame(), "unset progressbar" );
|
|
-
|
|
// create the total fraiged AIG
|
|
vPartSupp = Vec_IntAlloc( 100 ); // maps part PI num into total PI num
|
|
Vec_PtrForEachEntry( vParts, vPart, i )
|
|
@@ -936,7 +930,7 @@ Aig_Man_t * Aig_ManChoicePartitioned( Vec_Ptr_t * vAigs, int nPartSize )
|
|
i+1, Vec_PtrSize(vParts), Aig_ManPiNum(pAigPart), Aig_ManPoNum(pAigPart),
|
|
Aig_ManNodeNum(pAigPart), Aig_ManLevelNum(pAigPart) );
|
|
// compute equivalence classes (to be stored in pNew->pReprs)
|
|
- pAig = Fra_FraigChoice( pAigPart, 1000 );
|
|
+ pAig = NULL;
|
|
Aig_ManStop( pAig );
|
|
// reset the pData pointers
|
|
Aig_ManForEachObj( pAigPart, pObj, k )
|
|
@@ -951,8 +945,6 @@ Aig_Man_t * Aig_ManChoicePartitioned( Vec_Ptr_t * vAigs, int nPartSize )
|
|
Vec_VecFree( (Vec_Vec_t *)vParts );
|
|
Vec_IntFree( vPartSupp );
|
|
|
|
- Cmd_CommandExecute( Abc_FrameGetGlobalFrame(), "set progressbar" );
|
|
-
|
|
// clear the PI numbers
|
|
Vec_PtrForEachEntry( vAigs, pAig, i )
|
|
Aig_ManForEachPi( pAig, pObj, k )
|
|
diff --git a/src/extlib-abc/aig/aig/aigShow.c b/src/extlib-abc/aig/aig/aigShow.c
|
|
index a88f493..34b26ef 100644
|
|
--- a/src/extlib-abc/aig/aig/aigShow.c
|
|
+++ b/src/extlib-abc/aig/aig/aigShow.c
|
|
@@ -328,7 +328,6 @@ void Aig_WriteDotAig( Aig_Man_t * pMan, char * pFileName, int fHaig, Vec_Ptr_t *
|
|
***********************************************************************/
|
|
void Aig_ManShow( Aig_Man_t * pMan, int fHaig, Vec_Ptr_t * vBold )
|
|
{
|
|
- extern void Abc_ShowFile( char * FileNameDot );
|
|
static int Counter = 0;
|
|
char FileNameDot[200];
|
|
FILE * pFile;
|
|
@@ -344,8 +343,6 @@ void Aig_ManShow( Aig_Man_t * pMan, int fHaig, Vec_Ptr_t * vBold )
|
|
fclose( pFile );
|
|
// generate the file
|
|
Aig_WriteDotAig( pMan, FileNameDot, fHaig, vBold );
|
|
- // visualize the file
|
|
- Abc_ShowFile( FileNameDot );
|
|
}
|
|
|
|
|
|
diff --git a/src/extlib-abc/aig/kit/kitGraph.c b/src/extlib-abc/aig/kit/kitGraph.c
|
|
index 1ae5891..f6ea2ca 100644
|
|
--- a/src/extlib-abc/aig/kit/kitGraph.c
|
|
+++ b/src/extlib-abc/aig/kit/kitGraph.c
|
|
@@ -20,6 +20,12 @@
|
|
|
|
#include "kit.h"
|
|
|
|
+Kit_Graph_t *Kit_SopFactor( Vec_Int_t * vCover, int fCompl, int nVars,
|
|
+ Vec_Int_t * vMemory )
|
|
+{
|
|
+ return NULL;
|
|
+}
|
|
+
|
|
////////////////////////////////////////////////////////////////////////
|
|
/// DECLARATIONS ///
|
|
////////////////////////////////////////////////////////////////////////
|