Skip to content

Commit

Permalink
Merge pull request #132 from Argonne-National-Laboratory/kkim
Browse files Browse the repository at this point in the history 
Added parameters for THREADS
  • Loading branch information
@kibaekkim
kibaekkim authored Oct 16, 2020
2 parents 3c718fd + 570731d commit ee39967
Show file tree
Hide file tree
Showing 5 changed files with 27 additions and 5 deletions.
1 change: 1 addition & 0 deletions src/Solver/Benders/BdSub.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -170,6 +170,7 @@ DSP_RTN_CODE BdSub::loadProblem(DecModel* model)
}
}
cglp_[i]->setLogLevel(0);
cglp_[i]->setNumCores(par_->getIntParam("BD/SUB/THREADS"));

/** allocate memory for solution */
solutions_[i] = new double [cglp_[i]->si_->getNumCols()];
Expand Down
4 changes: 2 additions & 2 deletions src/Solver/DualDecomp/DdSub.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -304,9 +304,9 @@ DSP_RTN_CODE DdSub::createProblem() {
}

/** set number of cores */
osi_->setNumCores(1);
osi_->setNumCores(par_->getIntParam("DD/SUB/THREADS"));

/** set display */
/** set display */
osi_->setLogLevel(par_->getIntParam("DD/SUB/SOLVER/LOG_LEVEL"));

/** load problem */
Expand Down
8 changes: 6 additions & 2 deletions src/Utility/DspParams.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -246,6 +246,11 @@ void DspParams::initIntParams()
IntParams_.createParam("DW/MASTER/SOLVER/LOG_LEVEL", 0);
IntParams_.createParam("DW/SUB/SOLVER/LOG_LEVEL", 0);

/** number of threads used for subproblem solution */
IntParams_.createParam("BD/SUB/THREADS", 1);
IntParams_.createParam("DD/SUB/THREADS", 1);
IntParams_.createParam("DW/SUB/THREADS", 1);

/** display frequency */
IntParams_.createParam("SCIP/DISPLAY_FREQ", 100);

Expand All @@ -256,8 +261,7 @@ void DspParams::initIntParams()
IntParams_.createParam("DW/MASTER/COL_AGE_LIM", 10);
IntParams_.createParam("DW/ITER_LIM", MAX_INT_NUM);
IntParams_.createParam("DW/HEURISTICS/TRIVIAL/ITER_LIM", MAX_INT_NUM);
IntParams_.createParam("DW/HEURISTICS/DIVE/ITER_LIM", MAX_INT_NUM);
IntParams_.createParam("DW/SUB/THREADS", 1);
IntParams_.createParam("DW/HEURISTICS/DIVE/ITER_LIM", MAX_INT_NUM);
IntParams_.createParam("DW/SUB/ADVIND", 1);
IntParams_.createParam("DW/BRANCH", 2);
IntParams_.createParam("DW/STRONG_BRANCH/ITER_LIM", 10);
Expand Down
4 changes: 3 additions & 1 deletion src/dsp.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ void createBlockModel(DspApiEnv* env, CoinMpsIO& p, const CoinPackedMatrix* mat,
int blockid, vector<string>& rows_in_block, map<string,int>& rowname2index,
const char* ctype, const double* obj);

const double test_tolerance = 1.0e-4;
const double test_tolerance = 1.0e-2;

/*
This will compile a stand-alone binary file that reads problem instances.
Expand Down Expand Up @@ -252,6 +252,8 @@ int runDsp(char* algotype, char* smpsfile, char* mpsfile, char* decfile, char* s
if (testvalue != NULL) {
double val = atof(testvalue);
cout << "Testing Bound: " << val << endl;
// cout << "relgap: " << fabs(val - primobj) / (fabs(val) + 1.e-10) << endl;
// cout << "relgap: " << fabs(val - dualobj) / (fabs(val) + 1.e-10) << endl;
if (primobj >= dualobj) {
if ((val - primobj) / (fabs(val) + 1.e-10) > test_tolerance || (dualobj - val) / (fabs(val) + 1.e-10) > test_tolerance)
ret = 1;
Expand Down
15 changes: 15 additions & 0 deletions test/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,12 @@ if(SCIPLIB)
add_test(NAME scip_sslp_bd COMMAND $ENV{PWD}/src/runDsp --algo bd --smps ${CMAKE_SOURCE_DIR}/examples/smps/sslp_5_25_50 --param ${CMAKE_SOURCE_DIR}/test/params_scip.txt --test -121.6)
add_test(NAME scip_drslp_drbd COMMAND $ENV{PWD}/src/runDsp --algo drbd --smps ${CMAKE_SOURCE_DIR}/examples/dro/drslp_5_5_5_5 --param ${CMAKE_SOURCE_DIR}/test/params_scip.txt --test 5.60247)
add_test(NAME scip_drslp_drdd COMMAND $ENV{PWD}/src/runDsp --algo drdd --smps ${CMAKE_SOURCE_DIR}/examples/dro/drslp_5_5_5_5 --param ${CMAKE_SOURCE_DIR}/test/params_scip.txt --test 5.60247)
add_test(NAME scip_sslp_BB_drbd COMMAND $ENV{PWD}/src/runDsp --algo drbd --smps ${CMAKE_SOURCE_DIR}/examples/dro/sslp_5_25_15_BB --param ${CMAKE_SOURCE_DIR}/test/params_scip.txt --test -98.0703)
add_test(NAME scip_sslp_BB_drdd COMMAND $ENV{PWD}/src/runDsp --algo drdd --smps ${CMAKE_SOURCE_DIR}/examples/dro/sslp_5_25_15_BB --param ${CMAKE_SOURCE_DIR}/test/params_scip.txt --test -98.0703)
add_test(NAME scip_sslp_BC_drbd COMMAND $ENV{PWD}/src/runDsp --algo drbd --smps ${CMAKE_SOURCE_DIR}/examples/dro/sslp_5_25_15_BC --param ${CMAKE_SOURCE_DIR}/test/params_scip.txt --test -98.0705)
add_test(NAME scip_sslp_BC_drdd COMMAND $ENV{PWD}/src/runDsp --algo drdd --smps ${CMAKE_SOURCE_DIR}/examples/dro/sslp_5_25_15_BC --param ${CMAKE_SOURCE_DIR}/test/params_scip.txt --test -98.0705)
# add_test(NAME scip_sslp_CC_drbd COMMAND $ENV{PWD}/src/runDsp --algo drbd --smps ${CMAKE_SOURCE_DIR}/examples/dro/sslp_5_25_15_CC --param ${CMAKE_SOURCE_DIR}/test/params_scip.txt --test -194.836)
add_test(NAME scip_sslp_CC_drdd COMMAND $ENV{PWD}/src/runDsp --algo drdd --smps ${CMAKE_SOURCE_DIR}/examples/dro/sslp_5_25_15_CC --param ${CMAKE_SOURCE_DIR}/test/params_scip.txt --test -194.811)
add_test(NAME scip_noswot_de COMMAND $ENV{PWD}/src/runDsp --algo de --mps ${CMAKE_SOURCE_DIR}/examples/mps-dec/noswot.mps --dec ${CMAKE_SOURCE_DIR}/examples/mps-dec/noswot.dec --param ${CMAKE_SOURCE_DIR}/test/params_scip.txt --test -42)
if(MA27LIB)
add_test(NAME ooqp_farmer_dd COMMAND $ENV{PWD}/src/runDsp --algo dd --smps ${CMAKE_SOURCE_DIR}/examples/smps/farmer --param ${CMAKE_SOURCE_DIR}/test/params_ooqp.txt --test -108389.9994043)
Expand All @@ -17,6 +23,9 @@ if(CPLEXLIB)
add_test(NAME cpx_farmer_dd COMMAND $ENV{PWD}/src/runDsp --algo dd --smps ${CMAKE_SOURCE_DIR}/examples/smps/farmer --param ${CMAKE_SOURCE_DIR}/test/params_cpx.txt --test -108389.9994043)
add_test(NAME cpx_farmer_dw COMMAND $ENV{PWD}/src/runDsp --algo dw --smps ${CMAKE_SOURCE_DIR}/examples/smps/farmer --param ${CMAKE_SOURCE_DIR}/test/params_cpx.txt --test -108389.9994043)
add_test(NAME cpx_drslp_drdd COMMAND $ENV{PWD}/src/runDsp --algo drdd --smps ${CMAKE_SOURCE_DIR}/examples/dro/drslp_5_5_5_5 --param ${CMAKE_SOURCE_DIR}/test/params_cpx.txt --test 5.60247)
add_test(NAME cpx_sslp_BB_drdd COMMAND $ENV{PWD}/src/runDsp --algo drdd --smps ${CMAKE_SOURCE_DIR}/examples/dro/sslp_5_25_15_BB --param ${CMAKE_SOURCE_DIR}/test/params_cpx.txt --test -98.0703)
add_test(NAME cpx_sslp_BC_drdd COMMAND $ENV{PWD}/src/runDsp --algo drdd --smps ${CMAKE_SOURCE_DIR}/examples/dro/sslp_5_25_15_BC --param ${CMAKE_SOURCE_DIR}/test/params_cpx.txt --test -98.0705)
add_test(NAME cpx_sslp_CC_drdd COMMAND $ENV{PWD}/src/runDsp --algo drdd --smps ${CMAKE_SOURCE_DIR}/examples/dro/sslp_5_25_15_CC --param ${CMAKE_SOURCE_DIR}/test/params_cpx.txt --test -194.811)
add_test(NAME cpx_noswot_de COMMAND $ENV{PWD}/src/runDsp --algo de --mps ${CMAKE_SOURCE_DIR}/examples/mps-dec/noswot.mps --dec ${CMAKE_SOURCE_DIR}/examples/mps-dec/noswot.dec --param ${CMAKE_SOURCE_DIR}/test/params_cpx.txt --test -42)
add_test(NAME cpx_noswot_dw COMMAND $ENV{PWD}/src/runDsp --algo dw --mps ${CMAKE_SOURCE_DIR}/examples/mps-dec/noswot.mps --dec ${CMAKE_SOURCE_DIR}/examples/mps-dec/noswot.dec --param ${CMAKE_SOURCE_DIR}/test/params_cpx.txt --test -42)
endif(CPLEXLIB)
Expand All @@ -26,6 +35,9 @@ if(GUROBILIB)
add_test(NAME grb_farmer_dd COMMAND $ENV{PWD}/src/runDsp --algo dd --smps ${CMAKE_SOURCE_DIR}/examples/smps/farmer --param ${CMAKE_SOURCE_DIR}/test/params_grb.txt --test -108389.9994043)
add_test(NAME grb_farmer_dw COMMAND $ENV{PWD}/src/runDsp --algo dw --smps ${CMAKE_SOURCE_DIR}/examples/smps/farmer --param ${CMAKE_SOURCE_DIR}/test/params_grb.txt --test -108389.9994043)
add_test(NAME grb_drslp_drdd COMMAND $ENV{PWD}/src/runDsp --algo drdd --smps ${CMAKE_SOURCE_DIR}/examples/dro/drslp_5_5_5_5 --param ${CMAKE_SOURCE_DIR}/test/params_grb.txt --test 5.60247)
add_test(NAME grb_sslp_BB_drdd COMMAND $ENV{PWD}/src/runDsp --algo drdd --smps ${CMAKE_SOURCE_DIR}/examples/dro/sslp_5_25_15_BB --param ${CMAKE_SOURCE_DIR}/test/params_grb.txt --test -98.0703)
add_test(NAME grb_sslp_BC_drdd COMMAND $ENV{PWD}/src/runDsp --algo drdd --smps ${CMAKE_SOURCE_DIR}/examples/dro/sslp_5_25_15_BC --param ${CMAKE_SOURCE_DIR}/test/params_grb.txt --test -98.0705)
add_test(NAME grb_sslp_CC_drdd COMMAND $ENV{PWD}/src/runDsp --algo drdd --smps ${CMAKE_SOURCE_DIR}/examples/dro/sslp_5_25_15_CC --param ${CMAKE_SOURCE_DIR}/test/params_grb.txt --test -194.811)
add_test(NAME grb_noswot_de COMMAND $ENV{PWD}/src/runDsp --algo de --mps ${CMAKE_SOURCE_DIR}/examples/mps-dec/noswot.mps --dec ${CMAKE_SOURCE_DIR}/examples/mps-dec/noswot.dec --param ${CMAKE_SOURCE_DIR}/test/params_grb.txt --test -42)
add_test(NAME grb_noswot_dw COMMAND $ENV{PWD}/src/runDsp --algo dw --mps ${CMAKE_SOURCE_DIR}/examples/mps-dec/noswot.mps --dec ${CMAKE_SOURCE_DIR}/examples/mps-dec/noswot.dec --param ${CMAKE_SOURCE_DIR}/test/params_grb.txt --test -42)
endif(GUROBILIB)
Expand All @@ -36,6 +48,9 @@ if (MPI_CXX_FOUND)
add_test(NAME scip_farmer_dw_mpi COMMAND mpiexec -np 3 $ENV{PWD}/src/runDsp --algo dw --smps ${CMAKE_SOURCE_DIR}/examples/smps/farmer --param ${CMAKE_SOURCE_DIR}/test/params_scip.txt --test -108389.9994043)
add_test(NAME scip_farmer_bd_mpi COMMAND mpiexec -np 3 $ENV{PWD}/src/runDsp --algo bd --smps ${CMAKE_SOURCE_DIR}/examples/smps/farmer --param ${CMAKE_SOURCE_DIR}/test/params_scip.txt --test -108389.9994043)
add_test(NAME scip_sslp_bd_mpi COMMAND mpiexec -np 3 $ENV{PWD}/src/runDsp --algo bd --smps ${CMAKE_SOURCE_DIR}/examples/smps/sslp_5_25_50 --param ${CMAKE_SOURCE_DIR}/test/params_scip.txt --test -121.6)
add_test(NAME scip_sslp_BB_drbd_mpi COMMAND mpiexec -np 3 $ENV{PWD}/src/runDsp --algo drbd --smps ${CMAKE_SOURCE_DIR}/examples/dro/sslp_5_25_15_BB --param ${CMAKE_SOURCE_DIR}/test/params_scip.txt --test -98.0703)
add_test(NAME scip_sslp_BC_drbd_mpi COMMAND mpiexec -np 3 $ENV{PWD}/src/runDsp --algo drbd --smps ${CMAKE_SOURCE_DIR}/examples/dro/sslp_5_25_15_BC --param ${CMAKE_SOURCE_DIR}/test/params_scip.txt --test -98.0705)
add_test(NAME scip_sslp_CC_drbd_mpi COMMAND mpiexec -np 3 $ENV{PWD}/src/runDsp --algo drbd --smps ${CMAKE_SOURCE_DIR}/examples/dro/sslp_5_25_15_CC --param ${CMAKE_SOURCE_DIR}/test/params_scip.txt --test -194.811)
add_test(NAME scip_drslp_drbd_mpi COMMAND mpiexec -np 3 $ENV{PWD}/src/runDsp --algo drbd --smps ${CMAKE_SOURCE_DIR}/examples/dro/drslp_5_5_5_5 --param ${CMAKE_SOURCE_DIR}/test/params_scip.txt --test 5.60247)
# add_test(NAME scip_noswot_dw_mpi COMMAND mpiexec -np 3 $ENV{PWD}/src/runDsp --algo dw --mps ${CMAKE_SOURCE_DIR}/examples/mps-dec/noswot.mps --dec ${CMAKE_SOURCE_DIR}/examples/mps-dec/noswot.dec --param ${CMAKE_SOURCE_DIR}/test/params_scip.txt --test -42)
if(MA27LIB)
Expand Down

0 comments on commit ee39967

Please sign in to comment.