Skip to content

Commit bc41ab5

Browse files
galabovaagalabovaa
authored
Merge pull request #2376 from ERGO-Code/warning-and-iterations
Clean up for release
2 parents 2dfa503 + aa1923b commit bc41ab5

File tree

13 files changed

+43
-36
lines changed

13 files changed

+43
-36
lines changed

‎.github/workflows/build-unit-tests-external.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ jobs:
118118
# - name: Unit Test Extra
119119
# working-directory: ${{runner.workspace}}/build
120120
# shell: bash
121-
# run: ./bin/Release/unit_tests.exe highs-names-extra
121+
# run: ./Release/bin/unit_tests.exe highs-names-extra
122122

123123
# - name: Test
124124
# working-directory: ${{runner.workspace}}/build

‎.github/workflows/test-csharp-win.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
working-directory: ${{runner.workspace}}/build
2828
run: |
2929
ls
30-
./bin/Release/csharpexample.exe
30+
./Release/bin/csharpexample.exe
3131
3232
fast_build_debug:
3333
runs-on: windows-latest
@@ -53,4 +53,4 @@ jobs:
5353
working-directory: ${{runner.workspace}}/build
5454
run: |
5555
ls
56-
./bin/Debug/csharpexample.exe
56+
./Debug/bin/csharpexample.exe

‎.github/workflows/test-exe.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ jobs:
6060
shell: bash
6161
# Execute tests defined by the CMake configuration.
6262
# See https://cmake.org/cmake/help/latest/manual/ctest.1.html for more detail
63-
run: ./bin/Release/highs.exe $GITHUB_WORKSPACE/check/instances/25fv47.mps
63+
run: ./Release/bin/highs.exe $GITHUB_WORKSPACE/check/instances/25fv47.mps
6464

6565

6666
test_win_debug:
@@ -89,4 +89,4 @@ jobs:
8989
shell: bash
9090
# Execute tests defined by the CMake configuration.
9191
# See https://cmake.org/cmake/help/latest/manual/ctest.1.html for more detail
92-
run: ./bin/Debug/highs.exe $GITHUB_WORKSPACE/check/instances/25fv47.mps
92+
run: ./Debug/bin/highs.exe $GITHUB_WORKSPACE/check/instances/25fv47.mps

‎CMakeLists.txt‎

Lines changed: 11 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -205,27 +205,24 @@ if (BUILD_CXX)
205205
set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_LIBDIR})
206206
set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_LIBDIR})
207207
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_BINDIR})
208-
# for multi-config build system (e.g. xcode)
209-
foreach(OUTPUTCONFIG IN LISTS CMAKE_CONFIGURATION_TYPES)
210-
string(TOUPPER ${OUTPUTCONFIG} OUTPUTCONFIG)
211-
set(CMAKE_LIBRARY_OUTPUT_DIRECTORY_${OUTPUTCONFIG} ${CMAKE_BINARY_DIR}/${OUTPUTCONFIG}/${CMAKE_INSTALL_LIBDIR})
212-
set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY_${OUTPUTCONFIG} ${CMAKE_BINARY_DIR}/${OUTPUTCONFIG}/${CMAKE_INSTALL_LIBDIR})
213-
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_${OUTPUTCONFIG} ${CMAKE_BINARY_DIR}/${OUTPUTCONFIG}/${CMAKE_INSTALL_BINDIR})
208+
# for multi-config build system (e.g. xcode)
209+
foreach(OutputConfig IN LISTS CMAKE_CONFIGURATION_TYPES)
210+
string(TOUPPER ${OutputConfig} OUTPUTCONFIG)
211+
set(CMAKE_LIBRARY_OUTPUT_DIRECTORY_${OUTPUTCONFIG} ${CMAKE_BINARY_DIR}/${OutputConfig}/${CMAKE_INSTALL_LIBDIR})
212+
set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY_${OUTPUTCONFIG} ${CMAKE_BINARY_DIR}/${OutputConfig}/${CMAKE_INSTALL_LIBDIR})
213+
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_${OUTPUTCONFIG} ${CMAKE_BINARY_DIR}/${OutputConfig}/${CMAKE_INSTALL_BINDIR})
214214
endforeach()
215215
else()
216216
option(BUILD_SHARED_LIBS "Build shared libraries (.dll)." OFF)
217217
set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_BINDIR})
218218
set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_BINDIR})
219219
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_BINDIR})
220220
# for multi-config builds (e.g. msvc)
221-
foreach(OUTPUTCONFIG IN LISTS CMAKE_CONFIGURATION_TYPES)
222-
string(TOLOWER ${OUTPUTCONFIG} OUTPUTCONFIG)
223-
set(CMAKE_LIBRARY_OUTPUT_DIRECTORY_${OUTPUTCONFIG} ${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_BINDIR}/${OUTPUTCONFIG})
224-
set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY_${OUTPUTCONFIG} ${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_BINDIR}/${OUTPUTCONFIG})
225-
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_${OUTPUTCONFIG} ${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_BINDIR}/${OUTPUTCONFIG})
226-
# set(CMAKE_LIBRARY_OUTPUT_DIRECTORY_${OUTPUTCONFIG} ${CMAKE_BINARY_DIR}/${OUTPUTCONFIG}/${CMAKE_INSTALL_BINDIR})
227-
# set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY_${OUTPUTCONFIG} ${CMAKE_BINARY_DIR}/${OUTPUTCONFIG}/${CMAKE_INSTALL_BINDIR})
228-
# set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_${OUTPUTCONFIG} ${CMAKE_BINARY_DIR}/${OUTPUTCONFIG}/${CMAKE_INSTALL_BINDIR})
221+
foreach(OutputConfig IN LISTS CMAKE_CONFIGURATION_TYPES)
222+
string(TOUPPER ${OutputConfig} OUTPUTCONFIG)
223+
set(CMAKE_LIBRARY_OUTPUT_DIRECTORY_${OUTPUTCONFIG} ${CMAKE_BINARY_DIR}/${OutputConfig}/${CMAKE_INSTALL_BINDIR})
224+
set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY_${OUTPUTCONFIG} ${CMAKE_BINARY_DIR}/${OutputConfig}/${CMAKE_INSTALL_BINDIR})
225+
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_${OUTPUTCONFIG} ${CMAKE_BINARY_DIR}/${OutputConfig}/${CMAKE_INSTALL_BINDIR})
229226
endforeach()
230227
endif()
231228

‎check/CMakeLists.txt‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -280,19 +280,19 @@ if ((NOT FAST_BUILD OR ALL_TESTS) AND NOT (BUILD_EXTRA_UNIT_ONLY))
280280
if (UNIX AND NOT APPLE AND NOT CMAKE_CXX_COMPILER_ID STREQUAL "IntelLLVM")
281281
if (CUPDLP_GPU)
282282
set(pdlpInstances
283-
"25fv47\; 5.5018549\;"
284-
"adlittle\; 2.254950\;"
285-
"afiro\;-4.6475325\;"
286-
"avgas\;-7.75000038\;"
283+
"25fv47\; 5.501847\;"
284+
"adlittle\; 2.254949\;"
285+
"afiro\;-4.647531\;"
286+
"avgas\;-7.7499999\;"
287287
"blending\;-3.19999999\;"
288288
"chip\;-9.0000000\;"
289-
"e226\;-1.16389258\;"
290-
"scrs8\; 9.0429623\;"
289+
"e226\;-1.1638932\;"
290+
"scrs8\; 9.042968\;"
291291
"sctest\; 5.750000001\;"
292292
"shell\; 1.20882535\;"
293293
"stair\;-2.5126695\;"
294-
"standata\; 1.25769951\;"
295-
"standgub\; 1.2576993\;"
294+
"standata\; 1.2576995\;"
295+
"standgub\; 1.2576994\;"
296296
)
297297
else() # CUPDLP_CPU
298298
set(pdlpInstances
@@ -314,18 +314,18 @@ if ((NOT FAST_BUILD OR ALL_TESTS) AND NOT (BUILD_EXTRA_UNIT_ONLY))
314314
elseif(WIN32 AND NOT CMAKE_CXX_COMPILER_ID STREQUAL "IntelLLVM")
315315
if (CUPDLP_GPU)
316316
set(pdlpInstances
317-
"25fv47\; 5.50185\;" # 549 release 500 debug
318-
"adlittle\; 2.2549505\;"
319-
"afiro\;-4.6475325\;"
320-
"avgas\;-7.750000\;"
317+
"25fv47\; 5.50184\;"
318+
"adlittle\; 2.254949\;"
319+
"afiro\;-4.647531\;"
320+
"avgas\;-7.749999\;"
321321
"blending\;-3.19999999\;"
322322
"chip\;-9.0000000\;"
323323
"scrs8\; 9.0429693\;"
324324
"sctest\; 5.7500000\;"
325325
"shell\; 1.20882535\;"
326326
"stair\;-2.512669\;" # 96 release 95 debug
327327
"standata\; 1.2576995\;"
328-
"standgub\; 1.2576993\;"
328+
"standgub\; 1.257699\;"
329329
)
330330
else() # CUPDLP_CPU
331331
# on windows e226 model status is unknown

‎check/HCheckConfig.h.in‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,6 @@
77
#define COINNETLIBDIR "@COINNETLIBDIR@"
88
#define COINNETLIBFOUND @COINNETLIB_FOUND@
99

10+
#define HIGHS_DIR "@CMAKE_SOURCE_DIR@"
11+
1012
#endif /* HCHECKCONFIG_H_ */

‎check/TestAlienBasis.cpp‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -432,7 +432,9 @@ void testAlienBasis(const bool avgas, const HighsInt seed) {
432432
Highs highs;
433433
if (!dev_run) highs.setOptionValue("output_flag", false);
434434

435-
highs.readModel(filename);
435+
HighsStatus read_status = highs.readModel(filename);
436+
assert(read_status == HighsStatus::kOk);
437+
436438
HighsLp lp = highs.getLp();
437439
HighsInt num_col = lp.num_col_;
438440
HighsInt num_row = lp.num_row_;

‎check/TestCallbacks.cpp‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -572,6 +572,8 @@ static void cstyle_userCallback(const int callback_type, const char* message,
572572
case HighsCallbackType::kCallbackMipInterrupt:
573573
printf("userCallback(%11.4g): MIP interrupt\n", local_callback_data);
574574
break;
575+
default:
576+
break;
575577
}
576578
}
577579

‎check/TestIpm.cpp‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@
33
#include "Highs.h"
44
#include "catch.hpp"
55

6+
#include "HCheckConfig.h"
7+
68
// I use dev_run to switch on/off printing and logging used for
79
// development of the unit test
810
const bool dev_run = false;

‎check/TestModelProperties.cpp‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@
33
#include "Highs.h"
44
#include "catch.hpp"
55

6+
#include "HCheckConfig.h"
7+
68
const bool dev_run = false;
79
const double inf = kHighsInf;
810

0 commit comments

Comments
 (0)