YuhangQ/cloud-sat
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: YuhangQ:018806b00ce3e270a61a2a60d98d1e3ad284da58
Branches Tags
YuhangQ:main
..
compare: YuhangQ:1b1c0c81c2e1ec4f7b00ba81775aefb265933b09
Branches Tags
YuhangQ:main

No commits in common. "018806b00ce3e270a61a2a60d98d1e3ad284da58" and "1b1c0c81c2e1ec4f7b00ba81775aefb265933b09" have entirely different histories.
018806b00c ... 1b1c0c81c2

2 changed files with 10 additions and 7 deletions
Show Stats Expand all files Collapse all files

2
run.sh
View File

@ -27,6 +27,6 @@ INSTANCE=04157f716c1e9606c6a530657bf8f957-Kakuro-easy-125-ext.xml.hg_4.cnf
# make -j 16 && mpirun --bind-to none -np 5 --allow-run-as-root ./light -i $DIR/$INSTANCE --share=1 --threads=4 --times=3600 # make -j 16 && mpirun --bind-to none -np 5 --allow-run-as-root ./light -i $DIR/$INSTANCE --share=1 --threads=4 --times=3600
make -j 16 && mpirun --bind-to none -np 9 --allow-run-as-root ./light -i ./data/class_1_easy_10_0.cnf --share=1 --threads=16 --times=3600 make -j 16 && mpirun --bind-to none -np 9 --allow-run-as-root valgrind ./light -i ./data/hard1.cnf --share=1 --threads=2 --times=3600
#./light -i $DIR/$INSTANCE --share=1 --threads=16 --times=3600 #./light -i $DIR/$INSTANCE --share=1 --threads=16 --times=3600

9
src/solve.cpp
View File

@ -68,15 +68,13 @@ void light::init_workers() {
} }
void light::diversity_workers() { void light::diversity_workers() {
for (int i = 0; i < OPT(threads); i++) { for (int i = 0; i < OPT(threads); i++) {
if(worker_type == SAT) {
if (OPT(shuffle)) { if (OPT(shuffle)) {
if (i) workers[i]->configure("order_reset", (rank - 1) * OPT(threads) + i); if (i) workers[i]->configure("order_reset", (rank - 1) * OPT(threads) + i);
} }
if(worker_type == SAT) {
workers[i]->configure("stable", 1); workers[i]->configure("stable", 1);
workers[i]->configure("target", 2); workers[i]->configure("target", 2);
workers[i]->configure("phase", 1); workers[i]->configure("phase", 1);
@ -121,6 +119,10 @@ void light::diversity_workers() {
workers[i]->configure("target", 2); workers[i]->configure("target", 2);
} else { } else {
if (OPT(shuffle)) {
if (i) workers[i]->configure("order_reset", i);
}
if (OPT(pakis)) { if (OPT(pakis)) {
if (i == 13 || i == 14 || i == 9) if (i == 13 || i == 14 || i == 9)
workers[i]->configure("tier1", 3); workers[i]->configure("tier1", 3);
@ -158,6 +160,7 @@ void light::diversity_workers() {
} }
} }
for (int j = 0; j < configure_name[i].size(); j++) { for (int j = 0; j < configure_name[i].size(); j++) {
workers[i]->configure(configure_name[i][j], configure_val[i][j]); workers[i]->configure(configure_name[i][j], configure_val[i][j]);
} }