Skip to content

Commit 8a37a93

Browse files
svigerskesvigerske
committed
Merge branch 'fix-solver-tests' into 'v100-bugfix'
Fix solver tests See merge request integer/scip!4061
2 parents bbd7e19 + dca195f commit 8a37a93

File tree

6 files changed

+32
-23
lines changed

6 files changed

+32
-23
lines changed

‎check/check_cluster.sh‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -218,6 +218,12 @@ do
218218
# find out the solver that should be used
219219
SOLVER=$(stripversion "${BINNAME}")
220220

221+
# xpress executable is called optimizer
222+
if test "${SOLVER}" = "optimizer"
223+
then
224+
SOLVER="xpress"
225+
fi
226+
221227
CONFFILE="configuration_tmpfile_setup_${SOLVER}.sh"
222228

223229
# call tmp file configuration for the solver

‎check/configuration_tmpfile_setup_cbc.sh‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@ VISUALIZE="${18}" # - true, if the branch-and-bound search should be visualiz
4949
SOLUFILE="${19}" # - solu file, only necessary if "${SETCUTOFF}" is 1
5050
EMPHBENCHMARK="${20}" # - use set emphasis benchmark
5151
CLOCKTYPE="${21}" # - clocktype (1 = CPU, 2 = wallclock) - currently ignored by CBC
52+
WITHCERTIFICATE="${22}" # - true, if a certificate file should be created - currently ignored by CBC
5253

5354
# new environment variables after running this script
5455
# -None
@@ -58,31 +59,31 @@ SOLFILE="${CLIENTTMPDIR}/${USER}-tmpdir/${SOLBASENAME}.sol"
5859

5960
if test "${p}" -gt 0
6061
then
61-
echo "Warning: CBC configuration currently cannot handle instance permutation"
62+
echo "Error: CBC configuration currently cannot handle instance permutation"
6263
exit 1
6364
fi
6465

6566
if test "${SETNAME}" != "default"
6667
then
67-
echo "Warning: CBC configuration currently cannot handle non-default settings"
68+
echo "Error: CBC configuration currently cannot handle non-default settings"
6869
exit 1
6970
fi
7071

7172
if test "${REOPT}" = true
7273
then
73-
echo "Warning: CBC configuration currently cannot handle reoptimization"
74+
echo "Error: CBC configuration currently cannot handle reoptimization"
7475
exit 1
7576
fi
7677

7778
if test "${VISUALIZE}" = true
7879
then
79-
echo "Warning: CBC configuration currently cannot handle visualization"
80+
echo "Error: CBC configuration currently cannot handle visualization"
8081
exit 1
8182
fi
8283

8384
if test "${SETCUTOFF}" = 1 || test "${SETCUTOFF}" = true
8485
then
85-
echo "Warning: Setting a cutoff is currently not supported for CBC configuration"
86+
echo "Error: Setting a cutoff is currently not supported for CBC configuration"
8687
exit 1
8788
fi
8889

‎check/configuration_tmpfile_setup_cplex.sh‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ VISUALIZE=${18} # - true, if the branch-and-bound search should be visualized
4949
SOLUFILE=${19} # - solu file, only necessary if ${SETCUTOFF} is 1
5050
EMPHBENCHMARK="${20}" # - use set emphasis benchmark
5151
CLOCKTYPE="${21}" # - clocktype (1 = CPU, 2 = wallclock)
52-
52+
WITHCERTIFICATE="${22}" # - true, if a certificate file should be created - currently ignored by CPLEX
5353

5454
#args=("$@")
5555
#for ((i=0; i < $#; i++)) {
@@ -84,29 +84,29 @@ fi
8484
# if permutation counter is positive add permutation seed (0 = default)
8585
if test ${p} -gt 0
8686
then
87-
echo "Warning: CPlex configuration currently cannot handle instance permutation"
87+
echo "Error: CPlex configuration currently cannot handle instance permutation"
8888
exit 1
8989
fi
9090

9191
if test "${REOPT}" = true
9292
then
9393
# exit because reoptimization feature is not supported here
94-
echo "Warning: CPlex configuration currently cannot handle reoptimization"
94+
echo "Error: CPlex configuration currently cannot handle reoptimization"
9595
exit 1
9696
fi
9797

9898
if test "${VISUALIZE}" = true
9999
then
100100
# exit because visualization feature is not supported here
101-
echo "Warning: CPlex configuration currently cannot handle visualization"
101+
echo "Error: CPlex configuration currently cannot handle visualization"
102102
exit 1
103103
fi
104104

105105
# set objective limit: optimal solution value from solu file, if existent
106106
if test "${SETCUTOFF}" = 1 || test "${SETCUTOFF}" = true
107107
then
108108
# TODO setting cutoff requires knowledge about whether the objective sense is minimization or maximization
109-
echo "Warning: Setting a cutoff is currently not supported for Cplex configuration"
109+
echo "Error: Setting a cutoff is currently not supported for Cplex configuration"
110110
exit 1
111111
fi
112112

‎check/configuration_tmpfile_setup_gurobi_cl.sh‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@ VISUALIZE="${18}" # - true, if the branch-and-bound search should be visual
4949
SOLUFILE="${19}" # - solu file, only necessary if ${SETCUTOFF} is 1
5050
EMPHBENCHMARK="${20}" # - use set emphasis benchmark
5151
CLOCKTYPE="${21}" # - clocktype (1 = CPU, 2 = wallclock) - currently ignored by Gurobi
52+
WITHCERTIFICATE="${22}" # - true, if a certificate file should be created - currently ignored by Gurobi
5253

5354
# new environment variables after running this script
5455
# -None

‎check/configuration_tmpfile_setup_xpress.sh‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@ VISUALIZE="${18}" # - true, if the branch-and-bound search should be visual
4949
SOLUFILE="${19}" # - solu file, only necessary if ${SETCUTOFF} is 1
5050
EMPHBENCHMARK="${20}" # - use set emphasis benchmark
5151
CLOCKTYPE="${21}" # - clocktype (1 = CPU, 2 = wallclock) - currently ignored by XPRESS
52+
WITHCERTIFICATE="${22}" # - true, if a certificate file should be created - currently ignored by XPRESS
5253

5354
# new environment variables after running this script
5455
# -None
@@ -58,31 +59,31 @@ SOLFILE="${CLIENTTMPDIR}/${USER}-tmpdir/${SOLBASENAME}.sol"
5859

5960
if test "${p}" -gt 0
6061
then
61-
echo "Warning: XPRESS configuration currently cannot handle instance permutation"
62+
echo "Error: XPRESS configuration currently cannot handle instance permutation"
6263
exit 1
6364
fi
6465

6566
if test "${SETNAME}" != "default"
6667
then
67-
echo "Warning: XPRESS configuration currently cannot handle non-default settings"
68+
echo "Error: XPRESS configuration currently cannot handle non-default settings"
6869
exit 1
6970
fi
7071

7172
if test "${REOPT}" = true
7273
then
73-
echo "Warning: XPRESS configuration currently cannot handle reoptimization"
74+
echo "Error: XPRESS configuration currently cannot handle reoptimization"
7475
exit 1
7576
fi
7677

7778
if test "${VISUALIZE}" = true
7879
then
79-
echo "Warning: XPRESS configuration currently cannot handle visualization"
80+
echo "Error: XPRESS configuration currently cannot handle visualization"
8081
exit 1
8182
fi
8283

8384
if test "${SETCUTOFF}" = 1 || test "${SETCUTOFF}" = true
8485
then
85-
echo "Warning: Setting a cutoff is currently not supported for XPRESS configuration"
86+
echo "Error: Setting a cutoff is currently not supported for XPRESS configuration"
8687
exit 1
8788
fi
8889

‎make/local/make.targets‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -20,14 +20,14 @@ testcplex:
2020
cd check; \
2121
$(SHELL) ./check.sh $(TEST) $(CPLEX) $(SETTINGS) $(notdir $(CPLEX)).$(OSTYPE).$(ARCH) $(OUTPUTDIR) $(TIME) $(NODES) $(MEM) $(THREADS) $(FEASTOL) $(DISPFREQ) \
2222
$(CONTINUE) $(LOCK) $(VERSION) $(LPS) $(DEBUGTOOL) $(CLIENTTMPDIR) $(REOPT) $(OPTCOMMAND) $(SETCUTOFF) $(MAXJOBS) $(VISUALIZE) $(PERMUTE) \
23-
$(SEEDS) $(GLBSEEDSHIFT) $(STARTPERM) $(EMPHBENCHMARK) $(CLOCKTYPE);
23+
$(SEEDS) $(GLBSEEDSHIFT) $(STARTPERM) $(EMPHBENCHMARK) $(CLOCKTYPE) $(WITHCERTIFICATE);
2424

2525
.PHONY: testxpress
2626
testxpress:
2727
cd check; \
2828
$(SHELL) ./check.sh $(TEST) $(XPRESS_BIN) $(SETTINGS) $(notdir $(XPRESS_BIN)).$(OSTYPE).$(ARCH) $(OUTPUTDIR) $(TIME) $(NODES) $(MEM) $(THREADS) $(FEASTOL) $(DISPFREQ) \
2929
$(CONTINUE) $(LOCK) $(VERSION) $(LPS) $(DEBUGTOOL) $(CLIENTTMPDIR) $(REOPT) $(OPTCOMMAND) $(SETCUTOFF) $(MAXJOBS) $(VISUALIZE) $(PERMUTE) \
30-
$(SEEDS) $(GLBSEEDSHIFT) $(STARTPERM) $(EMPHBENCHMARK) $(CLOCKTYPE);
30+
$(SEEDS) $(GLBSEEDSHIFT) $(STARTPERM) $(EMPHBENCHMARK) $(CLOCKTYPE) $(WITHCERTIFICATE);
3131

3232
.PHONY: testmosek
3333
testmosek:
@@ -39,14 +39,14 @@ testcbc:
3939
cd check; \
4040
$(SHELL) ./check.sh $(TEST) $(CBC) $(SETTINGS) $(notdir $(CBC)).$(OSTYPE).$(ARCH) $(OUTPUTDIR) $(TIME) $(NODES) $(MEM) $(THREADS) $(FEASTOL) $(DISPFREQ) \
4141
$(CONTINUE) $(LOCK) $(VERSION) $(LPS) $(DEBUGTOOL) $(CLIENTTMPDIR) $(REOPT) $(OPTCOMMAND) $(SETCUTOFF) $(MAXJOBS) $(VISUALIZE) $(PERMUTE) \
42-
$(SEEDS) $(GLBSEEDSHIFT) $(STARTPERM) $(EMPHBENCHMARK) $(CLOCKTYPE);
42+
$(SEEDS) $(GLBSEEDSHIFT) $(STARTPERM) $(EMPHBENCHMARK) $(CLOCKTYPE) $(WITHCERTIFICATE);
4343

4444
.PHONY: testgurobi
4545
testgurobi:
4646
cd check; \
4747
$(SHELL) ./check.sh $(TEST) $(GUROBI) $(SETTINGS) $(notdir $(GUROBI)).$(OSTYPE).$(ARCH) $(OUTPUTDIR) $(TIME) $(NODES) $(MEM) $(THREADS) $(FEASTOL) $(DISPFREQ) \
4848
$(CONTINUE) $(LOCK) $(VERSION) $(LPS) $(DEBUGTOOL) $(CLIENTTMPDIR) $(REOPT) $(OPTCOMMAND) $(SETCUTOFF) $(MAXJOBS) $(VISUALIZE) $(PERMUTE) \
49-
$(SEEDS) $(GLBSEEDSHIFT) $(STARTPERM) $(EMPHBENCHMARK) $(CLOCKTYPE);
49+
$(SEEDS) $(GLBSEEDSHIFT) $(STARTPERM) $(EMPHBENCHMARK) $(CLOCKTYPE) $(WITHCERTIFICATE);
5050

5151
.PHONY: testglpk
5252
testglpk:
@@ -93,7 +93,7 @@ testclustercpx: check/check_cluster.sh check/configuration_cluster.sh check/conf
9393
$(QUEUETYPE) $(QUEUE) $(PPN) $(CLIENTTMPDIR) $(NOWAITCLUSTER) $(EXCLUSIVE) \
9494
$(PERMUTE) $(SEEDS) $(GLBSEEDSHIFT) $(STARTPERM) $(DEBUGTOOL) false $(OPTCOMMAND) \
9595
$(SETCUTOFF) $(VISUALIZE) $(CLUSTERNODES) $(EXCLUDENODES) $(SLURMACCOUNT) $(PYTHON) \
96-
$(EMPHBENCHMARK) $(CLOCKTYPE);
96+
$(EMPHBENCHMARK) $(CLOCKTYPE) $(WITHCERTIFICATE);
9797

9898
.PHONY: testclusterxpress
9999
testclusterxpress: check/check_cluster.sh check/configuration_cluster.sh check/configuration_set.sh check/configuration_logfiles.sh check/configuration_tmpfile_setup_xpress.sh check/evalcheck_cluster.sh check/check_xpress.awk check/run.sh
@@ -103,7 +103,7 @@ testclusterxpress: check/check_cluster.sh check/configuration_cluster.sh check/c
103103
$(QUEUETYPE) $(QUEUE) $(PPN) $(CLIENTTMPDIR) $(NOWAITCLUSTER) $(EXCLUSIVE) \
104104
$(PERMUTE) $(SEEDS) $(GLBSEEDSHIFT) $(STARTPERM) $(DEBUGTOOL) false $(OPTCOMMAND) \
105105
$(SETCUTOFF) $(VISUALIZE) $(CLUSTERNODES) $(EXCLUDENODES) $(SLURMACCOUNT) $(PYTHON) \
106-
$(EMPHBENCHMARK) $(CLOCKTYPE);
106+
$(EMPHBENCHMARK) $(CLOCKTYPE) $(WITHCERTIFICATE);
107107

108108
.PHONY: testclustercbc
109109
testclustercbc:
@@ -113,7 +113,7 @@ testclustercbc:
113113
$(QUEUETYPE) $(QUEUE) $(PPN) $(CLIENTTMPDIR) $(NOWAITCLUSTER) $(EXCLUSIVE) \
114114
$(PERMUTE) $(SEEDS) $(GLBSEEDSHIFT) $(STARTPERM) $(DEBUGTOOL) false $(OPTCOMMAND) \
115115
$(SETCUTOFF) $(VISUALIZE) $(CLUSTERNODES) $(EXCLUDENODES) $(SLURMACCOUNT) $(PYTHON) \
116-
$(EMPHBENCHMARK) $(CLOCKTYPE);
116+
$(EMPHBENCHMARK) $(CLOCKTYPE) $(WITHCERTIFICATE);
117117

118118
.PHONY: testclustergurobi
119119
testclustergurobi:
@@ -123,7 +123,7 @@ testclustergurobi:
123123
$(QUEUETYPE) $(QUEUE) $(PPN) $(CLIENTTMPDIR) $(NOWAITCLUSTER) $(EXCLUSIVE) \
124124
$(PERMUTE) $(SEEDS) $(GLBSEEDSHIFT) $(STARTPERM) $(DEBUGTOOL) false $(OPTCOMMAND) \
125125
$(SETCUTOFF) $(VISUALIZE) $(CLUSTERNODES) $(EXCLUDENODES) $(SLURMACCOUNT) $(PYTHON) \
126-
$(EMPHBENCHMARK) $(CLOCKTYPE);
126+
$(EMPHBENCHMARK) $(CLOCKTYPE) $(WITHCERTIFICATE);
127127

128128
# solvers with a specialized interface:
129129

0 commit comments

Comments
 (0)