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.

Sign up for GitHub

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

Jump to bottom

ENH: Meson highs 1.7.0 #66

Merged
merged 1,435 commits into from
Jul 22, 2024
Merged

ENH: Meson highs 1.7.0 #66

merged 1,435 commits into from
Jul 22, 2024

Conversation

HaoZeke
Copy link

@HaoZeke HaoZeke commented Jul 20, 2024

Companion to scipy/scipy#21226.
Upstream copy of ERGO-Code#1749

jajhall and others added 30 commits May 24, 2024 20:57
@jajhall
Try to eliminate deleteCols ambiguity causing CI failures
c9d2c87
@jajhall
WIP
e0676e3
@jajhall
Now checked Hessian column deletion rigorously in unit test
8afbb10
@jajhall
Added #include <algorithm> to TestQpSolver.cpp
79666d0
@jajhall
Now casting 1 to HighsInt in std::max
b6172a8
@jajhall
Moved deleteLpCols/Rows to HighsLp
7bd0035
@jajhall
Merge pull request ERGO-Code#1774 from ERGO-Code/fix-1583-1689
02ab767 
QP solver logging less chatty; modifing Hessian when adding or deleting columns
@jajhall
Updated FEATURES.md
4f54ef2
@jajhall
Set up test case Rays-infeasible-qp
264e7c2
@jajhall
Set up test case Rays-infeasible-qp
dcc2efc
@jajhall
Renamed too opaque Vector to QpVector in QP solver and renamed vector…
a1dd74b 
….hpp qpvector.hpp
@jajhall
Renamed too opaque Vector to QpVector in QP solver and renamed vector…
9b9253a 
….hpp qpvector.hpp
@jajhall
Now transforming to HiGHS model status, solution and basis in quass
9890b1f
@jajhall
quass now converts to HiGHS model status, basis and solution internally
e5b46b8
@jajhall
Added qpsolver/qpvector.hpp
9633076
@jajhall
Now ready for computeStartingPointHighs to just use/return the highs_…
a6009b5 
…model_status, highs_basis, highs_solution
@jajhall
Modified computeStartingPointHighs so that it will only use Phase 1 i…
cf923c0 
…f the solution and basis are not feasible
@jajhall
Added second example to test-qp-hot-start but need to study quass more
815e23c
@fwesselm
Merge branch 'latest' of https://github.com/ERGO-Code/HiGHS into neos…
4d15b17 
…4LargeBnds
@fwesselm
Minor changes
f53ecba
@fwesselm
Minor stuff
c57d455
@fwesselm
Merge branch 'tempBranchRemoveMe' of https://github.com/fwesselm/HiGHS …
892e8d1 
…into neos4LargeBnds

# Conflicts:
#	src/mip/HighsDomain.cpp
@fwesselm
Revert switch to quad precision; need to qualify
ea24d48
@metab0t
Fix the O(N^2) bug of passColName and passRowName
a986774
@jajhall
Merge pull request ERGO-Code#1782 from metab0t/fix_passname
e08e840 
Fix the O(N^2) bug of passColName and passRowName

This closes ERGO-Code#1781
@jajhall
Looking to understand structure of basis
9a56f45
@jajhall
WIP
542bc91
@jajhall
Moved analysis of basis to report()
b613750
@jajhall
Now returning warning and error from quass
ebc669a
@jajhall
Added error communication with quass
52aff16
jajhall and others added 26 commits July 14, 2024 18:11
@jajhall
Added Highs_setSparseSolution to C API
6e9f9bd
@jajhall
Now using solution_.hasUndefined(); updated FEATURES.md and silenced …
3c34353 
…unti tests
@jajhall
Merge pull request ERGO-Code#1843 from ERGO-Code/fix-1808
08646bc 
Add facility to specify a partial primal solution via indices and values
@HaoZeke
MAINT: Silence -Wsign-compare
cf3b536 
In any case it is better to be consistent here
@HaoZeke
MAINT: Silence -Wmaybe-uninitialized
cb2556d
@HaoZeke
MAINT: Silence -Wcomment
d226a6d
@HaoZeke
BLD: Reduce the silenced warnings
e724f52 
BLD: Remove more filtered warnings
@HaoZeke
BLD: Rework to harmonize with CMake
9407f71 
Also simplify, C wrapper is always built evidently
@HaoZeke
BLD: Rework and sort-lines in meson
324f5c1
@HaoZeke
BLD: Setup the newer python library in meson
749309b
@HaoZeke
MAINT: Switch back to meson-python
d8fef70
@HaoZeke
MAINT: Lint and cleanup excess enum exports
8ef97cb
@HaoZeke
MAINT,BLD: Finish removing -Dwith_c for meson
c51941f
@HaoZeke
CI: Rework to have dependencies when building
fbf7d73
@HaoZeke
BLD: Add pack cibuildwheel config
0a4ed1e
@HaoZeke
BLD: Link with highs explicitly
56a4335
@HaoZeke
CI: Test only highs/tests/
f5c14c5
@HaoZeke
BLD: Fix C_API test
62ab499 
Doesn't use Catch2
@HaoZeke
MAINT: Try to rebuild correctly on WIN
251590a
@HaoZeke
MAINT: Remove unused build date
c01795e
@HaoZeke
BLD,TMP: Try windows again
a0390a5
@HaoZeke
BLD: Rework meson slightly
12ba85a
@HaoZeke
BLD: Revert back to scikit-build
7ed8ca2
@HaoZeke
BLD: Export python sources via variable
1ca6719
@HaoZeke
BIND: Use module local scope for exports
8dc335e
@HaoZeke
MAINT: Rework options for scipy
cc65280
@HaoZeke HaoZeke mentioned this pull request Jul 20, 2024
Closed
1 task
rgommers
rgommers approved these changes Jul 22, 2024
View reviewed changes
Copy link
Member

@rgommers rgommers left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Everything in the upstream PR looks reasonable to me, so I'll go ahead and merge this in order to unblock gh-21226.

Thanks Rohit!

@rgommers rgommers merged commit 22213df into scipy:main Jul 22, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@rgommers rgommers rgommers approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.