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: Prepare linprog for highspy #63

Merged
merged 965 commits into from
Oct 22, 2023
Merged

ENH: Prepare linprog for highspy #63

merged 965 commits into from
Oct 22, 2023

Conversation

HaoZeke
Copy link

@HaoZeke HaoZeke commented Oct 15, 2023

Companion to scipy/scipy#19255 and ERGO-Code#1460.

HaoZeke and others added 30 commits July 3, 2023 16:46
@HaoZeke
MAINT: Always require pybind11 and use subproject
466ad94
@HaoZeke @eli-schwartz
MAINT: Address review comments
fa9c65e 
Also drop hopefully unnecessary brew work for macos

Co-authored-by: Eli Schwartz <[email protected]>
@HaoZeke
BLD: Try wheels on windows
da41384
@HaoZeke
BLD: Repair wheels explicitly
d08b783
@HaoZeke
BLD: Try switching to vsenv for wheels [win]
1494c33
@HaoZeke
MAINT: Kill setup.py in favor of pyproject.toml
803de4f
@HaoZeke
BLD: Try building static libraries, no vsenv
9c88e61 
MAINT: Minor cleanup, don't try static bundling

Not supported: mesonbuild/meson-python#410
@HaoZeke
BLD: Try pre-installing native dependency
a3c8bd8
@HaoZeke
MAINT: Update gitig for meson
b1d5458
@HaoZeke
MAINT: Install more required deps for building
6df7d6e
@HaoZeke
MAINT: Stop static linking
b6e4d5b
@HaoZeke
BLD: Try fixing delvewheel invocation
64b6a76
@HaoZeke
BLD: Try installing libhighs first [win]
affd143
@HaoZeke
DOC: Minor cleanup, remove windows python api test
d59af2e
@HaoZeke
BLD: Reduce duplicate CI files
d766de3
@HaoZeke
MAINT: Futureproof the bindings
4a51ff5 
From cibuildwheel best practices
@jajhall
Update example-py.md
3d1ea90 
Added warning and made some corrections

This will close ERGO-Code#1346
@feldmeier
QUASS detached timer from runtime god object
ccb115d
@jajhall
Prevented printf as exposed by ERGO-Code#1344
bfe7f6c
@jajhall
Merge pull request ERGO-Code#1347 from ERGO-Code/fix-1344
9e51947 
Prevented printf as exposed by ERGO-Code#1344
@HaoZeke @eli-schwartz
MAINT: Cleanup buggy toptal meson gitignore
e459c3c 
Co-authored-by: eli-schwartz <[email protected]>
@HaoZeke @eli-schwartz
MAINT: Address meson-python review comments
3929c4b 
Co-authored-by: eli-schwartz <[email protected]>
@galabovaa
Merge pull request ERGO-Code#1343 from HaoZeke/mesonPybind11
265c881 
ENH: Meson pybind11 build
@jajhall
Fixed ERGO-Code#1345 as suggested; formatted
3aaef4c
@jajhall
Merge pull request ERGO-Code#1355 from ERGO-Code/fix-1354
6df8a39 
Fixed ERGO-Code#1345 as suggested; formatted
@jajhall
Added setSolution() to highspy
44b6466
@jajhall
Merge pull request ERGO-Code#1356 from ERGO-Code/fix-1340
aac58f3 
Fix 1340
@feldmeier
Update Filereader.cpp
68d77be
@jajhall
Merge pull request ERGO-Code#1358 from ERGO-Code/fix-1349
033c0c4 
Update Filereader.cpp
@jajhall
Absence of an INVERT when calling get(Primal)DualRay is only an error…
2f60ccc 
… when solving an LP
jajhall and others added 21 commits October 13, 2023 15:54
@jajhall
assessLpPrimalSolution now uses mip_feasibility_tolerance when proble…
dbd6e2c 
…m is MIP: fixes 1458
@jajhall
Merge pull request ERGO-Code#1459 from ERGO-Code/fix-1458
e1aaada 
assessLpPrimalSolution now uses mip_feasibility_tolerance when problem is MIP
@HaoZeke
BUG: Add back presolve to highspy
0c59a8d
@HaoZeke
MAINT: Format and export enum values
6b8b358
@HaoZeke
CI: Test python examples on the CI
88c038f
@HaoZeke
CI: Add a dep for running the examples
b294b7b
@HaoZeke
TST: Isolate buggy constraint removal [highspy]
a32318e
@HaoZeke
BUG: Fix constraint and var removal [highspy]
18edf05
@HaoZeke
MAINT: Add back the simplex_constants
9f3d7a3
@HaoZeke
ENH: Add highs_options
3612bac
@HaoZeke
MAINT: Rework call_highs_from_python for _highs
c211c2f
@HaoZeke
MAINT: Increase character size (21 is the max)
1814b09
@HaoZeke
MAINT: Add the cpp args
6c4e9f7
@HaoZeke
MAINT: Use c_args too
c5e3fc5
@HaoZeke @rgommers
MAINT: Bump meson version and fix pip installation
a42c598 
Co-authored-by: rgommers <[email protected]>
@HaoZeke
BLD: Bring in the atomic_dep from SciPy
94f53c5
@HaoZeke
MAINT: Rework to HIGHS_INT64 work with pybind11
39a892e
@HaoZeke
MAINT: Update for newer meson version
4a3bf39
@HaoZeke
CI: Rework to test the python_api
8728eb1
@HaoZeke
BLD: Be more 32-bit friendly
947b47a
@HaoZeke
BLD: Be more robust w.r.t git
704a264
@HaoZeke HaoZeke mentioned this pull request Oct 15, 2023
Merged
6 tasks
@HaoZeke
Copy link
Author

HaoZeke commented Oct 15, 2023

@rgommers, this needs to be merged before scipy/scipy#19255 can be completed. Somewhat related is #62.

@HaoZeke
Copy link
Author

HaoZeke commented Oct 21, 2023

@rgommers, bumping for visibility

@HaoZeke HaoZeke mentioned this pull request Oct 21, 2023
Closed
rgommers
rgommers approved these changes Oct 22, 2023
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.

Thanks Rohit. Apologies for the delay - LGTM, so in it goes.

@rgommers rgommers merged commit 6392707 into scipy:main Oct 22, 2023
@HaoZeke HaoZeke deleted the forSciPy branch October 22, 2023 19:19
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.