Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Work from Google Summer of Code, 2018 #17

Open
wants to merge 40 commits into
base: gsoc18-cython
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
40 commits
Select commit Hold shift + click to select a range
797706a
python3 exact.py -> exact.pyx
kaivalyar May 21, 2018
efef8ed
python2 exact.py -> exact.pyx
kaivalyar May 21, 2018
bff2eac
setup dev environment
kaivalyar Jun 1, 2018
78014a5
remove print on import
kaivalyar Jun 1, 2018
c34e02e
use numpy zeros in mcmc
kaivalyar Jun 4, 2018
590b363
delete mcmc.py
kaivalyar Jun 4, 2018
cdb4b70
setup all .pyx
kaivalyar Jun 5, 2018
c5eebf7
remove unneccessary old .py files
kaivalyar Jun 5, 2018
3434dd2
add unreviewed pending changes
kaivalyar Jun 6, 2018
4b62dbc
conversion to extension type ... exact -> infer -> mrf(?) -> ...
kaivalyar Jun 11, 2018
f1734b4
convert mln to extension type
kaivalyar Jun 16, 2018
e88927e
convert logic to extension type
kaivalyar Jun 16, 2018
1762f02
move inner classes
kaivalyar Jun 17, 2018
5f59e20
Try moving inner classes to misc
kaivalyar Jun 18, 2018
9d79513
Cythonise logic superclass
kaivalyar Jul 2, 2018
2111172
Cythonise logic subclasses
kaivalyar Jul 2, 2018
6db7590
Cythonise miscellaneous logic module usage
kaivalyar Jul 2, 2018
0bdf67f
[TEMPORARY] attribute cythonisation
kaivalyar Jul 2, 2018
032634a
[TEMPORARY] add cython print on import
kaivalyar Jul 3, 2018
1290435
Restore functionality
kaivalyar Jul 10, 2018
e81cd19
profiling
kaivalyar Jul 16, 2018
644f608
speedup common-logic(1)
kaivalyar Jul 16, 2018
6c157dd
fix speedup error
kaivalyar Jul 16, 2018
9a594a4
revert
kaivalyar Jul 21, 2018
c7fd93c
minor optimisations
kaivalyar Jul 22, 2018
c064f69
cythonise callbyref containers
kaivalyar Jul 22, 2018
7ee1b0e
cythonise superclass MRFVariable
kaivalyar Jul 22, 2018
1f1dbe7
complete iterworlds, restore functionality
kaivalyar Jul 22, 2018
6669376
truth
kaivalyar Jul 22, 2018
15a0091
Cythonise FoL
kaivalyar Jul 23, 2018
5656082
Cythonise Fuzzy
kaivalyar Jul 23, 2018
d76b6bf
Convert Fuzzy and FoL to extension type
kaivalyar Jul 23, 2018
7c9405f
temporary: make evidence a list
kaivalyar Jul 29, 2018
d362971
cythonize exact - soft_evidence_formula
kaivalyar Aug 8, 2018
c652f6e
intervals, arrays, etc
kaivalyar Aug 8, 2018
e35ef87
gndatoms, __str__
kaivalyar Aug 8, 2018
95c6e1a
cythonise default grounding
kaivalyar Aug 9, 2018
a4f156a
revert temporary edits
kaivalyar Aug 11, 2018
8e92f86
add links
kaivalyar Aug 11, 2018
b9deef1
Merge branch 'gsoc18-cython' into gsoc18-cython
kaivalyar Aug 20, 2018
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,6 @@ __pycache__/
*.py[cod]
*$py.class

# C extensions
*.so

# Distribution / packaging
.Python
Expand Down
7 changes: 6 additions & 1 deletion python2/pracmln/mln/inference/.gitignore
Original file line number Diff line number Diff line change
@@ -1 +1,6 @@
*.pyo
*.pyo
*.c
*.html
setup.py
build/*
pracmln/*
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@
from numpy.ma.core import exp
from pracmln.mln.inference.infer import Inference
from pracmln.logic.common import Logic
from numpy import zeros


logger = logs.getlogger(__name__)
Expand All @@ -46,12 +47,12 @@


def eval_queries(world):
"""
'''
Evaluates the queries given a possible world.
"""
numerators = [0] * len(global_enumAsk.queries)
'''
numerators = zeros(len(global_enumAsk.queries))
denominator = 0
expsum = 0
cdef expsum = 0
for gf in global_enumAsk.grounder.itergroundings():
if global_enumAsk.soft_evidence_formula(gf):
expsum += gf.noisyor(world) * gf.weight
Expand All @@ -67,6 +68,7 @@ def eval_queries(world):
expsum += gf(world) * gf.weight
expsum = exp(expsum)
# update numerators
cdef int i
for i, query in enumerate(global_enumAsk.queries):
if query(world):
numerators[i] += expsum
Expand Down Expand Up @@ -115,13 +117,13 @@ def _run(self):
for variable in self.mrf.variables:
values = variable.valuecount(self.mrf.evidence)
worlds *= values
numerators = [0.0 for i in range(len(self.queries))]
denominator = 0.
numerators = zeros(len(self.queries))#[0.0 for i in range(len(self.queries))]
cdef double denominator = 0.
# start summing
logger.debug("Summing over %d possible worlds..." % worlds)
if worlds > 500000 and self.verbose:
print colorize('!!! %d WORLDS WILL BE ENUMERATED !!!' % worlds, (None, 'red', True), True)
k = 0
cdef int k = 0
self._watch.tag('enumerating worlds', verbose=self.verbose)
global global_enumAsk
global_enumAsk = self
Expand All @@ -135,9 +137,11 @@ def _run(self):
for num, denum in pool.imap(with_tracing(eval_queries), self.mrf.worlds()):
denominator += denum
k += 1
for i, v in enumerate(num):
numerators[i] += v
if self.verbose: bar.inc()
numerators += num
#for i, v in enumerate(num):
# numerators[i] += v
if self.verbose:
bar.inc()
except Exception as e:
logger.error('Error in child process. Terminating pool...')
pool.close()
Expand All @@ -150,8 +154,9 @@ def _run(self):
# compute exp. sum of weights for this world
num, denom = eval_queries(world)
denominator += denom
for i, _ in enumerate(self.queries):
numerators[i] += num[i]
numerators += num
#for i, _ in enumerate(self.queries):
# numerators[i] += num[i]
k += 1
if self.verbose:
bar.update(float(k) / worlds)
Expand All @@ -163,7 +168,8 @@ def _run(self):
raise SatisfiabilityException(
'MLN is unsatisfiable. All probability masses returned 0.')
# normalize answers
dist = map(lambda x: float(x) / denominator, numerators)
dist = numerators / denominator
#dist = map(lambda x: float(x) / denominator, numerators)
result = {}
for q, p in zip(self.queries, dist):
result[str(q)] = p
Expand Down
21 changes: 21 additions & 0 deletions python3/build-cython.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@

cd pracmln/logic/
echo "======================LOGIC======================"
python3 setup.py build_ext --inplace
echo "================================================="

echo "=======================MLN======================="
cd ../mln/
python3 setup.py build_ext --inplace
echo "================================================="

echo "====================GROUNDING===================="
cd grounding/
python3 setup.py build_ext --inplace
echo "================================================="

echo "====================INFERENCE===================="
cd ../inference/
python3 setup.py build_ext --inplace
echo "================================================="

2 changes: 1 addition & 1 deletion python3/pracmln/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -29,4 +29,4 @@
from .mlnlearn import QUERY_PREDS
from .mlnlearn import EVIDENCE_PREDS
from .utils.project import mlnpath
from .utils.project import PRACMLNConfig
from .utils.project import PRACMLNConfig
6 changes: 6 additions & 0 deletions python3/pracmln/logic/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
common.py
*.pyo
*.c
*.html
build/*
pracmln/*
88 changes: 88 additions & 0 deletions python3/pracmln/logic/common.pxd
Original file line number Diff line number Diff line change
@@ -0,0 +1,88 @@
from ..mln.base cimport MLN



cdef class Constraint():
cdef dict __dict__
cpdef gndatoms(self, l=*)

cdef class Formula(Constraint):
cdef MLN _mln
#cdef public list children
pass

cdef class ComplexFormula(Formula):
pass

cdef class Conjunction(ComplexFormula):
cpdef int maxtruth(self, world)
cpdef int mintruth(self, world)

cdef class Disjunction(ComplexFormula):
cpdef int maxtruth(self, world)
cpdef int mintruth(self, world)

cdef class Lit(Formula):
cdef int _negated
cdef str _predname

cdef class LitGroup(Formula):
cdef int _negated
cdef str _predname

cdef class GroundLit(Formula):
cdef GroundAtom _gndatom
cdef int _negated
cpdef truth(self, list world)
cpdef mintruth(self, list world)
cpdef maxtruth(self, list world)

cdef class GroundAtom():
cdef str _predname
cdef MLN mln
#cdef int _idx
cdef dict __dict__
cpdef truth(self, list world)
cpdef mintruth(self, list world)
cpdef maxtruth(self, list world)

cdef class Equality(ComplexFormula):
cdef int _negated
cdef str _argsA
cdef str _argsB
cpdef truth(self, world=*)
cpdef int maxtruth(self, world)
cpdef int mintruth(self, world)

cdef class Implication(ComplexFormula):
pass

cdef class Biimplication(ComplexFormula):
pass

cdef class Negation(ComplexFormula):
cpdef truth(self, list world)
pass

cdef class Exist(ComplexFormula):
pass

cdef class TrueFalse(Formula):
cdef float _value
cpdef float truth(self, world=*)
cpdef mintruth(self, world=*)
cpdef maxtruth(self, world=*)

cdef class NonLogicalConstraint(Constraint):
pass

cdef class CountConstraint(NonLogicalConstraint):
pass

cdef class GroundCountConstraint(NonLogicalConstraint):
pass

cdef class Logic:
cdef dict __dict__
#cdef class Constraint():
# pass
Loading