PySDD 0.2.11__tar.gz → 0.2.12__tar.gz

{PySDD-0.2.11 → pysdd-0.2.12}/PKG-INFO

@@ -1,12 +1,12 @@
 Metadata-Version: 2.1
 Name: PySDD
-Version: 0.2.11
+Version: 0.2.12
 Summary: Sentential Decision Diagrams
 Home-page: https://github.com/wannesm/PySDD
 Author: Wannes Meert, Arthur Choi
 Author-email: wannes.meert@cs.kuleuven.be
 License: Apache 2.0
-Project-URL: PySDD documentation, http://pysdd.readthedocs.io/en/latest/
+Project-URL: PySDD documentation, https://pysdd.readthedocs.io/en/latest/
 Project-URL: PySDD source, https://github.com/wannesm/PySDD
 Keywords: sdd,knowledge compilation
 Classifier: Intended Audience :: Developers
@@ -14,9 +14,14 @@ Classifier: License :: OSI Approved :: Apache Software License
 Classifier: Programming Language :: Python :: 3
 Classifier: Topic :: Scientific/Engineering :: Artificial Intelligence
 Requires-Python: >=3.6
+License-File: LICENSE
+Requires-Dist: cython>=3.0.0
 Provides-Extra: all
+Requires-Dist: cysignals; extra == "all"
+Requires-Dist: numpy; extra == "all"
 Provides-Extra: dev
-License-File: LICENSE
+Requires-Dist: pytest; extra == "dev"
+Requires-Dist: cython>=3.0.0; extra == "dev"
 
 =====
 PySDD

{PySDD-0.2.11 → pysdd-0.2.12}/PySDD.egg-info/PKG-INFO

@@ -1,12 +1,12 @@
 Metadata-Version: 2.1
 Name: PySDD
-Version: 0.2.11
+Version: 0.2.12
 Summary: Sentential Decision Diagrams
 Home-page: https://github.com/wannesm/PySDD
 Author: Wannes Meert, Arthur Choi
 Author-email: wannes.meert@cs.kuleuven.be
 License: Apache 2.0
-Project-URL: PySDD documentation, http://pysdd.readthedocs.io/en/latest/
+Project-URL: PySDD documentation, https://pysdd.readthedocs.io/en/latest/
 Project-URL: PySDD source, https://github.com/wannesm/PySDD
 Keywords: sdd,knowledge compilation
 Classifier: Intended Audience :: Developers
@@ -14,9 +14,14 @@ Classifier: License :: OSI Approved :: Apache Software License
 Classifier: Programming Language :: Python :: 3
 Classifier: Topic :: Scientific/Engineering :: Artificial Intelligence
 Requires-Python: >=3.6
+License-File: LICENSE
+Requires-Dist: cython>=3.0.0
 Provides-Extra: all
+Requires-Dist: cysignals; extra == "all"
+Requires-Dist: numpy; extra == "all"
 Provides-Extra: dev
-License-File: LICENSE
+Requires-Dist: pytest; extra == "dev"
+Requires-Dist: cython>=3.0.0; extra == "dev"
 
 =====
 PySDD

{PySDD-0.2.11 → pysdd-0.2.12}/PySDD.egg-info/SOURCES.txt

@@ -23,7 +23,6 @@ pysdd/sdd.dll
 pysdd/sdd.pyx
 pysdd/sddapi_c.pxd
 pysdd/util.py
-pysdd/weight_optimization_c.pxd
 pysdd/wmcstochastic.py
 pysdd/lib/libsdd-2.0/sddapi.h
 pysdd/lib/libsdd-2.0/include/iterators.h
@@ -107,8 +106,10 @@ pysdd/lib/sdd-2.0/src/fnf/fnf.c
 pysdd/lib/sdd-2.0/src/fnf/io.c
 pysdd/lib/sdd-2.0/src/fnf/utils.c
 pysdd/lib/sdd_extra/include/sddapi_extra.h
-pysdd/lib/weight_optimization/include/arithmetic_ansi.h
-pysdd/lib/weight_optimization/include/lbfgs.h
-pysdd/lib/weight_optimization/include/weight_optimizer.h
-pysdd/lib/weight_optimization/src/lbfgs.c
-pysdd/lib/weight_optimization/src/weight_optimizer.c
+tests/test_iterator.py
+tests/test_minimize.py
+tests/test_nnf.py
+tests/test_psdd.py
+tests/test_util.py
+tests/test_vtree.py
+tests/test_wmcstochastic.py

{PySDD-0.2.11 → pysdd-0.2.12}/PySDD.egg-info/requires.txt

@@ -1,4 +1,4 @@
-cython>=0.29.6
+cython>=3.0.0
 
 [all]
 cysignals
@@ -6,4 +6,4 @@ numpy
 
 [dev]
 pytest
-cython>=0.29.6
+cython>=3.0.0

pysdd-0.2.12/pysdd/__init__.py

@@ -0,0 +1 @@
+__version__ = "0.2.12"

{PySDD-0.2.11 → pysdd-0.2.12}/pysdd/compiler_c.pxd

@@ -6,7 +6,7 @@ __license__ = "APL"
 
 """
 
-cimport sddapi_c
+from . cimport sddapi_c
 
 cdef extern from "compiler.h":
     ctypedef struct SddCompilerOptions:
@@ -29,7 +29,7 @@ cdef extern from "compiler.h":
         int post_search             #  post-compilation search
         int verbose                 #  print manager
     ctypedef struct Fnf:
-        long var_count;
+        long long var_count;
         sddapi_c.SddSize litset_count;
     ctypedef Fnf Cnf;
     ctypedef Fnf Dnf;

{PySDD-0.2.11 → pysdd-0.2.12}/pysdd/fnf_c.pxd

@@ -7,8 +7,8 @@ pysdd.fnf_c
 :copyright: Copyright 2017-2018 KU Leuven and Regents of the University of California.
 :license: Apache License, Version 2.0, see LICENSE for details.
 """
-cimport sddapi_c
-cimport compiler_c
+from . cimport sddapi_c
+from . cimport compiler_c
 
 cdef extern from "fnf.h":
     void free_fnf(compiler_c.Fnf* fnf)

{PySDD-0.2.11 → pysdd-0.2.12}/pysdd/io_c.pxd

@@ -7,8 +7,8 @@ pysdd.io_c
 :copyright: Copyright 2017-2018 KU Leuven and Regents of the University of California.
 :license: Apache License, Version 2.0, see LICENSE for details.
 """
-cimport sddapi_c
-cimport compiler_c
+from . cimport sddapi_c
+from . cimport compiler_c
 
 cdef extern from "io.h":
     compiler_c.Fnf* read_fnf(const char* filename);

{PySDD-0.2.11 → pysdd-0.2.12}/pysdd/lib/libsdd-2.0/include/sdd.h

@@ -26,11 +26,11 @@
 
 //sdd types
 typedef size_t SddSize; //number of nodes, sizes of hash tables, etc
-typedef unsigned int SddNodeSize; //size of decomposition for sdd nodes
-typedef unsigned int SddRefCount; //refcount
+typedef size_t SddNodeSize; //size of decomposition for sdd nodes
+typedef size_t SddRefCount; //refcount
 typedef unsigned long long SddModelCount; //model count
 typedef double SddWmc; // weighted model count
-typedef long SddLiteral; //literals of clauses
+typedef long long SddLiteral; //literals of clauses
 
 //control strings
 #define PRIsS "zu"
@@ -548,6 +548,7 @@ void cache_computation(SddNode* node1, SddNode* node2, SddNode* node, BoolOp op,
 void sdd_vtree_garbage_collect(Vtree* vtree, SddManager* manager);
 
 //hash.c
+#if defined(WIN32) || defined(_WIN32)
 inline float hit_rate(SddHash* hash) {
 	return 100.0 * hash->hit_count / hash->lookup_count;
 }
@@ -555,6 +556,10 @@ inline float hit_rate(SddHash* hash) {
 inline float ave_lookup_cost(SddHash* hash) {
 	return ((float)hash->lookup_cost) / hash->lookup_count;
 }
+#else
+float hit_rate(SddHash* hash);
+float ave_lookup_cost(SddHash* hash);
+#endif
 float saturation(SddHash* hash);
 
 //reference.c
@@ -754,11 +759,14 @@ void sdd_vtree_save(const char* fname, Vtree* vtree);
 void sdd_vtree_save_as_dot(const char* fname, Vtree* vtree);
 
 //compare.c
-//int sdd_vtree_is_sub(const Vtree* vtree1, const Vtree* vtree2);
+#if defined(WIN32) || defined(_WIN32)
 //tests whether vtree1 is a subtree of vtree2
 inline int sdd_vtree_is_sub(const Vtree* vtree1, const Vtree* vtree2) {
 	return vtree1->position >= vtree2->first->position && vtree1->position <= vtree2->last->position;
 }
+#else
+int sdd_vtree_is_sub(const Vtree* vtree1, const Vtree* vtree2);
+#endif
 Vtree* sdd_vtree_lca(Vtree* vtree1, Vtree* vtree2, Vtree* root);
 Vtree* lca_of_compressed_elements(SddNodeSize size, SddElement* elements, SddManager* manager);
 

{PySDD-0.2.11 → pysdd-0.2.12}/pysdd/lib/libsdd-2.0/sddapi.h

@@ -23,11 +23,11 @@
  
 //sdd types
 typedef size_t SddSize; //number of nodes, sizes of hash tables, etc
-typedef unsigned int SddNodeSize; //size of decomposition for sdd nodes
-typedef unsigned int SddRefCount; //refcount
+typedef size_t SddNodeSize; //size of decomposition for sdd nodes
+typedef size_t SddRefCount; //refcount
 typedef unsigned long long SddModelCount; //model counts
 typedef double SddWmc; // weighted model count
-typedef long SddLiteral; //literals of clauses
+typedef long long SddLiteral; //literals of clauses
 
 //control strings
 #define PRIsS "zu"

{PySDD-0.2.11 → pysdd-0.2.12}/pysdd/lib/libsdd-2.0/src/basic/hash.c

@@ -103,6 +103,19 @@ SddSize key_sdd_node(SddNode* node, SddHash* hash) {
  * hash table properties
  *******************************************************************************************/
 
+#if defined(WIN32) || defined(_WIN32)
+#else
+inline
+float hit_rate(SddHash* hash) {
+  return 100.0*hash->hit_count/hash->lookup_count;
+}
+
+inline
+float ave_lookup_cost(SddHash* hash) {
+  return ((float)hash->lookup_cost)/hash->lookup_count;
+}
+#endif
+
 
 //percentage of entries in hash table that have non-empty collision lists 
 float saturation(SddHash* hash) {

{PySDD-0.2.11 → pysdd-0.2.12}/pysdd/lib/libsdd-2.0/src/basic/memory.c

@@ -84,7 +84,7 @@ SddNode* new_sdd_node(SddNodeType type, SddNodeSize size, Vtree* vtree, SddManag
   else { //allocate decomposition 
     assert(size > 0);
     //allocate decomposition node
-    int bucket = (size < GC_BUCKETS_COUNT? size: 0);
+    size_t bucket = (size < GC_BUCKETS_COUNT? size: 0);
     node       = manager->gc_node_lists[bucket];	
     if(node != NULL) { //allocating from gc list
       --manager->gc_node_count;
@@ -156,7 +156,7 @@ void gc_sdd_node(SddNode* node, SddManager* manager) {
   ++manager->gc_node_count;
   manager->gc_element_count += node->size; //no change for literal sdds
   
-  int bucket = (node->size < GC_BUCKETS_COUNT? node->size: 0); //literal sdds go into bucket 0
+  size_t bucket = (node->size < GC_BUCKETS_COUNT? node->size: 0); //literal sdds go into bucket 0
   node->next = manager->gc_node_lists[bucket]; 
   manager->gc_node_lists[bucket] = node; //add node to corresponding bucket
   

{PySDD-0.2.11 → pysdd-0.2.12}/pysdd/lib/libsdd-2.0/src/manager/interface.c

@@ -268,16 +268,16 @@ void sdd_manager_minimize_limited(SddManager* manager) {
 
 
 // these are checked by exceeded_limits(), invoked by l_apply
-void sdd_manager_set_vtree_search_time_limit(float time_limit, SddManager* manager) {
+void sdd_manager_set_vtree_search_time_limit(clock_t time_limit, SddManager* manager) {
   manager->vtree_ops.search_time_limit = time_limit*CLOCKS_PER_SEC;
 }
-void sdd_manager_set_vtree_fragment_time_limit(float time_limit, SddManager* manager) {
+void sdd_manager_set_vtree_fragment_time_limit(clock_t time_limit, SddManager* manager) {
   manager->vtree_ops.fragment_time_limit = time_limit*CLOCKS_PER_SEC;
 }
-void sdd_manager_set_vtree_operation_time_limit(float time_limit, SddManager* manager) {
+void sdd_manager_set_vtree_operation_time_limit(clock_t time_limit, SddManager* manager) {
   manager->vtree_ops.op_time_limit = time_limit*CLOCKS_PER_SEC;
 }
-void sdd_manager_set_vtree_apply_time_limit(float time_limit, SddManager* manager) {
+void sdd_manager_set_vtree_apply_time_limit(clock_t time_limit, SddManager* manager) {
   manager->vtree_ops.apply_time_limit = time_limit*CLOCKS_PER_SEC;
 }
 void sdd_manager_set_vtree_operation_memory_limit(float memory_limit, SddManager* manager) {

{PySDD-0.2.11 → pysdd-0.2.12}/pysdd/lib/libsdd-2.0/src/sdds/exists_multiple.c

@@ -32,7 +32,7 @@ static void deref_nodes_of_terminal_shadows(SddShadows* shadows);
 //exists_map[var]  : is 1 if var is to be existentially quantified, 0 otherwise
 //exists_map[0]    : not used
 
-static long ref_count; //sanity check
+static long long ref_count; //sanity check
 
 SddNode* sdd_exists_multiple(int* exists_map, SddNode* node, SddManager* manager) {
   CHECK_ERROR(GC_NODE(node),ERR_MSG_GC,"sdd_exists_multiple");

{PySDD-0.2.11 → pysdd-0.2.12}/pysdd/lib/libsdd-2.0/src/sdds/io.c

@@ -285,7 +285,7 @@ void print_sdd_node_file(FILE* file, SddNode* node) {
   else if(node->type==FALSE) fprintf(file,"F %"PRIsS"\n",node->index);
   else if(node->type==LITERAL) fprintf(file,"L %"PRIsS" %"PRIsS" %"PRIlitS"\n",node->index,vtree->position,LITERAL_OF(node));
   else {//decomposition 
-    fprintf(file,"D %"PRIsS" %"PRIsS" %"PRInsS"",node->index,vtree->position,node->size);
+    fprintf(file,"D %"PRIsS" %"PRIsS" %"PRIsS"",node->index,vtree->position,node->size);
 	FOR_each_prime_sub_of_node(prime,sub,node,fprintf(file," %"PRIsS" %"PRIsS"",prime->index,sub->index));
     fprintf(file,"\n");     
   }

{PySDD-0.2.11 → pysdd-0.2.12}/pysdd/lib/libsdd-2.0/src/util.c

@@ -186,7 +186,7 @@ char* read_file(const char* filename) {
   // lookup file size
   // AC: I don't think this is the best way to do this
   fseek(file,0,SEEK_END);
-  unsigned int file_size = ftell(file);
+  size_t file_size = ftell(file);
   rewind(file);
 
   // allocate memory
@@ -194,7 +194,7 @@ char* read_file(const char* filename) {
   CALLOC(buffer,char,file_size+1,"read_file");
 
   // read the whole file
-  unsigned int result = fread(buffer,sizeof(char),file_size,file);
+  size_t result = fread(buffer,sizeof(char),file_size,file);
   if (result != file_size) {
     printf("Could not read the file %s\n",filename);
     exit(1);

{PySDD-0.2.11 → pysdd-0.2.12}/pysdd/lib/libsdd-2.0/src/vtrees/compare.c

@@ -13,6 +13,14 @@ char cmp_vtrees(Vtree** lca, Vtree* vtree1, Vtree* vtree2);
  * basic tests
  ****************************************************************************************/
 
+#if defined(WIN32) || defined(_WIN32)
+#else
+//tests whether vtree1 is a subtree of vtree2
+inline
+int sdd_vtree_is_sub(const Vtree* vtree1, const Vtree* vtree2) {
+  return vtree1->position >= vtree2->first->position && vtree1->position <= vtree2->last->position;
+}
+#endif
 
 /****************************************************************************************
  * lca is the lowest common ancestor

{PySDD-0.2.11 → pysdd-0.2.12}/pysdd/lib/libsdd-2.0/src/vtrees/static.c

@@ -158,7 +158,7 @@ Vtree* new_random_vtree(SddLiteral var_count) {
   SddLiteral* labels = (SddLiteral*) calloc(var_count,sizeof(SddLiteral));
   for(SddLiteral i=0; i<var_count; i++) labels[i] = i+1; //assign labels
   SddLiteral unused_count = var_count;
-  srand(time(NULL));
+  srand((unsigned int)time(NULL));
   Vtree* vtree = new_random_vtree_aux(var_count,labels,&unused_count);
   free(labels);
   return vtree;

{PySDD-0.2.11 → pysdd-0.2.12}/pysdd/lib/sdd-2.0/include/sddapi.h

@@ -23,11 +23,11 @@
  
 //sdd types
 typedef size_t SddSize; //number of nodes, sizes of hash tables, etc
-typedef unsigned int SddNodeSize; //size of decomposition for sdd nodes
-typedef unsigned int SddRefCount; //refcount
+typedef size_t SddNodeSize; //size of decomposition for sdd nodes, changed to size_t for cross-platform compatibility
+typedef size_t SddRefCount; //refcount, changed to size_t for cross-platform compatibility
 typedef unsigned long long SddModelCount; //model counts
 typedef double SddWmc; // weighted model count
-typedef long SddLiteral; //literals of clauses
+typedef long long SddLiteral; //literals of clauses
 typedef char SddNodeType; //holds one of two values defined next
 
 //control strings

{PySDD-0.2.11 → pysdd-0.2.12}/pysdd/lib/sdd-2.0/src/fnf/compiler.c

@@ -25,7 +25,7 @@ SddNode* degenerate_fnf_test(Fnf* fnf, SddManager* manager) {
 
   if(count==0) return ONE(manager,op);
 
-  for(int i=0; i<count; i++) {
+  for(SddSize i=0; i<count; i++) {
     if (fnf->litsets[i].literal_count == 0)
       return ZERO(manager,op);
   }
@@ -43,7 +43,7 @@ SddNode* fnf_to_sdd_auto(Fnf* fnf, SddManager* manager) {
 
   if(verbose) { printf("\nclauses: %ld ",count); fflush(stdout); }
   SddNode* node = ONE(manager,op);
-  for(int i=0; i<count; i++) {
+  for(SddSize i=0; i<count; i++) {
     sort_litsets_by_lca(litsets+i,count-i,manager);
     sdd_ref(node,manager);
     SddNode* l = apply_litset(litsets[i],manager);
@@ -67,7 +67,7 @@ SddNode* fnf_to_sdd_manual(Fnf* fnf, SddManager* manager) {
 
   if(verbose) { printf("\nclauses: %ld ",count); fflush(stdout); }
   SddNode* node = ONE(manager,op);
-  for(int i=0; i<count; i++) {
+  for(SddSize i=0; i<count; i++) {
     if(period > 0 && i > 0 && i%period==0) {
       // after every period clauses
       sdd_ref(node,manager);

{PySDD-0.2.11 → pysdd-0.2.12}/pysdd/lib/sdd-2.0/src/fnf/io.c

@@ -26,14 +26,14 @@ static char* read_file(const char* filename) {
 
   // lookup file size
   fseek(file,0,SEEK_END);
-  unsigned int file_size = ftell(file);
+  size_t file_size = ftell(file);
   rewind(file);
 
   // allocate memory
   char* buffer = (char*)calloc(file_size+1,sizeof(char));
 
   // read the whole file
-  unsigned int result = fread(buffer,sizeof(char),file_size,file);
+  size_t result = fread(buffer,sizeof(char),file_size,file);
   if (result != file_size) {
     printf("Could not read the file %s\n",filename);
     exit(1);

{PySDD-0.2.11 → pysdd-0.2.12}/pysdd/lib/sdd-2.0/src/fnf/utils.c

@@ -57,7 +57,8 @@ int litset_cmp_lca(const void* litset1_loc, const void* litset2_loc) {
 //last: by id to obtain unique order
 void sort_litsets_by_lca(LitSet** litsets, SddSize size, SddManager* manager) {
   //compute lcas of litsets
-  for(SddLiteral i=0; i<size; i++) {
+  // i was SddLiteral but to be type compatible and since i is always positive, changed to SddSize
+  for(SddSize i=0; i<size; i++) {
     LitSet* litset = litsets[i];
     litset->vtree  = sdd_manager_lca_of_literals(litset->literal_count,litset->literals,manager);
   }