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

修改一些问题，内存改为5.5

Browse Source
This commit is contained in:
YuhangQ 2023-04-28 08:56:18 +00:00
parent de434abbfb
commit 94feff698a
3 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
run.sh
View File

@ -1,11 +1,11 @@
#!/bin/bash #!/bin/bash
cd kissat-inc # cd kissat-inc
make clean # make clean
./configure # ./configure
make -j 64 # make -j 64
cd .. # cd ..
make clean # make clean
# buglist # buglist
# - fe96b630b3e761821308b544368dd521-GP_100_950_34.cnf # - fe96b630b3e761821308b544368dd521-GP_100_950_34.cnf
@ -13,11 +13,11 @@ make clean
# 这个存在问题 # 这个存在问题
DIR=/pub/data/chenzh/data/sat2022 DIR=/pub/data/chenzh/data/sat2022
INSTANCE=30ca21da9753263cc8cda020802b58ce-GP_500_200_20.cnf INSTANCE=0d4970edf84353e5a5798bca3f7f270e-SAT_H_instances_childsnack_p10.hddl_2.cnf
# make -j 16 && mpirun --bind-to none -np 9 --allow-run-as-root ./light -i $DIR/$INSTANCE --shuffle=1 --share=1 --threads=16 --times=3600 --share_method=1 # make -j 16 && mpirun --bind-to none -np 9 --allow-run-as-root ./light -i $DIR/$INSTANCE --shuffle=1 --share=1 --threads=16 --times=3600 --share_method=1
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 --share_method=0 make -j 16 && mpirun --bind-to none -np 9 --allow-run-as-root ./light -i $DIR/$INSTANCE --share=1 --threads=16 --times=3600 --share_method=0
#./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

@ -62,7 +62,7 @@ void light::diversity_workers() {
workers[i]->configure("worker_index", i); workers[i]->configure("worker_index", i);
workers[i]->configure("worker_number", OPT(threads)); workers[i]->configure("worker_number", OPT(threads));
if(rank == 1 || rank == num_procs - 1) { if(rank == 1) {
workers[i]->configure("worker_seed", 0); workers[i]->configure("worker_seed", 0);
} else { } else {
workers[i]->configure("worker_seed", rank); workers[i]->configure("worker_seed", rank);
@ -117,6 +117,12 @@ void light::diversity_workers() {
if (OPT(shuffle)) { if (OPT(shuffle)) {
workers[i]->configure("worker_index", i); workers[i]->configure("worker_index", i);
workers[i]->configure("worker_number", OPT(threads)); workers[i]->configure("worker_number", OPT(threads));
if(rank == num_procs - 1) {
workers[i]->configure("worker_seed", 0);
} else {
workers[i]->configure("worker_seed", rank);
}
workers[i]->configure("worker_seed", rank); workers[i]->configure("worker_seed", rank);
// printf("r1: %d, r2: %d, r3: %d\n", r1, r2, r3); // printf("r1: %d, r2: %d, r3: %d\n", r1, r2, r3);
} }
@ -311,7 +317,6 @@ void light::seperate_groups() {
} }
} }
void print_model(vec<int> &model) { void print_model(vec<int> &model) {
printf("v"); printf("v");
for (int i = 0; i < model.size(); i++) { for (int i = 0; i < model.size(); i++) {

2
src/worker.hpp
View File

@ -43,7 +43,7 @@ void worker_main(light* S, int num_procs, int rank) {
MPI_Barrier(MPI_COMM_WORLD); MPI_Barrier(MPI_COMM_WORLD);
// mem_usage per thread per G input file (GB) // mem_usage per thread per G input file (GB)
double mem_ptpg = 20.4; double mem_ptpg = 5.5;
// mem_usage per thread (GB) // mem_usage per thread (GB)
double mem_pt = (double)cnf_length / 1073741824 * mem_ptpg; double mem_pt = (double)cnf_length / 1073741824 * mem_ptpg;