Flip-Hoisting v3: Local and global hoisting + LF and CNF representation for SharpSAT-td computation - #54

Open

ellieyhcheng wants to merge 101 commits into

SHoltzen:masterfrom

ellieyhcheng:master

Commits on Mar 23, 2021

Do not consider guards for sharing flips
ellieyhcheng
committed
b5b04ed

Commits on Apr 2, 2021

Squeezed vars uses new var when there's dependency conflicts
ellieyhcheng
committed
031c65f

Commits on Jun 22, 2021

Implement sbk encoding of discretes
ellieyhcheng
committed
63e4f0f

Commits on Jun 24, 2021

Add bayesian networks
ellieyhcheng
committed
592689f
Reorganize bayesian networks to benchmarks/bayesian-networks
ellieyhcheng
committed
e95abab

Commits on Jun 25, 2021

Commits on Jun 29, 2021

Merge from upstream
ellieyhcheng
committed
2a1ab2e
Merge with stash
ellieyhcheng
committed
504350b
Merge stash
ellieyhcheng
committed
d7cfdd4

Commits on Jul 3, 2021

SBK encoding orders flips by most used in different branches
ellieyhcheng
committed
75a260f

Commits on Jul 18, 2021

Add benchmarks
ellieyhcheng
committed
5b08814

Commits on Jul 19, 2021

use SBK only when there's shared flips
ellieyhcheng
committed
aa4de3c

Commits on Jul 22, 2021

Hoist complement flips
ellieyhcheng
committed
58e0bd0

Commits on Jul 23, 2021

Merge remote-tracking branch 'upstream/master'
ellieyhcheng
committed
5cc320f

Commits on Jul 26, 2021

Reorder sbk flips to have hoisted flip at the end & use rounded equality for floats
ellieyhcheng
committed
7d7be93

Commits on Aug 8, 2021

Flip-hoisting v3
ellieyhcheng
committed
4060122

Commits on Aug 9, 2021

Count number of flips
ellieyhcheng
committed
b101d2f

Commits on Aug 10, 2021

Count flips uses some tail recursion
ellieyhcheng
committed
56162ae
Merge branch 'master' of https://github.com/SHoltzen/dice
ellieyhcheng
committed
5a42c4e

Commits on Aug 17, 2021

Collects dataflow facts for cross-table hoisting
ellieyhcheng
committed
2166c60

Commits on Aug 22, 2021

Add hoisting for across-table
ellieyhcheng
committed
edc80ee
Rename flip-hoisting and fix cross table bug
ellieyhcheng
committed
ba6bbbc
Clear warnings
ellieyhcheng
committed
5516498

Commits on Aug 24, 2021

Fix bug where hoisted flips are missing
ellieyhcheng
committed
ed41423

Commits on Aug 26, 2021

Fix cross table missing out flips because conflicting hoists
ellieyhcheng
committed
a91a1da

Commits on Aug 27, 2021

Count parameters and skipping compilation commands
ellieyhcheng
committed
6aa7ffe

Commits on Aug 28, 2021

Cross table doesn't create extra variables
ellieyhcheng
committed
e36e5a9

Commits on Aug 29, 2021

Split regular hoisting and cross-table hoisting to avoid being too greedy
ellieyhcheng
committed
cdab19e

Commits on Sep 2, 2021

SBK encoding doesn't generate for 1.0
ellieyhcheng
committed
40c4e1f

Commits on Sep 3, 2021

Param count doesn't count 1.0 or 0.0
ellieyhcheng
committed
71f3280

Commits on Sep 4, 2021

Flip limit
ellieyhcheng
committed
855400b

Commits on Sep 5, 2021

Commits on Sep 8, 2021

Don't push up shared flips during global
ellieyhcheng
committed
c4dd906
But still need to pass up the same flip
ellieyhcheng
committed
ea0eb9b
And match the right flip
ellieyhcheng
committed
4b2268b

Commits on Sep 9, 2021

Cross table documentation
ellieyhcheng
committed
da366db

Commits on Nov 9, 2021

merge from upstream
ellieyhcheng
committed
73c10f1
Update float usage
ellieyhcheng
committed
86c4385
rename flip-hoisting and cross table to local hoisting and global hoisting
ellieyhcheng
committed
2d18725

Commits on Dec 2, 2021

LogicalFormula Definitions
ellieyhcheng
committed
9b3e544

Commits on Dec 27, 2021

Additional pass to convert to logical formula
ellieyhcheng
committed
6b57a78
Add weights mapping
ellieyhcheng
committed
860f6a7

Commits on Dec 31, 2021

Compile from logical formula to bdd
ellieyhcheng
committed
7276b77

Commits on Jan 6, 2022

Temp 1
ellieyhcheng
committed
02827d3

Commits on Jan 21, 2022

Compile to unweighted CNF
ellieyhcheng
committed
ad6ef60
Tup 1
ellieyhcheng
committed
f4d1fa9

Commits on Jan 24, 2022

Bug fix generating CNF
ellieyhcheng
committed
3c1c907

Commits on Jan 26, 2022

Output cnf for sharpsat format
ellieyhcheng
committed
2d1daca

Commits on Feb 3, 2022

Call sharpSAT and output probability
ellieyhcheng
committed
f79a73b

Commits on Feb 6, 2022

Remove redundant constants
ellieyhcheng
committed
a74bb4a

Commits on Feb 7, 2022

Bubble up tuples in CG->LF pass
ellieyhcheng
committed
44bbeec
CNF decisions
ellieyhcheng
committed
328adc3
Don't add line if var isn't used
ellieyhcheng
committed
8fca521

Commits on Feb 8, 2022

Don't try to add weight to var if it's not used
ellieyhcheng
committed
690e94e
Resolve merge
ellieyhcheng
committed
f1b79a5

Commits on Feb 9, 2022

Assume unaccounted for vars are prob = 1
ellieyhcheng
committed
0533653
Unfinished get table probs
ellieyhcheng
committed
768cd14

Commits on Feb 11, 2022

CNF queries sharpSAT-td for each row of the joint probability table
ellieyhcheng
committed
c0449d9

Commits on Feb 15, 2022

Computing subset marginals 1
ellieyhcheng
committed
55026a2

Commits on Feb 17, 2022

Random marginal but type still glitch
ellieyhcheng
committed
4462579

Commits on Feb 18, 2022

Generate tseitin encoding clauses directly
ellieyhcheng
committed
3fec969

Commits on Feb 22, 2022

Logical formula size
ellieyhcheng
committed
34c09d9
Average decision count
ellieyhcheng
committed
e55ee5b

Commits on Mar 1, 2022

Commits on Mar 2, 2022

SharpSAT-td should run flowcutter for 1 min
ellieyhcheng
committed
b1c9527

Commits on Mar 7, 2022

In place LF trees
ellieyhcheng
committed
f8abbac

Commits on Mar 8, 2022

Calculate LF to BDD time
ellieyhcheng
committed
17b02d9

Commits on Mar 9, 2022

Propagate tuple to the top when converting to BDD from LF
ellieyhcheng
committed
587b2c4

Commits on Mar 14, 2022

Cache CNF printing
ellieyhcheng
committed
f3f1b27
Used Buffer to print CNF
ellieyhcheng
committed
818991a

Commits on Mar 17, 2022

Don't use physical equality
ellieyhcheng
committed
1e05b14

Commits on Apr 6, 2022

True needs to be a var that must be true
ellieyhcheng
committed
0e28369

Commits on May 9, 2022

Streamline from_external_prog and bubble up Tuple rather than extract later
ellieyhcheng
committed
078da62

Commits on May 10, 2022

CG->LF bug fix
ellieyhcheng
committed
a7c232c

Commits on May 11, 2022

Remove print statements
ellieyhcheng
committed
652a8b3
LF->CNF bottleneck bug fix by caching var names only and threading cnf list through
ellieyhcheng
committed
bcc72b4
Fix weird git diff artifacts
ellieyhcheng
committed
c20e1e4
Flowcutter timeout flag
ellieyhcheng
committed
63ac36e
Calculate Total CNF decisions not average
ellieyhcheng
committed
d3dcc48
Lets do not share flips locally
ellieyhcheng
committed
7acdce6
Smarter append
ellieyhcheng
committed
460ba6a

Commits on May 12, 2022

call SharpSAT-td only if not skipping table
ellieyhcheng
committed
9f84379
Flip hoisting bug fix for negating flips
ellieyhcheng
committed
f114651

Commits on May 17, 2022

Calculate compilation time
ellieyhcheng
committed
4eacfab

Commits on May 18, 2022

Remove flip-hoisting down pass redundant sorting
ellieyhcheng
committed
a79983f
Increase max flips to 100000
ellieyhcheng
committed
1a1b9eb
Timings of up and down pass for flip hoisting
ellieyhcheng
committed
bc1a794
Speed up global hoist
ellieyhcheng
committed
f64839b
revert
ellieyhcheng
committed
fa2dc01
Merge branch 'temp' of https://github.com/ellieyhcheng/dice into temp
ellieyhcheng
committed
ea2c61a
revert global
ellieyhcheng
committed
53d406d
Merge branch 'temp' of https://github.com/ellieyhcheng/dice into temp
ellieyhcheng
committed
1314233

Commits on Jun 15, 2022

Remove unused functions and debugging output
ellieyhcheng
committed
a43c8b4
Merge pull request #1 from ellieyhcheng/temp
ellieyhcheng
authored
341a151

Commits on Nov 4, 2022

merge from upstream
ellieyhcheng
committed
cd0da6a