fixed another bug

This commit is contained in:
ihan-o 2023-05-14 13:12:19 +08:00
parent 90303c4665
commit 064c4be71c
6 changed files with 2114 additions and 428 deletions

2182
res.txt

File diff suppressed because one or more lines are too long

341
res_nosharing.txt Normal file
View File

@ -0,0 +1,341 @@
make: 'light' is up to date.
c ------------------- Paras list -------------------
c Name Type Now Default Comment
c DPS int 0 0 DPS/NPS
c DPS_period int 10000 10000 DPS sharing period
c margin int 0 0 DPS margin
c pakis int 1 1 Use pakis diversity
c reset int 0 0 Dynamically reseting
c reset_time int 10 10 Reseting base interval (seconds)
c share int 0 1 Sharing learnt clauses
c share_intv int 500000 500000 Sharing interval (microseconds)
c share_lits int 1500 1500 Sharing lits (per every #share_intv seconds)
c share_method int 0 1 0 for Circle Propagate/ 1 for Tree Broadcast
c shuffle int 1 1 Use random shuffle
c simplify int 1 1 Use Simplify (only preprocess)
c threads int 16 32 Thread number
c times double 3600.000000 5000 Cutoff time
c unique int 1 1 Whether perform unique checking when receiving clauses from other nodes
c config string "" Config file
c instance string /pub/data/chenzh/data/sat2022/f1afd5e8d4b842c15c6a2c420b2b2dba-pj2018_k10.cnf "" CNF format instance
c --------------------------------------------------
c [leader] preprocess(simplify) input data
c After preprocess: vars: 578145 -> 573298 , clauses: 1588617 -> 1569477 ,
c len 5203
c After preprocess: vars: 573298 -> 565733 , clauses: 1569477 -> 1561473 ,
c [leader] length of cnf (bytes): 29837411
c [leader] hand out length of cnf instance to all nodes
c [leader] hand out cnf instance to all nodes
c [worker4] threads per worker were set 16 by default : 0
c [worker5] threads per worker were set 16 by default : 0
c id is 0
c id is 1
c [worker6] threads per worker were set 16 by default : 0
c id is 0
c id is 1
c [worker7] threads per worker were set 16 by default : 0
c [worker8] threads per worker were set 16 by default : 0
c id is 0
c [leader] hand out done!
c [worker1] threads per worker were set 16 by default : 0
c id is 0
c [worker2] threads per worker were set 16 by default : 0
c id is 0
c [worker3] threads per worker were set 16 by default : 0
c id is 0
c id is 1
c id is 1
c id is 1
c id is 0
c id is 1
c id is 2
c id is 3
c id is 4
c id is 2
c id is 3
c id is 4
c id is 0
c id is 1
c id is 1
c id is 2
c id is 2
c id is 3
c id is 2
c id is 3
c id is 4
c id is 5
c id is 2
c id is 3
c id is 4
c id is 2
c id is 3
c id is 4
c id is 2
c id is 3
c id is 5
c id is 6
c id is 7
c id is 8
c id is 5
c id is 6
c id is 7
c id is 8
c id is 9
c id is 3
c id is 4
c id is 10
c id is 11
c id is 4
c id is 5
c id is 6
c id is 7
c id is 8
c id is 5
c id is 6
c id is 5
c id is 6
c id is 4
c id is 5
c id is 6
c id is 9
c id is 10
c id is 11
c id is 12
c id is 5
c id is 6
c id is 9
c id is 7
c id is 8
c id is 7
c id is 8
c id is 7
c id is 8
c id is 7
c id is 8
c id is 13
c id is 14
c id is 12
c id is 13
c id is 14
c id is 15
c maple configure 0
c maple configure 1
c maple configure 2
c maple configure 3
c maple configure 4
c maple configure 5
c maple configure 6
c maple configure 7
c id is 6
c id is 7
c id is 8
c id is 9
c id is 9
c id is 15
c maple configure 0
c maple configure 1
c maple configure 2
c maple configure 3
c maple configure 4
c maple configure 5
c maple configure 6
c maple configure 7
c maple configure 8
c maple configure 8
c maple configure 9
c maple configure 10
c maple configure 11
c maple configure 12
c maple configure 13
c maple configure 14
c maple configure 15
c id is 9
c id is 10
c id is 10
c id is 11
c id is 12
c id is 9
c id is 10
c id is 11
c id is 9
c id is 10
c id is 11
c id is 11
c id is 12
c id is 13
c id is 13
c id is 14
c id is 15
c id is 12
c id is 13
c id is 12
c id is 13
c id is 10
c id is 11
c id is 12
c id is 10
c id is 11
c id is 12
c id is 13
c maple configure 9
c maple configure 10
c maple configure 11
c maple configure 12
c maple configure 13
c maple configure 14
c maple configure 15
c id is 14
c maple configure 0
c maple configure 1
c maple configure 2
c maple configure 3
c maple configure 4
c maple configure 5
c maple configure 6
c maple configure 7
c maple configure 8
c maple configure 9
c maple configure 10
c maple configure 11
c maple configure 12
c maple configure 13
c maple configure 14
c maple configure 15
c id is 14
c id is 13
c id is 14
c id is 14
c id is 15
c id is 14
c id is 15
c maple configure 0
c maple configure 1
c id is 15
c maple configure 0
c maple configure 1
c maple configure 2
c maple configure 3
c maple configure 4
c maple configure 5
c maple configure 6
c maple configure 7
c maple configure 8
c maple configure 9
c maple configure 10
c maple configure 11
c maple configure 12
c maple configure 13
c maple configure 14
c maple configure 15
c id is 15
c maple configure 0
c maple configure 1
c maple configure 2
c maple configure 3
c maple configure 4
c maple configure 5
c maple configure 6
c maple configure 7
c maple configure 8
c maple configure 9
c maple configure 10
c maple configure 11
c maple configure 12
c maple configure 13
c maple configure 14
c id is 15
c maple configure 0
c maple configure 1
c maple configure 2
c maple configure 3
c maple configure 4
c maple configure 5
c maple configure 6
c maple configure 7
c maple configure 8
c maple configure 9
c maple configure 10
c maple configure 11
c maple configure 2
c maple configure 3
c maple configure 4
c maple configure 5
c maple configure 6
c maple configure 7
c maple configure 8
c maple configure 9
c maple configure 10
c maple configure 11
c maple configure 12
c maple configure 13
c maple configure 14
c maple configure 15
c maple configure 12
c maple configure 13
c maple configure 14
c maple configure 15
c maple configure 0
c maple configure 1
c maple configure 2
c maple configure 3
c maple configure 4
c maple configure 5
c maple configure 6
c maple configure 7
c maple configure 8
c maple configure 9
c maple configure 10
c maple configure 11
c maple configure 12
c maple configure 13
c maple configure 14
c maple configure 15
c maple configure 15
c [GE] XORs: 0 (time: 0.71)
c [GE] XOR SCCs: 0 (time: 0.00)
c [GE] matrices: 0, unary xor: 0, bin xor: 0, bin added: 0 (time: 0.00)
c [GE] XORs: 0 (time: 0.78)
c [GE] XOR SCCs: 0 (time: 0.00)
c [GE] matrices: 0, unary xor: 0, bin xor: 0, bin added: 0 (time: 0.00)
c [GE] XORs: 0 (time: 0.68)
c [GE] XOR SCCs: 0 (time: 0.00)
c [GE] matrices: 0, unary xor: 0, bin xor: 0, bin added: 0 (time: 0.00)
c [GE] XORs: 0 (time: 0.77)
c [GE] XOR SCCs: 0 (time: 0.00)
c [GE] matrices: 0, unary xor: 0, bin xor: 0, bin added: 0 (time: 0.00)
c [GE] XORs: 0 (time: 0.87)
c [GE] XOR SCCs: 0 (time: 0.00)
c [GE] matrices: 0, unary xor: 0, bin xor: 0, bin added: 0 (time: 0.00)
c [GE] XORs: 0 (time: 1.29)
c [GE] XOR SCCs: 0 (time: 0.00)
c [GE] matrices: 0, unary xor: 0, bin xor: 0, bin added: 0 (time: 0.00)
c [GE] XORs: 0 (time: 1.10)
c [GE] XOR SCCs: 0 (time: 0.00)
c [GE] matrices: 0, unary xor: 0, bin xor: 0, bin added: 0 (time: 0.00)
c [GE] XORs: 0 (time: 1.10)
c [GE] XOR SCCs: 0 (time: 0.00)
c [GE] matrices: 0, unary xor: 0, bin xor: 0, bin added: 0 (time: 0.00)
c [GE] XORs: 1170 (time: 1.56)
c [GE] XOR SCCs: 804 (time: 0.06)
c [GE] matrices: 305, unary xor: 0, bin xor: 108, bin added: 216 (time: 0.24)
c [GE] XORs: 1170 (time: 1.46)
c [GE] XOR SCCs: 804 (time: 0.06)
c [GE] matrices: 305, unary xor: 0, bin xor: 108, bin added: 216 (time: 0.31)
c [GE] XORs: 1170 (time: 1.43)
c [GE] XOR SCCs: 804 (time: 0.01)
c [GE] matrices: 305, unary xor: 0, bin xor: 108, bin added: 216 (time: 0.54)
c [GE] XORs: 1170 (time: 1.38)
c [GE] XOR SCCs: 804 (time: 0.00)
c [GE] matrices: 305, unary xor: 0, bin xor: 108, bin added: 216 (time: 0.25)
c [GE] XORs: 1170 (time: 1.98)
c [GE] XOR SCCs: 804 (time: 0.00)
c [GE] matrices: 305, unary xor: 0, bin xor: 108, bin added: 216 (time: 0.63)
c [GE] XORs: 1170 (time: 1.53)
c [GE] XOR SCCs: 804 (time: 0.00)
c [GE] matrices: 305, unary xor: 0, bin xor: 108, bin added: 216 (time: 0.32)
c [GE] XORs: 1170 (time: 1.64)
c [GE] XOR SCCs: 804 (time: 0.05)
c [GE] matrices: 305, unary xor: 0, bin xor: 108, bin added: 216 (time: 0.43)
c [GE] XORs: 1170 (time: 1.76)
c [GE] XOR SCCs: 804 (time: 0.06)
c [GE] matrices: 305, unary xor: 0, bin xor: 108, bin added: 216 (time: 0.41)

9
result.txt Normal file

File diff suppressed because one or more lines are too long

2
run.sh
View File

@ -23,7 +23,7 @@
# 这个存在问题
DIR=/pub/data/chenzh/data/sat2022
# INSTANCE=tseitingrid7x165_shuffled.cnf
INSTANCE=5601a7e094f61f3c5af461300c25243f-summle_X111107_steps8_I1-2-2-4-4-8-25-100.cnf
INSTANCE=f1afd5e8d4b842c15c6a2c420b2b2dba-pj2018_k10.cnf
make -j && mpirun --bind-to none -np 9 --allow-run-as-root ./light -i $DIR/$INSTANCE --shuffle=1 --share=1 --threads=16 --times=3600 --share_method=0

View File

@ -275,7 +275,7 @@ void light::seperate_groups() {
// split distribute nodes to groups(SAT MODE、UNSAT MODE、DEFAULT MODE)
int worker_procs = num_procs - 1;
if(worker_procs >= 8) {
if(worker_procs > 8) {
int sat_procs = worker_procs / 8; // 8
int unsat_procs = worker_procs / 4; // 16
int maple_procs = worker_procs / 8; // 8

View File

@ -39,11 +39,11 @@ int basemaple::solve() {
}
int basemaple::val(int l) {
if (solver->model[l] != (MapleCOMSPS::lbool((uint8_t)2))) {
int lit = solver->model[l] == (MapleCOMSPS::lbool((uint8_t)0)) ? l + 1 : -(l + 1);
if (solver->model[l - 1] != (MapleCOMSPS::lbool((uint8_t)2))) {
int lit = solver->model[l - 1] == (MapleCOMSPS::lbool((uint8_t)0)) ? l : -l;
return lit;
}
return l + 1;
return l;
}
void basemaple::terminate() {