Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge latest for release #1796

Merged
merged 476 commits into from
Jun 10, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
476 commits
Select commit Hold shift + click to select a range
b746d0a
Infeasibility identified, but not being passed down
jajhall Apr 5, 2024
8a6a6de
Put HPRESOLVE_CHECKED_CALL around fastPresolveLoop(postsolve_stack) i…
jajhall Apr 5, 2024
bb2865f
Merge pull request #1719 from ERGO-Code/fix-1710
jajhall Apr 6, 2024
d94c8c8
Now reporting number of reductions when limit is finite whatever the …
jajhall Apr 12, 2024
4e18ccf
Initialize substitution opportunities
fwesselm Apr 15, 2024
e6ea285
Reuse existing methods
fwesselm Apr 16, 2024
09f912d
Merge pull request #1714 from ERGO-Code/fix-1711
jajhall Apr 16, 2024
d63e56a
Merge branch 'latest' of https://github.com/ERGO-Code/HiGHS into init…
fwesselm Apr 17, 2024
8fde247
Merge pull request #1726 from fwesselm/initSubsOpp
jajhall Apr 19, 2024
caf3ca6
Update bounds on dual variables when converting inequality into equal…
fwesselm Apr 22, 2024
7881e79
Merge pull request #1730 from fwesselm/fix1725
jajhall Apr 23, 2024
876b139
Merge pull request #1732 from ERGO-Code/fix-1725
jajhall Apr 23, 2024
85e67d6
Meson build: avoid using `add_languages('c')` to fix a build warning
rgommers Apr 26, 2024
769b8d5
Meson build: add note on issue on Windows with timestamp retrieval
rgommers Apr 26, 2024
8290972
Meson build: improve clarity of what libraries are being linked
rgommers Apr 26, 2024
d4ee97a
Meson build: ensure symbols from static library don't get reexported
rgommers Apr 26, 2024
b094f96
Meson build: bump version to 1.7.0
rgommers Apr 26, 2024
3de2b8d
Meson build: ensure compiler flags to silence warnings are used portably
rgommers Apr 26, 2024
1ab0520
Meson build: minor cleanup in highspy build config
rgommers Apr 26, 2024
27b1fee
Merge pull request #1737 from rgommers/meson-fixes
jajhall Apr 27, 2024
fb8dc45
Added setBasis to highspy, both for logical basis and specific basis
jajhall May 2, 2024
5415d17
Added writePresolvedModel and unit test
jajhall May 2, 2024
3493d10
Added writePresolvedModel to C# FORTRAN and Python interfaces
jajhall May 2, 2024
e12faf0
Merge pull request #1741 from ERGO-Code/fix-1729
jajhall May 2, 2024
7d14659
Now calling saveReportMipSolution when presolve reduces MIP to empty
jajhall May 2, 2024
9b8af97
How is a void* passed by reference?
jajhall May 2, 2024
2481cd6
Delete HiGHS.sln
galabovaa May 3, 2024
145fc4f
deprecate compilation date
galabovaa May 3, 2024
b784629
fix .cmake.in
galabovaa May 3, 2024
ab766f8
add rpath to binary
galabovaa May 3, 2024
44f5191
add iteration counts for mac arm to cmake tests
galabovaa May 3, 2024
bc58794
workflow action version
galabovaa May 3, 2024
fdff2a2
system packages
galabovaa May 3, 2024
159be58
to mac test
galabovaa May 3, 2024
aba519e
user
galabovaa May 3, 2024
cf9ccb3
setup python
galabovaa May 3, 2024
7274db6
sdist
galabovaa May 3, 2024
ffaa38b
install
galabovaa May 3, 2024
05c9df3
fix typo
galabovaa May 3, 2024
6ab3873
testing
galabovaa May 3, 2024
3306a87
mamba python version
galabovaa May 3, 2024
905dbb8
workaround meson mamba
galabovaa May 3, 2024
ee940fc
python version
galabovaa May 3, 2024
009ac45
check python package
galabovaa May 3, 2024
1ebe0e1
Merge branch 'mac-arm-tests' into rpath-bin
galabovaa May 3, 2024
e05325c
Merge pull request #1743 from ERGO-Code/deprecate-compilation-date
jajhall May 4, 2024
cc0be88
Merge pull request #1746 from ERGO-Code/mac-arm-tests
galabovaa May 4, 2024
5f45a8b
Merge pull request #1744 from ERGO-Code/fast-build-cmake-config
galabovaa May 4, 2024
5b92431
Merge branch 'latest' into rpath-bin
galabovaa May 4, 2024
9038435
remove more dates
galabovaa May 4, 2024
2df7f7f
meson single quotes
galabovaa May 4, 2024
3b07c85
remove datetime from meson build
galabovaa May 4, 2024
e9c6ef2
Merge pull request #1747 from ERGO-Code/deprecate-compilation-date
galabovaa May 4, 2024
a946666
Merge branch 'latest' into rpath-bin
galabovaa May 4, 2024
05ade6b
Now returning const void* from Highs_getCallbackDataOutItem
jajhall May 5, 2024
28eb9e8
Titdied up and keeping things simple by taking nullptr return as error
jajhall May 5, 2024
989b3a1
Now checking all members of data_out
jajhall May 5, 2024
00f5688
Merge branch 'latest' into fix-1697
jajhall May 5, 2024
bbc1267
Removed temporary dev hacks
jajhall May 5, 2024
56836d0
Now switching the use of constant definitions of CallbackDataOut item…
jajhall May 5, 2024
4f73836
Now defining kHighsCallbackDataOut_*_Name in TestCAPI.c ifndef USE_Ca…
jajhall May 5, 2024
77eabe1
Removed checks on unassigned cutpool data
jajhall May 5, 2024
91f66bb
Added const to const char*
jajhall May 6, 2024
8337558
Better not to have Highs_getCallbackDataOutItem amongst methods requi…
jajhall May 6, 2024
cad21fe
Highs::setSolution now gives logging message and error return if user…
jajhall May 6, 2024
3642900
Now checking minimal user solution and basis vector size, logging and…
jajhall May 6, 2024
6c11654
Merge pull request #1748 from ERGO-Code/fix-1697
jajhall May 6, 2024
ae25abb
Updated FEATURES.md
jajhall May 6, 2024
b29d344
Merge pull request #1750 from ERGO-Code/fix-1691
jajhall May 6, 2024
2191d0e
Renamed addVar to addVariable, removeVar to deleteVariable, and getV…
jajhall May 6, 2024
99445c7
Merge pull request #1745 from ERGO-Code/rpath-bin
galabovaa May 7, 2024
9dd829c
add comment for documentation build
galabovaa May 7, 2024
0bd3176
Merge pull request #1752 from ERGO-Code/docs-callback
galabovaa May 7, 2024
d0d8031
Investigating why second name in distillation.py is incorrect when se…
jajhall May 7, 2024
a0fcdb5
Merge branch 'latest' into fix-1679-1681
jajhall May 7, 2024
6bdca6c
Merge branch 'latest' into fix-1733
jajhall May 7, 2024
053a624
Merge branch 'latest' into fix-1724
jajhall May 7, 2024
35d3775
Updated test_highspy.py
jajhall May 7, 2024
d146930
Merge pull request #1742 from ERGO-Code/fix-1724
jajhall May 7, 2024
d43682a
Merge pull request #1740 from ERGO-Code/fix-1733
jajhall May 7, 2024
d95f337
renamed h.removeVar to h.deleteVariable and test_addVar to test_addVa…
jajhall May 7, 2024
65f5af4
chore(bazel): add MODULE.bazel files for bzlmod
mmorel-35 May 6, 2024
96c3dd2
Merge pull request #1754 from mmorel-35/bzlmod
galabovaa May 8, 2024
d712a7e
version check in ipo detection
galabovaa May 10, 2024
a1b3ae5
typo
galabovaa May 10, 2024
dafeff3
added threads dependency to cmake config
galabovaa May 10, 2024
7d928db
Merge pull request #1759 from ERGO-Code/include-threads-cmake
galabovaa May 11, 2024
de38de1
Merge pull request #1758 from ERGO-Code/cmake-version-check
galabovaa May 11, 2024
a188318
Merge branch 'latest' into fixx
galabovaa May 11, 2024
1fe470d
drop fast_build off from cmake config
galabovaa May 12, 2024
4439389
clear lists, bump dev version
galabovaa May 12, 2024
39cf657
getting names from batch
galabovaa May 13, 2024
afc651f
Now forcing update() in addVariable
jajhall May 15, 2024
c64db74
Removed debug code; added setContinuous to highspy modelling; cleaned…
jajhall May 15, 2024
2cfd444
Removed test_deleteVariable
jajhall May 15, 2024
827e911
Renamed all "var" references to "variable" in highs.py
jajhall May 15, 2024
990d8b8
Merge pull request #1753 from ERGO-Code/fix-1679-1681
jajhall May 15, 2024
9e50c6b
1. Try to detect infeasibility caused by integer-constrained variable…
fwesselm May 17, 2024
f6367fe
Introduced HighsPresolveStatus::kOutOfMemory and deleted unused IPX m…
jajhall May 17, 2024
7608a5d
Introduced HPresolve::okDoubleResize and HPresolve::okHighsIntResize
jajhall May 17, 2024
13a8740
Renamed HPresolve::setInput to HPresolve::okSetInput, now returning b…
jajhall May 17, 2024
4e1afd8
All resize/reserve in HPresolve::okSetInput now checked calls
jajhall May 17, 2024
e20aa22
Renamed fromCSR and fromCSC to okFromCSR and okFromCSC and returning …
jajhall May 17, 2024
a9dd3f9
Formatted
jajhall May 17, 2024
df8d226
Moved memory allocation methods to newly-created util/HighsMemoryAllo…
jajhall May 18, 2024
6d91409
Added ../src/util/HighsMemoryAllocation.h and ../src/util/HighsMemory…
jajhall May 18, 2024
bd0e5b9
Fixed HighsMemoryAllocation.h
jajhall May 18, 2024
b6efabe
Checked all memory allocaitons in HPresolve::okFromCSC
jajhall May 18, 2024
b3e81c7
Checked all memory allocations in HPresolve::okFromCSR
jajhall May 18, 2024
adeab55
About to add HighsModelStatus::kMemoryLimit
jajhall May 18, 2024
ffcbae3
Added HighsModelStatus::kMemoryLimit
jajhall May 18, 2024
1fac08d
Memory allocation errors in HPresolve::okSetInput handled OK
jajhall May 18, 2024
4c41890
Updated FEATURES.md
jajhall May 18, 2024
010c60b
Merge pull request #1767 from ERGO-Code/fix-1766
jajhall May 18, 2024
1ddc6c3
Update FEATURES.md
jajhall May 18, 2024
bbf8e37
remove old python api and add cmake instruction file
galabovaa May 20, 2024
362afe9
added tests and table
galabovaa May 20, 2024
31030ef
typo table
galabovaa May 20, 2024
345e4a3
typos table
galabovaa May 20, 2024
4544e14
tests and docs
galabovaa May 20, 2024
6b993ed
workflows
galabovaa May 20, 2024
070cea7
docs and tests
galabovaa May 20, 2024
7bfdc40
docs
galabovaa May 20, 2024
b9913a7
wflows
galabovaa May 20, 2024
08e605c
workflows and readme
galabovaa May 20, 2024
cabfb01
rename wflow
galabovaa May 20, 2024
601bb63
nuget win testg
galabovaa May 20, 2024
6d7459c
added fortran col
galabovaa May 20, 2024
229c19c
docs
galabovaa May 20, 2024
1354c15
cosmetic
galabovaa May 20, 2024
ea9b607
test fortran macos
galabovaa May 20, 2024
b3344f2
macos fortran
galabovaa May 20, 2024
7ba619a
steps
galabovaa May 20, 2024
043b809
test fortran ubuntu
galabovaa May 20, 2024
a778542
compiler options
galabovaa May 20, 2024
af9d7d4
badge and tests
galabovaa May 20, 2024
16ee4ea
badge
galabovaa May 20, 2024
e4e6451
clean up
galabovaa May 20, 2024
815ffca
clean up badge
galabovaa May 20, 2024
5b2fc13
macos gcc
galabovaa May 20, 2024
2ae4803
win gfortran
galabovaa May 20, 2024
21fcee7
wflow win
galabovaa May 20, 2024
ed7bdc2
Use templates
fwesselm May 21, 2024
4e1982f
Fix type conflicts
fwesselm May 21, 2024
38eb82a
Forgot to remove source file
fwesselm May 21, 2024
83f4a12
Revert accidental removal
fwesselm May 21, 2024
3ea6139
Fix format
fwesselm May 21, 2024
8507361
Remove empty line
fwesselm May 21, 2024
5963e9e
Fix copy-and-paste error
fwesselm May 21, 2024
4ef2622
Merge branch 'latest' of https://github.com/ERGO-Code/HiGHS into intV…
fwesselm May 21, 2024
1461e16
Clean up
fwesselm May 21, 2024
ebf371d
Simplify again
fwesselm May 22, 2024
42e50d1
Minor change
fwesselm May 22, 2024
3762692
Merge pull request #1769 from fwesselm/memChecksUseTemplates
jajhall May 22, 2024
37382f6
Make test pass
fwesselm May 22, 2024
d07de6d
Add tests
fwesselm May 22, 2024
812469f
Minor change, add assertion
fwesselm May 22, 2024
f4a2496
Merge pull request #1770 from fwesselm/intVarsWithFractionalBnds
jajhall May 23, 2024
e1e6152
Removed non-ascii from cupdlp code
jajhall May 23, 2024
ecef70a
Corrected use of addVar in highspy modelling documentaiton
jajhall May 23, 2024
2d57b8a
Added H_ subscript to Init_Scaling and PDHG_Scale_Data_cuda
jajhall May 23, 2024
f378107
Updated README.md with GPU notes and commented out WIP on zbook
jajhall May 23, 2024
65fc061
Merge pull request #1773 from ERGO-Code/fix-1694
jajhall May 23, 2024
bd0988c
QP solver logging less chatty
jajhall May 24, 2024
c0006bd
Incomplete Hessians are now completed with zeros on the diagonal
jajhall May 24, 2024
223b0cb
Incomplete Hessians are now completed with zeros on the diagonal
jajhall May 24, 2024
5ba4729
Need to clear Hessian with diagonal of zero entries
jajhall May 24, 2024
5c57e29
Now completing a Hessian after adding columns, deleting Hessian colum…
jajhall May 24, 2024
4e54817
Modified unit tests now that solving a QP with an extra column but no…
jajhall May 24, 2024
c9d2c87
Try to eliminate deleteCols ambiguity causing CI failures
jajhall May 24, 2024
e0676e3
WIP
jajhall May 24, 2024
8afbb10
Now checked Hessian column deletion rigorously in unit test
jajhall May 25, 2024
79666d0
Added #include <algorithm> to TestQpSolver.cpp
jajhall May 25, 2024
b6172a8
Now casting 1 to HighsInt in std::max
jajhall May 25, 2024
7bd0035
Moved deleteLpCols/Rows to HighsLp
jajhall May 25, 2024
02ab767
Merge pull request #1774 from ERGO-Code/fix-1583-1689
jajhall May 25, 2024
4f54ef2
Updated FEATURES.md
jajhall May 28, 2024
264e7c2
Set up test case Rays-infeasible-qp
jajhall May 28, 2024
dcc2efc
Set up test case Rays-infeasible-qp
jajhall May 28, 2024
a1dd74b
Renamed too opaque Vector to QpVector in QP solver and renamed vector…
jajhall May 28, 2024
9b9253a
Renamed too opaque Vector to QpVector in QP solver and renamed vector…
jajhall May 28, 2024
9890b1f
Now transforming to HiGHS model status, solution and basis in quass
jajhall May 28, 2024
e5b46b8
quass now converts to HiGHS model status, basis and solution internally
jajhall May 28, 2024
9633076
Added qpsolver/qpvector.hpp
jajhall May 28, 2024
a6009b5
Now ready for computeStartingPointHighs to just use/return the highs_…
jajhall May 28, 2024
cf923c0
Modified computeStartingPointHighs so that it will only use Phase 1 i…
jajhall May 28, 2024
815e23c
Added second example to test-qp-hot-start but need to study quass more
jajhall May 29, 2024
a986774
Fix the O(N^2) bug of passColName and passRowName
metab0t May 30, 2024
e08e840
Merge pull request #1782 from metab0t/fix_passname
jajhall May 30, 2024
9a56f45
Looking to understand structure of basis
jajhall May 30, 2024
542bc91
WIP
jajhall May 30, 2024
b613750
Moved analysis of basis to report()
jajhall May 30, 2024
ebc669a
Now returning warning and error from quass
jajhall May 30, 2024
52aff16
Added error communication with quass
jajhall May 30, 2024
193e607
OpenBSD - Update strict_fstream.hpp
ron-at-swgy May 30, 2024
5d89494
Documented QP basis and correspiondence with HighsBasis
jajhall May 31, 2024
36169ed
Renamed QpModelStatus members to Google style
jajhall May 31, 2024
1f4c823
Renamed quass BasisStatus members to Google style
jajhall May 31, 2024
456d55f
Added separate event for QP model status logging
jajhall May 31, 2024
cefd96c
Introduced HighsOptions qp_iteration_limit and qp_nullspace_limit, an…
jajhall May 31, 2024
c3584de
QP solver appears to hot start
jajhall Jun 1, 2024
3cf30cb
Formatted
jajhall Jun 1, 2024
93c4a02
Now counting QP iterations so that it's not two when only proving opt…
jajhall Jun 1, 2024
f339ef5
Suppressed .fire calls to investigat ewhy CI tests fail
jajhall Jun 1, 2024
b9422bd
getVariableKktFailures returns status_value_ok to report on QP basis …
jajhall Jun 1, 2024
7e2f285
Removed instance tests frob test-qp-hot-start at present
jajhall Jun 2, 2024
d0267be
About to get rid of the 10E in QP solver
jajhall Jun 2, 2024
1cc7921
Eliminated 10E from QP solver, and restored logging
jajhall Jun 2, 2024
ebd7366
Replaced calls to calculateRowValues with calls to calculateRowValues…
jajhall Jun 2, 2024
a1d4411
Replaced calls to calculateColDuals with calls to calculateColDualsQuad
jajhall Jun 2, 2024
735b5fb
Fixed error in calculateColDualsQuad
jajhall Jun 2, 2024
c11a6ce
Silenced the debug printing; formatted
jajhall Jun 2, 2024
59204a6
Reinstated runtime.settings.nullspace_limit_log.fire(runtime.settings…
jajhall Jun 2, 2024
4a7a9b2
Added test-qp-terminations to test qp_iteration_limit, qp_nullspace_l…
jajhall Jun 2, 2024
47fd199
Restored settings.qp_model_status_log.fire(qp_model_status);
jajhall Jun 2, 2024
f532e65
Merge pull request #1779 from ERGO-Code/qp-hot-start
jajhall Jun 2, 2024
8b75f00
Replaced primal3.mps with primal1.mps to speed up unit test; Updated …
jajhall Jun 3, 2024
5f551b1
Merge pull request #1788 from ERGO-Code/qp-hot-start
jajhall Jun 3, 2024
1f10839
Merge pull request #1783 from ron-at-swgy/patch-1
galabovaa Jun 4, 2024
48aa85f
win 2019 runner@
galabovaa Jun 10, 2024
939cc30
win 2019 runners@
galabovaa Jun 10, 2024
50f8130
fb release too, even though it passed 5 min ago
galabovaa Jun 10, 2024
5b32168
release
galabovaa Jun 10, 2024
8f82a8c
fail fast
galabovaa Jun 10, 2024
7b1c4a9
clean up and update of pypa/cibw action
galabovaa Jun 10, 2024
ec2399e
Merge pull request #1793 from ERGO-Code/testing-servers
galabovaa Jun 10, 2024
f9b5e7e
merge latest
galabovaa Jun 10, 2024
ebfd9f7
fortran test
galabovaa Jun 10, 2024
bbd28e2
clean up
galabovaa Jun 10, 2024
a971693
badges
galabovaa Jun 10, 2024
9a6be80
more badges
galabovaa Jun 10, 2024
4480962
readme
galabovaa Jun 10, 2024
75b4aa9
cosmetic edit of focs
galabovaa Jun 10, 2024
40ca385
badges documentation
galabovaa Jun 10, 2024
59cc16a
readme
galabovaa Jun 10, 2024
2c20140
readme running highs
galabovaa Jun 10, 2024
0641466
contents
galabovaa Jun 10, 2024
60a9038
sh
galabovaa Jun 10, 2024
4a6a95e
sh
galabovaa Jun 10, 2024
3f56011
shell
galabovaa Jun 10, 2024
28212e2
options link
galabovaa Jun 10, 2024
0f349a9
options link
galabovaa Jun 10, 2024
7aa1902
fail fast false
galabovaa Jun 10, 2024
53cf4a6
docs
galabovaa Jun 10, 2024
d9f7f2f
version bump
galabovaa Jun 10, 2024
2ac067f
Merge pull request #1794 from ERGO-Code/cmake-readme
galabovaa Jun 10, 2024
027b2f7
Merge pull request #1795 from ERGO-Code/version-bump
galabovaa Jun 10, 2024
072d153
remove docs build status and change win test server for python api
galabovaa Jun 10, 2024
488fb19
merge latest
galabovaa Jun 10, 2024
b14f4aa
Merge pull request #1797 from ERGO-Code/release-fixes
galabovaa Jun 10, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .bazelrc
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
common --noenable_bzlmod
1 change: 1 addition & 0 deletions .envrc
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
use flake
8 changes: 4 additions & 4 deletions .github/workflows/build-clang.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ jobs:
shell: bash
# Execute tests defined by the CMake configuration.
# See https://cmake.org/cmake/help/latest/manual/ctest.1.html for more detail
run: ctest --parallel 2 --timeout 300 --output-on-failure
run: ctest --parallel --timeout 300 --output-on-failure

release:
runs-on: ${{ matrix.os }}
Expand Down Expand Up @@ -67,7 +67,7 @@ jobs:
shell: bash
# Execute tests defined by the CMake configuration.
# See https://cmake.org/cmake/help/latest/manual/ctest.1.html for more detail
run: ctest --parallel 2 --timeout 300 --output-on-failure -C RELEASE
run: ctest --parallel --timeout 300 --output-on-failure -C RELEASE

debug64:
runs-on: ${{ matrix.os }}
Expand Down Expand Up @@ -100,7 +100,7 @@ jobs:
shell: bash
# Execute tests defined by the CMake configuration.
# See https://cmake.org/cmake/help/latest/manual/ctest.1.html for more detail
run: ctest --parallel 2 --timeout 300 --output-on-failure
run: ctest --parallel --timeout 300 --output-on-failure

release64:
runs-on: ${{ matrix.os }}
Expand Down Expand Up @@ -133,4 +133,4 @@ jobs:
shell: bash
# Execute tests defined by the CMake configuration.
# See https://cmake.org/cmake/help/latest/manual/ctest.1.html for more detail
run: ctest --parallel 2 --timeout 300 --output-on-failure -C RELEASE
run: ctest --parallel --timeout 300 --output-on-failure -C RELEASE
136 changes: 130 additions & 6 deletions .github/workflows/build-linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,38 @@ jobs:
shell: bash
# Execute tests defined by the CMake configuration.
# See https://cmake.org/cmake/help/latest/manual/ctest.1.html for more detail
run: ctest --parallel 2 --timeout 300 --output-on-failure
run: ctest --parallel --timeout 300 --output-on-failure

debug_all_tests:
runs-on: ${{ matrix.os }}
strategy:
matrix:
os: [ubuntu-latest]

steps:
- uses: actions/checkout@v4

- name: Create Build Environment
run: cmake -E make_directory ${{runner.workspace}}/build

- name: Configure CMake All
shell: bash
working-directory: ${{runner.workspace}}/build
run: cmake $GITHUB_WORKSPACE -DCMAKE_BUILD_TYPE=Debug -DFAST_BUILD=ON -DALL_TESTS=ON

- name: Build All
working-directory: ${{runner.workspace}}/build
shell: bash
# Execute the build. You can specify a specific target with "--target <NAME>"
run: |
cmake --build . --parallel --config Debug

- name: Test All
working-directory: ${{runner.workspace}}/build
shell: bash
# Execute tests defined by the CMake configuration.
# See https://cmake.org/cmake/help/latest/manual/ctest.1.html for more detail
run: ctest --parallel --timeout 300 --output-on-failure -C Debug

release:
runs-on: ${{ matrix.os }}
Expand Down Expand Up @@ -63,7 +94,38 @@ jobs:
shell: bash
# Execute tests defined by the CMake configuration.
# See https://cmake.org/cmake/help/latest/manual/ctest.1.html for more detail
run: ctest --parallel 2 --timeout 300 --output-on-failure -C Release
run: ctest --parallel --timeout 300 --output-on-failure -C Release

release_all_tests:
runs-on: ${{ matrix.os }}
strategy:
matrix:
os: [ubuntu-latest]

steps:
- uses: actions/checkout@v4

- name: Create Build Environment
run: cmake -E make_directory ${{runner.workspace}}/build

- name: Configure CMake All
shell: bash
working-directory: ${{runner.workspace}}/build
run: cmake $GITHUB_WORKSPACE -DCMAKE_BUILD_TYPE=Release -DFAST_BUILD=ON -DALL_TESTS=ON

- name: Build All
working-directory: ${{runner.workspace}}/build
shell: bash
# Execute the build. You can specify a specific target with "--target <NAME>"
run: |
cmake --build . --parallel --config Release

- name: Test All
working-directory: ${{runner.workspace}}/build
shell: bash
# Execute tests defined by the CMake configuration.
# See https://cmake.org/cmake/help/latest/manual/ctest.1.html for more detail
run: ctest --parallel --timeout 300 --output-on-failure -C Release

debug64:
runs-on: ${{ matrix.os }}
Expand All @@ -80,21 +142,52 @@ jobs:
- name: Configure CMake
shell: bash
working-directory: ${{runner.workspace}}/build
run: cmake $GITHUB_WORKSPACE -DCMAKE_BUILD_TYPE=Release -DHIGHSINT64=on -DFAST_BUILD=OFF
run: cmake $GITHUB_WORKSPACE -DCMAKE_BUILD_TYPE=Debug -DHIGHSINT64=on -DFAST_BUILD=OFF

- name: Build
working-directory: ${{runner.workspace}}/build
shell: bash
# Execute the build. You can specify a specific target with "--target <NAME>"
run: |
cmake --build . --parallel --config Release
cmake --build . --parallel --config Debug

- name: Test
working-directory: ${{runner.workspace}}/build
shell: bash
# Execute tests defined by the CMake configuration.
# See https://cmake.org/cmake/help/latest/manual/ctest.1.html for more detail
run: ctest --parallel 2 --timeout 300 --output-on-failure -C Release
run: ctest --parallel --timeout 300 --output-on-failure -C Debug

debug64_all_tests:
runs-on: ${{ matrix.os }}
strategy:
matrix:
os: [ubuntu-latest]

steps:
- uses: actions/checkout@v4

- name: Create Build Environment
run: cmake -E make_directory ${{runner.workspace}}/build

- name: Configure CMake All
shell: bash
working-directory: ${{runner.workspace}}/build
run: cmake $GITHUB_WORKSPACE -DCMAKE_BUILD_TYPE=Debug -DFAST_BUILD=ON -DALL_TESTS=ON

- name: Build All
working-directory: ${{runner.workspace}}/build
shell: bash
# Execute the build. You can specify a specific target with "--target <NAME>"
run: |
cmake --build . --parallel --config Debug

- name: Test All
working-directory: ${{runner.workspace}}/build
shell: bash
# Execute tests defined by the CMake configuration.
# See https://cmake.org/cmake/help/latest/manual/ctest.1.html for more detail
run: ctest --parallel --timeout 300 --output-on-failure -C Debug

Release64:
runs-on: ${{ matrix.os }}
Expand Down Expand Up @@ -125,4 +218,35 @@ jobs:
shell: bash
# Execute tests defined by the CMake configuration.
# See https://cmake.org/cmake/help/latest/manual/ctest.1.html for more detail
run: ctest --parallel 2 --timeout 300 --output-on-failure -C Release
run: ctest --parallel --timeout 300 --output-on-failure -C Release

Release64_all_tests:
runs-on: ${{ matrix.os }}
strategy:
matrix:
os: [ubuntu-latest]

steps:
- uses: actions/checkout@v4

- name: Create Build Environment
run: cmake -E make_directory ${{runner.workspace}}/build

- name: Configure CMake All
shell: bash
working-directory: ${{runner.workspace}}/build
run: cmake $GITHUB_WORKSPACE -DCMAKE_BUILD_TYPE=Release -DFAST_BUILD=ON -DALL_TESTS=ON

- name: Build All
working-directory: ${{runner.workspace}}/build
shell: bash
# Execute the build. You can specify a specific target with "--target <NAME>"
run: |
cmake --build . --parallel --config Release

- name: Test All
working-directory: ${{runner.workspace}}/build
shell: bash
# Execute tests defined by the CMake configuration.
# See https://cmake.org/cmake/help/latest/manual/ctest.1.html for more detail
run: ctest --parallel --timeout 300 --output-on-failure -C Release
132 changes: 128 additions & 4 deletions .github/workflows/build-macos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,38 @@ jobs:
shell: bash
# Execute tests defined by the CMake configuration.
# See https://cmake.org/cmake/help/latest/manual/ctest.1.html for more detail
run: ctest --parallel 2 --timeout 300 --output-on-failure
run: ctest --parallel --timeout 300 --output-on-failure

debug_all_tests:
runs-on: ${{ matrix.os }}
strategy:
matrix:
os: [macos-latest]

steps:
- uses: actions/checkout@v4

- name: Create Build Environment
run: cmake -E make_directory ${{runner.workspace}}/build

- name: Configure CMake All
shell: bash
working-directory: ${{runner.workspace}}/build
run: cmake $GITHUB_WORKSPACE -DCMAKE_BUILD_TYPE=Debug -DFAST_BUILD=ON -DALL_TESTS=ON

- name: Build All
working-directory: ${{runner.workspace}}/build
shell: bash
# Execute the build. You can specify a specific target with "--target <NAME>"
run: |
cmake --build . --parallel --config Debug

- name: Test All
working-directory: ${{runner.workspace}}/build
shell: bash
# Execute tests defined by the CMake configuration.
# See https://cmake.org/cmake/help/latest/manual/ctest.1.html for more detail
run: ctest --parallel --timeout 300 --output-on-failure -C Debug

release:
runs-on: ${{ matrix.os }}
Expand Down Expand Up @@ -63,7 +94,38 @@ jobs:
shell: bash
# Execute tests defined by the CMake configuration.
# See https://cmake.org/cmake/help/latest/manual/ctest.1.html for more detail
run: ctest --parallel 2 --timeout 300 --output-on-failure -C Release
run: ctest --parallel --timeout 300 --output-on-failure -C Release

release_all_tests:
runs-on: ${{ matrix.os }}
strategy:
matrix:
os: [macos-latest]

steps:
- uses: actions/checkout@v4

- name: Create Build Environment
run: cmake -E make_directory ${{runner.workspace}}/build

- name: Configure CMake All
shell: bash
working-directory: ${{runner.workspace}}/build
run: cmake $GITHUB_WORKSPACE -DCMAKE_BUILD_TYPE=Release -DFAST_BUILD=ON -DALL_TESTS=ON

- name: Build All
working-directory: ${{runner.workspace}}/build
shell: bash
# Execute the build. You can specify a specific target with "--target <NAME>"
run: |
cmake --build . --parallel --config Release

- name: Test All
working-directory: ${{runner.workspace}}/build
shell: bash
# Execute tests defined by the CMake configuration.
# See https://cmake.org/cmake/help/latest/manual/ctest.1.html for more detail
run: ctest --parallel --timeout 300 --output-on-failure -C Debug

debug64:
runs-on: ${{ matrix.os }}
Expand Down Expand Up @@ -94,7 +156,38 @@ jobs:
shell: bash
# Execute tests defined by the CMake configuration.
# See https://cmake.org/cmake/help/latest/manual/ctest.1.html for more detail
run: ctest --parallel 2 --timeout 300 --output-on-failure -C Release
run: ctest --parallel --timeout 300 --output-on-failure -C Release

debug64_all_tests:
runs-on: ${{ matrix.os }}
strategy:
matrix:
os: [macos-latest]

steps:
- uses: actions/checkout@v4

- name: Create Build Environment
run: cmake -E make_directory ${{runner.workspace}}/build

- name: Configure CMake All
shell: bash
working-directory: ${{runner.workspace}}/build
run: cmake $GITHUB_WORKSPACE -DCMAKE_BUILD_TYPE=Debug -DFAST_BUILD=ON -DALL_TESTS=ON

- name: Build All
working-directory: ${{runner.workspace}}/build
shell: bash
# Execute the build. You can specify a specific target with "--target <NAME>"
run: |
cmake --build . --parallel --config Debug

- name: Test All
working-directory: ${{runner.workspace}}/build
shell: bash
# Execute tests defined by the CMake configuration.
# See https://cmake.org/cmake/help/latest/manual/ctest.1.html for more detail
run: ctest --parallel --timeout 300 --output-on-failure -C Debug

Release64:
runs-on: ${{ matrix.os }}
Expand Down Expand Up @@ -125,4 +218,35 @@ jobs:
shell: bash
# Execute tests defined by the CMake configuration.
# See https://cmake.org/cmake/help/latest/manual/ctest.1.html for more detail
run: ctest --parallel 2 --timeout 300 --output-on-failure -C Release
run: ctest --parallel --timeout 300 --output-on-failure -C Release

Release64_all_tests:
runs-on: ${{ matrix.os }}
strategy:
matrix:
os: [macos-latest]

steps:
- uses: actions/checkout@v4

- name: Create Build Environment
run: cmake -E make_directory ${{runner.workspace}}/build

- name: Configure CMake
shell: bash
working-directory: ${{runner.workspace}}/build
run: cmake $GITHUB_WORKSPACE -DCMAKE_BUILD_TYPE=Release -DHIGHSINT64=on -DALL_TESTS=ON

- name: Build
working-directory: ${{runner.workspace}}/build
shell: bash
# Execute the build. You can specify a specific target with "--target <NAME>"
run: |
cmake --build . --parallel --config Release

- name: Test
working-directory: ${{runner.workspace}}/build
shell: bash
# Execute tests defined by the CMake configuration.
# See https://cmake.org/cmake/help/latest/manual/ctest.1.html for more detail
run: ctest --parallel --timeout 300 --output-on-failure -C Release
10 changes: 6 additions & 4 deletions .github/workflows/build-meson.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,15 @@ jobs:
runs-on: ${{ matrix.os }}
strategy:
matrix:
os: [ubuntu-latest, macos-latest] # windows-latest takes to long
# macos-latest issue with micromamba action
# windows-latest takes to long
os: [ubuntu-latest]
steps:
- uses: actions/checkout@v4
with:
submodules: "recursive"
fetch-depth: 0

- name: Install Conda environment
uses: mamba-org/setup-micromamba@v1
with:
Expand All @@ -35,9 +38,8 @@ jobs:
meson setup bbdir -Duse_zlib=enabled -Dwith_tests=True
meson test -C bbdir

# highspy no longer compiled with meson, back to
# setuptools and CMakeBuild
# todo: use it optionally in some way
# highspy no longer compiled with meson
# see if it can be done separately if it is needed for meson projects
# - name: Test compiled highspy
# shell: bash -l {0}
# run: |
Expand Down
Loading
Loading