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

ENH: Add support for different scipy.fft backends #1

Closed
wants to merge 1 commit into from

Conversation

peterbell10
Copy link
Owner

No description provided.

peterbell10 pushed a commit that referenced this pull request Jul 1, 2019
peterbell10 pushed a commit that referenced this pull request Jul 18, 2019
peterbell10 pushed a commit that referenced this pull request Jul 30, 2019
@peterbell10 peterbell10 closed this Aug 7, 2019
peterbell10 pushed a commit that referenced this pull request Aug 25, 2019
peterbell10 pushed a commit that referenced this pull request May 26, 2020
46edda35a Merge pull request scipy#25 from mckib2/upstream-2020-04-27
ff4d855a5 Update highs APIs for upstream changes
79e9ff321 Remove old uneeded pyx files
c056ca6eb Merge remote-tracking branch 'upstream/master' into upstream-2020-04-27
c348884d2 Merge pull request scipy#331 from ERGO-Code/SwitchHIGHS_CONST_INF
c6b988acc Replaced all == +/- HIGHS_CONST_INF with appropriate inequality
ba37f3565 Solves all 99 LPs identically
1e2225324 Removed test of EMS file reader until scipy#320 is fixed
167bcdbdb Changed HIGHS_CONST_I_INF and HIGHS_CONST_INF, and modified createFreelist
5b129e1fe Merge pull request scipy#330 from ERGO-Code/ExternalDriver
c7b4d47c4 Merge branch 'master' into ExternalDriver
897c3f112 Merge pull request scipy#329 from ERGO-Code/FixWindowDebugBuild
459c09ccf Removed call to issue295(highs) from TestSpecialLps.cpp
3ec3bf54d Merge pull request scipy#328 from ERGO-Code/dev-presolve
291fde056 old build removed
54e8e5eae Formatted
06497fb15 Made all changes suggested by MF
177f208a1 Made some small modifications in response to MF's comments on scipy#322
5dfb17e69 Made some small modifications in response to MF's comments on scipy#322
ae0b869d8 Stripped all the unnecessary stuff that shouldn't be in RunHighs.cpp and forced HiGHS to run quietly
2451fdbbf scaffold targets dev-presolve and scaffold work
60f912f0c moved scaffold files back to their repo@
66fc4436c targets dev-presolve and scaffold building and running
fac1af261 ctest fixed by making the new unit_test its own project
368b0c8b6 scaffold exe and scaffold unit tests exe building
d44115db7 Merge branch 'master' into PhaseOne
19f0bdfb9 scaffold exe running
704f3e14d Dual infeasiblity - primal unboundedness - detected rather better in phase 1
59566a826 extra unit tests disabled from HiGHS root CMakeLists file@
f1356bd09 First CL: unit_test target cmake build error@
46ed24f54 scaffold first CL
64b14b723 Formatted
79b008337 Still faffing with names in HSimplexDebug to keep it readable and consistent
8f94455b6 More debugging code - new for primals and more for duals
97d4ff8d7 Tracing flips in correctDual
237d311e0 Switch destination of results for computeSimplexPrimal/DualInfeasible OK!
86628e549 About to switch destination of results for computeSimplexPrimal/DualInfeasible
e3ee537f6 About to get computeSimplexPrimal/DualInfeasible to write to simplex_info and then copy
6c6010a3b Written computeSimplexLpDualInfeasible
b5c857b05 About to create computeLpPrimalInfeasible and computeLpDualInfeasible
2e7f7f15d About to introduce simplex_info_.run_quiet to rationalise the use of computePrimal/DualInfeasible just for logging
94ecd2c6f Removed simplex_info.allow_primal_flips_for_dual_feasibility since it's always true, and analyse_dual_infeasibilities_with_and_without_flips
22ad057a4 Added debugging of nonbasicMove in HSimplexDebug and removed some redundant code
e32006edb Now storing updated objective value corrections so that the true value is still stored, but the value corrected WRT the previous error is tested
d80387dae Debugged HSimplexDebug and increased tolerance on reporting small errors
bf35f5d21 Added HSimplexDebug.cpp/h
614f13754 Updated dual and primal objective values appear to be correct
c6899fda9 trying to get to the bottom of errors in updated dual objective, and where to shifts occur?
987fba1ad Replaced calls to checkUpdatedObjectiveValue with calls to debugUpdatedObjectiveValue and improved the numerics of updating the objective in HDualRow::updateDual
db46bc3ea About to replace calls to checkUpdatedObjectiveValue with calls to debugUpdatedObjectiveValue
3916b6fe0 Formatted
1f0f66a10 About to use checkUpdatedObjectiveValue - cheap and non-trivial - as first instances of the highs_debug option
03926b1d4 Formatted
c70371fa4 Set up near-unbounded LP in TestSpecialLps.cpp
d6a3eacc0 formatted
6d48e7e9d Apparently fixed updated dual objective errors
7bd52aea8 Restored choice of simplex solvers according to primal/dual feasibility
e6511bbfa Added getHighsInfinity to Highs class and C API
d07d57252 Introduced simplex_info.allow_cost_perturbation so that cost shifts for feasibility at the start of phase 2 are possible
844767150 Now correctly resetting updated_dual_objective_value after recalculation of dual objective in cleanup
c566fe4f2 Now looking at why hsol and HiGHS are different on adlittle_max: added comments at the end of phase 1 and added mpsMax in TestSpecialLps
67b891731 Add mpswriter; clean up setup.py
2c6e85cef Add all static library dependencies to cython wrappers
84a4b0791 conflic resolution
91be196aa Investigate primal/dual_status
d26336f5e Added clearModel to the C API
576fae1d5 formatted
9bec48eb9 Added clearModel to Highs class and fixed bug I introduced into free format MPS reader
1e178d456 Added reporting of Primal/Dual status and HiGHS run time to RunHiGHS.cpp
0a5b1e6b6 Added reporting of primal/dual status to reportModelStatusSolutionBasis and confirmed that previous fix clears 324
c9f7b5c75 Merge pull request scipy#325 from ERGO-Code/clang-compile-check
be0ad5698 Mods to eliminate compiiler warnings
14c6f068b Merge branch 'CAPI_highs_getHighsRunTime' into RunIPXsilently
c52ded0a1 IPX uses options_.output and options_.message_level to set parameters.display and parameters.debug
dc87b1c06 clang test for debug compile added
5b9acbde4 Added Highs_getHighsRunTime to the C API
eac465e4f Fixed the objective value after IPX solves a maximization
e8eb56f60 Fixed bug when integerColumn isn't assigned, and ignored warning from cleanBounds
0e2dec092 Made the basis valid in unconstrained LP solver!
b7fc50c24 Merge branch 'master' into TestSimplex
e85a91c1d Created TestSpecialLps.cpp
ef4a23d19 Added ../check/instances/e226.mps sice it has an objective shift and is used for the dual-objective-upper-bound unit test
0d30258c8 Formatted
e565e8e17 Got bailout to work, but realise time/iteration bailout needs to be separated from objective bailout
7a038a290 Now interpreting negation of RHS entry for N-row as objective offset
555df8e62 Cleared bug in hsol for unbounded LP
43004eea9 Formatted
504e948c3 Now confirming dual objective value upper bound bailout using exact dual objective function value
bce567a93 Now reporting the dual phase 2 objective with correct sign when maximizing
4cfea860f Now applying the objective value shift correctly in HSimplex
7ce67bd88 Added resetHighsOptions to C API
55105ae10 Merge branch 'NewIterationCounts' into TestSimplex
c55d6268a Fixed very embarassing bug following postsolve, and ensured that postsolve works OK when LP is reduced to empty
5c3609b7b Added solution/basis consistency testing in beforeReturnFromRun
7571a1dbf Removed iteration counts from HighsSolutionParams
3c413e365 Propagated use of HMO.iteration_counts_
8713863ee Fixed HiGHSDEV=off bug
b095372e8 Added HighsInterationCounts to HighsLp.h
58fba5d45 Formatted
99458df44 Merge branch 'TestSimplex' of https://github.com/ERGO-Code/HiGHS into TestSimplex
1731d18e7 Bypassed SIMPLEX_STRATEGY_DUAL_TASKS and SIMPLEX_STRATEGY_DUAL_MULTI in testSolvers when OpenMP not available
32cd5a77f openmp macro in HApp.h
4090d84ae Valgrind runs clear on unit tests now that updated objective vlaue testing is done when appropriate
5ff9108de Formatted
ce57c2e73 Switched off the timeout test to see whether this why the build-windows / windows_debug test times out
e07c3a843 Added resetHighsOptions() to the Highs class and restored all tests to TestLpSolvers
02b522cae Now using the same Highs instance to solve etamacro OK after solving adlittle
0be4a79bf Now using the same Highs instance to solve etamacro OK after solving adlittle
6917413dd Merge branch 'master' into TestSimplex
a8e4984d6 Merge branch 'master' into TestSimplex
b66a61c62 Removed printf(load_mpsLine: fgets_rt = %s, fgets_rt); - Line 414 of HMPSIO.cpp
68416f2ae Merged removeTicks into this branch
ef60a30ef Formatted, and check/instances/simple_lp.lp deleted
21c6bf5e9 Corrected bug in lp file writer, and added equalButForNames to HighsLp.h to compare HighsLp from .lp and .mps/.ems files
649c73cd9 .lp writer error spotted
40cfe67f8 Fixed problem in HMPSIO.cpp preventing Max build
d1dc9c1f8 Removed warning with CMAKE_BUILD_TYPE=debug
227dceabb Added garbage model file instances
ab70378ec Using std::string consistently for filename and message. Deleted HToy*
585001b12 Formatted
249e8206f Eliminated lp.numInt_
5cb4bed8c Eliminated lp.nnz_!
e6cf8530b Formatted
0efd81b5d Eliminated io/LoadProblem.*
efec51e95 About to remove loadProblem from TestFilereader.cpp
12f1391f0 RunHiGHS.cpp now uses highs.readModel - LP and MIP tested
5f61b80b0 About to delete LoadProblem.cpp
0482a9597 About to remove LoadProblem.cpp
7e1beb310 Added clearSolution(), clearBasis() and clearInfo() to Highs
3c941c295 Renamed TestSimplex.cpp TestLpSolvers.cpp
40e49a739 Merge branch 'master' into TestSimplex
87d67a447 Corrected bug HiGHSDEV=on bug
6da93ebdf TestSimplex now runs all simplex strategies and IPX: time to rename it TestLpSolver!
24ab779ae Formatted
80213ff20 Vanilla solve, timeout and iteration limit tests for DUAL and IPX done
b07b4af3e Now delete HMO for reduced LP and fixed bug in HightTimer
be7511c64 Changed runLpSolver argument to index of HMO, not the HMO
ae6bb5759 Moved guts of runLpSolver to solveLp in HighsSolve: About to change runLpSolver argument to index of HMO, not the HMO
e843d557e Now using better timeout test, but exposed internal simplex iteration count as being relative not absolute
fef353ee6 Merge branch 'master' into TestSimplex
c2023e628 Added setBasis() to set up logical basis and Highs_setBasis and Highs_setLogicalBasis for the C API
21ab880c1 Created TestSimplex unit test
cc203801b Merge branch 'master' of github.com:ERGO-Code/HiGHS
4f403adc3 merge updates ergo
cfb4743be Merge pull request #1 from galabovaa/build-workflow
d9d9f14a5 Update build.yml
08605edd4 added algorithm header
5476283ba build on github

git-subtree-dir: scipy/optimize/_highs
git-subtree-split: 46edda35a639f142caec004dfe7a5584addfea83
peterbell10 pushed a commit that referenced this pull request Feb 1, 2021
peterbell10 pushed a commit that referenced this pull request May 13, 2022
* 🏗️ [ENH] - Update Dockerfile - split into Meson and dev

* ENH - Split Dockerbuilds

* DEV: Add pip to avoid warning

* ENH: Add docs to Dockerfile

* DEV: Improve Docker build

* DEV: Quick fix for env setup

* DEV: Testing - will revert

* DEV: Only use docutils

* DEV: Revert test

* DEV: Docutils install - will remove later
WarrenWeckesser pushed a commit that referenced this pull request Jul 22, 2022
MAINT: stats._contains_nan: only detect numeric np.nan, not string 'nan'
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant