PySDD 1.0.5__tar.gz → 1.0.7__tar.gz

pysdd-1.0.7/MANIFEST.in

@@ -0,0 +1,5 @@
+# The sdist must hold what the build needs: setuptools adds the .pyx and .c
+# sources listed in pyproject.toml, but not the .pxd files sdd.pyx cimports
+# or the C headers in the include dirs.
+include pysdd/*.pxd
+recursive-include pysdd/lib *.h

{pysdd-1.0.5 → pysdd-1.0.7}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: PySDD
-Version: 1.0.5
+Version: 1.0.7
 Summary: Sentential Decision Diagrams
 Author: Arthur Choi
 Author-email: Wannes Meert <wannes.meert@cs.kuleuven.be>, Robin Manhaeve <robin.manhaeve@kuleuven.be>
@@ -33,6 +33,7 @@ Provides-Extra: tests
 Requires-Dist: pytest; extra == "tests"
 Provides-Extra: notebooks
 Requires-Dist: numpy; extra == "notebooks"
+Dynamic: license-file
 
 =====
 PySDD

{pysdd-1.0.5 → pysdd-1.0.7}/PySDD.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: PySDD
-Version: 1.0.5
+Version: 1.0.7
 Summary: Sentential Decision Diagrams
 Author: Arthur Choi
 Author-email: Wannes Meert <wannes.meert@cs.kuleuven.be>, Robin Manhaeve <robin.manhaeve@kuleuven.be>
@@ -33,6 +33,7 @@ Provides-Extra: tests
 Requires-Dist: pytest; extra == "tests"
 Provides-Extra: notebooks
 Requires-Dist: numpy; extra == "notebooks"
+Dynamic: license-file
 
 =====
 PySDD

{pysdd-1.0.5 → pysdd-1.0.7}/PySDD.egg-info/SOURCES.txt

@@ -1,4 +1,5 @@
 LICENSE
+MANIFEST.in
 README.rst
 pyproject.toml
 PySDD.egg-info/PKG-INFO
@@ -10,10 +11,19 @@ PySDD.egg-info/top_level.txt
 pysdd/__init__.py
 pysdd/__main__.py
 pysdd/cli.py
+pysdd/compiler_c.pxd
+pysdd/fnf_c.pxd
+pysdd/io_c.pxd
 pysdd/iterator.py
 pysdd/sdd.pyx
+pysdd/sddapi_c.pxd
 pysdd/util.py
 pysdd/wmcstochastic.py
+pysdd/lib/libsdd-2.0/include/iterators.h
+pysdd/lib/libsdd-2.0/include/macros.h
+pysdd/lib/libsdd-2.0/include/parameters.h
+pysdd/lib/libsdd-2.0/include/sdd.h
+pysdd/lib/libsdd-2.0/include/stacks.h
 pysdd/lib/libsdd-2.0/src/util.c
 pysdd/lib/libsdd-2.0/src/verify.c
 pysdd/lib/libsdd-2.0/src/version.c
@@ -61,6 +71,7 @@ pysdd/lib/libsdd-2.0/src/vtree_operations/op_right_rotate.c
 pysdd/lib/libsdd-2.0/src/vtree_operations/op_swap.c
 pysdd/lib/libsdd-2.0/src/vtree_operations/rollback.c
 pysdd/lib/libsdd-2.0/src/vtree_operations/split.c
+pysdd/lib/libsdd-2.0/src/vtree_operations/vtree_ops.h
 pysdd/lib/libsdd-2.0/src/vtree_search/auto.c
 pysdd/lib/libsdd-2.0/src/vtree_search/search.c
 pysdd/lib/libsdd-2.0/src/vtree_search/state.c
@@ -71,10 +82,15 @@ pysdd/lib/libsdd-2.0/src/vtrees/maps.c
 pysdd/lib/libsdd-2.0/src/vtrees/moves.c
 pysdd/lib/libsdd-2.0/src/vtrees/static.c
 pysdd/lib/libsdd-2.0/src/vtrees/vtree.c
+pysdd/lib/sdd-2.0/include/compiler.h
+pysdd/lib/sdd-2.0/include/fnf.h
+pysdd/lib/sdd-2.0/include/io.h
+pysdd/lib/sdd-2.0/include/sddapi.h
 pysdd/lib/sdd-2.0/src/fnf/compiler.c
 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
 tests/test_iterator.py
 tests/test_minimize.py
 tests/test_nnf.py

{pysdd-1.0.5 → pysdd-1.0.7}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "PySDD"
-version = "1.0.5"
+version = "1.0.7"
 description = "Sentential Decision Diagrams"
 authors = [
     { name = "Wannes Meert", email = "wannes.meert@cs.kuleuven.be" },

pysdd-1.0.7/pysdd/compiler_c.pxd

@@ -0,0 +1,37 @@
+"""
+compiler_c - SDD
+
+__author__ = "Wannes Meert, Arthur Choi"
+__license__ = "APL"
+
+"""
+
+from . cimport sddapi_c
+
+cdef extern from "compiler.h":
+    ctypedef struct SddCompilerOptions:
+        # input files
+        char* cnf_filename         # input cnf filename
+        char* dnf_filename         # input dnf filename
+        char* vtree_filename       # input vtree filename
+        char* sdd_filename         # input sdd filename (.sdd, plain text)
+        # output files
+        char* output_vtree_filename      # output vtree filename (.vtree, plain text)
+        char* output_vtree_dot_filename  # output vtree filename (.dot)
+        char* output_sdd_filename        # output sdd filename (.sdd, plain text)
+        char* output_sdd_dot_filename    # output sdd filename (.dot)
+        # flags
+        int minimize_cardinality    # construct sdd that has only minimum cardinality models
+        # initial vtree
+        char* initial_vtree_type    # initial vtree for manager
+        # compilation controls
+        int vtree_search_mode       #  vtree search mode
+        int post_search             #  post-compilation search
+        int verbose                 #  print manager
+    ctypedef struct Fnf:
+        long long var_count;
+        sddapi_c.SddSize litset_count;
+    ctypedef Fnf Cnf;
+    ctypedef Fnf Dnf;
+
+    sddapi_c.SddNode* fnf_to_sdd(Fnf* fnf, sddapi_c.SddManager* manager);

pysdd-1.0.7/pysdd/fnf_c.pxd

@@ -0,0 +1,17 @@
+# -*- coding: UTF-8 -*-
+"""
+pysdd.fnf_c
+~~~~~~~~~~~
+
+:author: Wannes Meert, Arthur Choi
+:copyright: Copyright 2017-2018 KU Leuven and Regents of the University of California.
+:license: Apache License, Version 2.0, see LICENSE for details.
+"""
+from . cimport sddapi_c
+from . cimport compiler_c
+
+cdef extern from "fnf.h":
+    void free_fnf(compiler_c.Fnf* fnf)
+
+# cdef extern from "fnf_wrapper.h":
+#     void free_fnf_wrapper(compiler_c.Fnf* fnf)

pysdd-1.0.7/pysdd/io_c.pxd

@@ -0,0 +1,22 @@
+# -*- coding: UTF-8 -*-
+"""
+pysdd.io_c
+~~~~~~~~~~
+
+:author: Wannes Meert, Arthur Choi
+:copyright: Copyright 2017-2018 KU Leuven and Regents of the University of California.
+:license: Apache License, Version 2.0, see LICENSE for details.
+"""
+from . cimport sddapi_c
+from . cimport compiler_c
+
+cdef extern from "io.h":
+    compiler_c.Fnf* read_fnf(const char* filename);
+    compiler_c.Cnf* read_cnf(const char* filename);
+    compiler_c.Dnf* read_dnf(const char* filename);
+
+
+# cdef extern from "io_wrapper.h":
+#     compiler_c.Fnf* read_fnf_wrapper(const char* filename)
+#     compiler_c.Cnf* read_cnf_wrapper(const char* filename)
+#     compiler_c.Dnf* read_dnf_wrapper(const char* filename)

pysdd-1.0.7/pysdd/lib/libsdd-2.0/include/iterators.h

@@ -0,0 +1,243 @@
+/****************************************************************************************
+ * The Sentential Decision Diagram Package
+ * sdd version 2.0, January 8, 2018
+ * http://reasoning.cs.ucla.edu/sdd
+ ****************************************************************************************/
+
+#ifndef ITERATORS_H_
+#define ITERATORS_H_
+
+/****************************************************************************************
+ * iterator over ALL vtree nodes (linked using ->next, ->prev, ->first and ->last)
+ ****************************************************************************************/
+
+//iterates over each node V in a vtree rooted at R, executing code B for each node
+//
+//V: vtree node
+//R: vtree root
+//B: code
+#define FOR_each_vtree_node(V,R,B) {\
+  Vtree* V    = (R)->first; /* head of linked list */\
+  Vtree* _out = (R)->last->next; /* node following last node of vtree (can be NULL) */\
+  while(V!=_out) {\
+    assert(V);\
+	B; /* execute code */\
+	V = V->next; /* next node of vtree */\
+  }\
+}
+
+/****************************************************************************************
+ * iterator over INTERNAL vtree nodes (linked using ->next, ->prev, ->first and ->last)
+ *
+ * the nodes of a vtree linked list alternate between leaf and internal nodes, with
+ * the first and last nodes being leaves
+ ****************************************************************************************/
+
+//iterates over each internal node V in a vtree rooted at R, executing code B for each node
+//
+//V: vtree node
+//R: vtree root
+//B: code
+#define FOR_each_internal_vtree_node(V,R,B) {\
+  Vtree* V          = (R)->first; /* first leaf node of vtree */\
+  Vtree* _last_leaf = (R)->last; /* last leaf node of vtree */\
+  while(V!=_last_leaf) {\
+    V = V->next; /* V is internal */\
+    assert(INTERNAL(V));\
+	B; /* execute code */\
+	V = V->next; /* V is leaf */\
+    assert(LEAF(V));\
+  }\
+}
+
+/****************************************************************************************
+ * iterator over LEAF vtree nodes (linked using ->next, ->prev, ->first and ->last)
+ *
+ * the nodes of a vtree linked list alternate between leaf and internal nodes, with
+ * the first and last nodes being leaves
+ ****************************************************************************************/
+
+//iterates over each leaf node V in a vtree rooted at R, executing code B for each node
+//
+//V: vtree node
+//R: vtree root
+//B: code
+#define FOR_each_leaf_vtree_node(V,R,B) {\
+  Vtree* V          = (R)->first; /* first leaf node of vtree */\
+  Vtree* _last_leaf = (R)->last; /* last leaf node of vtree */\
+  while(V!=_last_leaf) {\
+    assert(LEAF(V));\
+	B; /* execute code */\
+	V = V->next->next; /* V is leaf */\
+  }\
+  assert(LEAF(V));\
+  B; /* execute code on last leaf */\
+}
+
+/****************************************************************************************
+ * iterator over ANCESTOR vtree nodes (visiting children before parents)
+ ****************************************************************************************/
+
+//iterates over each ancestor V in a vtree rooted at R, executing code B for each node
+//
+//V: vtree node
+//R: vtree root
+//B: code
+#define FOR_each_ancestral_vtree_node(V,R,B) {\
+  Vtree* V = (R)->parent;\
+  while(V) {\
+	B; /* execute code */\
+	V = V->parent;\
+  }\
+}
+
+
+/****************************************************************************************
+ * iterator over nodes normalized for a vtree 
+ * (linked using the ->vtree_next and ->vtree_prev fields)
+ ****************************************************************************************/
+
+//iterate over the sdd nodes normalized for vtree node V, executing code B for each node
+//this iterator allows freeing sdd nodes or changing their ->vtree_next and ->vtree_prev
+//fields in code B
+//
+//N: node
+//V: vtree
+//B: code
+#define FOR_each_sdd_node_normalized_for(N,V,B) {\
+  SddNode* N = (V)->nodes; /* head of linked list */\
+  while(N) {\
+     /* save N->vtree_next in case N is freed or N->vtree_next is changed in code B */\
+	SddNode* _next = N->vtree_next;\
+	/* execute code */\
+	B;\
+	/* advance to next node */\
+	N = _next;\
+  }\
+}
+
+/****************************************************************************************
+ * iterator over sdd nodes normalized for nodes in vtree 
+ ****************************************************************************************/
+
+//N: node
+//V: vtree
+//B: code
+#define FOR_each_decomposition_in(N,V,B) FOR_each_internal_vtree_node(v,V,FOR_each_sdd_node_normalized_for(N,v,B))
+#define FOR_each_decomposition_above(N,V,B) FOR_each_ancestral_vtree_node(v,V,FOR_each_sdd_node_normalized_for(N,v,B))
+#define FOR_each_literal_in(N,V,B) FOR_each_leaf_vtree_node(v,V,FOR_each_sdd_node_normalized_for(N,v,B))
+
+/****************************************************************************************
+ * iterator for sdd nodes (linked using the ->next field)
+ ****************************************************************************************/
+
+//this iterator allows freeing nodes or changing their ->next field in code B
+//
+//N: node
+//L: head of linked list (node)
+//B: code
+#define FOR_each_linked_node(N,L,B) {\
+  SddNode* N = L; /* head of linked list */\
+  while(N) {\
+     /* save N->next in case N is freed or N->next is changed in code B */\
+	SddNode* _next = N->next;\
+	/* execute code */\
+	B;\
+	/* advance to next node */\
+	N = _next;\
+  }\
+}
+
+/****************************************************************************************
+ * iterator for unique nodes
+ ****************************************************************************************/
+
+//iterates over unique nodes of manager, executing a bit of code for each node
+//this iterator allows freeing nodes or changing their ->next field in code B
+//
+//N: node
+//M: manager
+//B: code to be executed for each node (references the variable E)
+#define FOR_each_unique_node(N,M,B) {\
+  SddHash* H = M->unique_nodes;\
+  if(H->count) {\
+    SddSize _size = H->size;\
+    SddNode** _clists = H->clists;\
+    while(_size--) {\
+      SddNode* N = *_clists++;\
+	  while(N) {\
+	    /* save next in case N is freed or N->next is changed in code B */\
+	    SddNode* _next = N->next;\
+	    /* execute code */\
+	    B;\
+	    /* advance to next entry in hash table */\
+	    N = _next;\
+	  }\
+    }\
+  }\
+}
+
+/****************************************************************************************
+ * macros for iterating over primes, subs and elements of an sdd node
+ ****************************************************************************************/
+
+//iterate over elements, executing code B for each element
+//
+//P: prime
+//S: sub
+//C: element count
+//ES: elements array
+//B: code
+#define FOR_each_prime_sub_of_elements(P,S,C,ES,B) {\
+  for(SddElement* _e=ES; _e<(ES)+(C); _e++) {\
+	SddNode* P = _e->prime;\
+    SddNode* S = _e->sub;\
+    /* execute code */\
+	B;\
+  }\
+}
+
+//iterate over primes and subs P/S of sdd node N, executing code B for each P/S pair
+//
+//P: prime
+//S: sub
+//N: sdd node
+//B: code
+#define FOR_each_prime_sub_of_node(P,S,N,B) {\
+  assert(IS_DECOMPOSITION(N));\
+  FOR_each_prime_sub_of_elements(P,S,(N)->size,ELEMENTS_OF(N),B)\
+}
+
+//iterate over primes P of sdd node N, executing code B for each prime
+//
+//P: prime
+//N: sdd node
+//B: code
+#define FOR_each_prime_of_node(P,N,B) {\
+  assert(IS_DECOMPOSITION(N));\
+  for(SddElement* _e=ELEMENTS_OF(N); _e<ELEMENTS_OF(N)+(N)->size; _e++) {\
+	SddNode* P = _e->prime;\
+    /* execute code */\
+	B;\
+  }\
+}
+
+//iterate over subs S of sdd node N, executing code B for each sub
+//
+//S: sub
+//N: sdd node
+//B: code
+#define FOR_each_sub_of_node(S,N,B) {\
+  assert(IS_DECOMPOSITION(N));\
+  for(SddElement* _e=ELEMENTS_OF(N); _e<ELEMENTS_OF(N)+(N)->size; _e++) {\
+	SddNode* S = _e->sub;\
+    /* execute code */\
+	B;\
+  }\
+}
+
+#endif // ITERATORS_H_
+
+/****************************************************************************************
+ * end
+ ****************************************************************************************/