Cython review response #19
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
3dc432a10 Merge remote-tracking branch 'upstream/master' 69739a8a5 Remove unneeded files 46640196d More unneeded files dc701d7d8 Remove uneeded files dd7c8b480 Merge pull request scipy#371 from ERGO-Code/no-delete-JAJH c008b7760 Refined timing reporting 85db78f6d Added some missing timer.recordFinish(rule) calls 0c9699aa0 deleted dev print d17510e0a hw solving e07521ea8 ctest passing 3eeac3c46 Merge pull request scipy#370 from ERGO-Code/matrix-copy 260643015 small ctest passing dd6ef0551 formatting aaf1aacf2 formatting 9f4b9fe82 previous c6d26cfd6 back to list ded0248f1 Merge branch 'master' into matrix-copy 7c9639bfa ctest passing but presolve reduction counts changed adfbbb02c Merge pull request scipy#369 from ERGO-Code/openmp-version-cmake 94da4a2ac valgrind etamacro 837c5de2c presolve singleton lists changed into hash maps 04db154ce Merge branch 'master' into matrix-copy 01fa72dd1 Merge branch 'master' into matrix-copy cf38c6074 newline of 184c2ff59 reverted typo in comment 086b075aa target_link_libraries addd1f281 linking after defining lib cmake 6bb52c385 Merge pull request scipy#368 from ERGO-Code/dev-option 1c66fc894 setting OPENMP value ba25299b8 cmake openmp version required: more modern cmake 75215f320 openmp only using if available eebb4a7df update with master 53b4ace91 Merge branch 'master' into dev-option 6fed11c1f Merge pull request scipy#366 from ERGO-Code/dev-presolve 2c7e5b05e matrix-copy 3c0b5ee21 CMakeLists commented out scaffold subdir add 4b0ebee53 scaffold out b7e7a23cc adding dev-presolve to scaffold GA a53ff1b70 Merge pull request scipy#367 from ERGO-Code/CHUZC3 a9ed1c640 CHUZC sort strategy now controlled by option dual_chuzc_sort_strategy fb1ef5de2 Adding CHUZC3 option 228f8d0a3 Tidied up HDualRow and reformatted 8b22df683 Moved debug code from HDualRow to HSimplexDebug d08a669ee Moving the debug code from HDualRow 5d0eeebe0 experiments linux 5eacc5071 About to allow heap or quad 68432bdd4 Created metods for chooseFinalWorkGroupQuad() and chooseFinalLargeAlpha e9e827252 After cleaning up printing and commenting out checking 7ea716b16 Before cleaning up after identifying why groups have different sizes with quad and heap 3ad48e421 formatting 4f899821d scaffold out 87bb623a9 dev option and other working as expected 177b910de About to add array for checking group equivalence b733f091b boost po exception commented out 40f3352a5 Heap identification of breakpoint groups may be correct 92caf3e4c option dev added 962ca1891 Recognised that groups have to be filled using inner loop, but too tired to debug 0c82c9f9b Same workData and workGroup for adlittle with both methods 63f16f637 Found workGroup discrepancy 68a3e2a1c About to rename some new identifiers d6497317b Memory proboem: ask Ivet 66516d76d About to create chooseWorkGroupHeap e6928afac formatting 0fb9da3ad presolve time_limit works 46c3790f8 Fixed bug in permuteSimplexLp when LP is not scaled 538f2efcf debugDualChuzcFail now analyses and reports on dual CHUZC failure 88d8eb356 formatting 414998743 timeout returning 03e07cdeb Added timing and reporting to identify inefficiency in CHUZC3 d30f93867 Added analyse_lp = true with HiGHSDEV=on f992d54ee removed function: do in separate CL since this one has grown 034fa18af added chrono 56c75804d unit test fixed 9ad6fa14f clean up 430b45331 scaffold out 338af92c9 options tests pass 453eb30f6 mps parser timeout works: 1e2ef6728 parser stopping on timeout but simplex running anyway 2d6e70f71 ctest passing, now add timeout and iteration tests to dev-presolve 257b62632 CL growing, added timeout to parser, linking dev with call backs 8153e9489 Switched on full reporting when HiGHSDEV=on, and eliminates time reporting when no calls have been made 1365960c2 time limit added, not tested yet 6e69c6635 link the modern cmake way 118c46ef4 enabled openmp in windows tests git-subtree-dir: scipy/optimize/_highs git-subtree-split: 3dc432a101317539796cd5391546e91261714c7b
a600b38e4 Add note about cmake files; change single ticks to double back ticks in cython docstring; change byte-strings to python strings; remove uneeded commented-out code; clarify some comments git-subtree-dir: scipy/optimize/_highs git-subtree-split: a600b38e4f1bb44a660b207465f31f11925a510e
|
Can you undo the upstream updates so we can merge the responses to @rgommers comments? |
|
I can sure try, I've never tried to remove commits before. Apologies, I thought since we were bumped to 1.6 that we'd have a little bit of time |
|
Well, we do... but it might help keep reviewer attention. |
982a0dc4a Revert back to earlier upstream commit git-subtree-dir: scipy/optimize/_highs git-subtree-split: 982a0dc4af41cb727952b8c418dc4ec0b801d727
|
Reverted, removed unit test skips, should be ready to merge |
|
Should I wait for CI? |
|
Yeah, let's wait to make sure. I'd hate to fail for something stupid while everyone's looking ;) |
|
Looks good to go |
mdhaber
pushed a commit
that referenced
this pull request
Jul 30, 2020
fbdda9438 Merge pull request #19 from ERGO-Code/master 5261899ac Merge pull request scipy#313 from ERGO-Code/removeTicks e29faad48 Formatted b122583a5 Now with useful_analysis = false; in HSimplex.cpp ee4e9696e Now with the redundant <intrin.h> and <x86intrin.h> deleted, too! :D 9aab2e2f9 Removed printf(load_mpsLine: fgets_rt = %s, fgets_rt); - Line 414 of HMPSIO.cpp 261d77dd3 Formatted 83e31bbf9 Removed specialist code from when RunHighsClock was the only clock to make timing calls f950ebe81 Eliminated getTime from HighsTimer.h de03621c8 Replaced HighsTimer.h with jajhall/Timer/HighsTimer.h dfad70adb Remove unneed directories and files git-subtree-dir: scipy/optimize/_highs git-subtree-split: fbdda94386ec2f46abd15e3df56f4754c69108a6
mdhaber
pushed a commit
that referenced
this pull request
Jul 17, 2021
Reorganize SVDS test suite and fix some `solver='svds'` behaviore
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Reference issue
scipy#12043
What does this implement/fix?
encode()to byte-stringsAdditional information
Breaks 3 unit tests related to upgrades in presolve. Currently I am skipping those tests to make everything else works while we wait for upstream fixes:
Probably not ready for merge until unit tests pass again. EDIT: rollback resolves unit test failures
Upstream issue: ERGO-Code/HiGHS#372