Skip to content

Comments

Evilspirit eigen over ryan buildsys#1159

Merged
phkahler merged 11 commits intosolvespace:masterfrom
rpavlik:evilspirit-eigen-over-ryan-buildsys
Dec 31, 2021
Merged

Evilspirit eigen over ryan buildsys#1159
phkahler merged 11 commits intosolvespace:masterfrom
rpavlik:evilspirit-eigen-over-ryan-buildsys

Conversation

@rpavlik
Copy link
Contributor

@rpavlik rpavlik commented Dec 23, 2021

This is the Eigen-related stuff from #721, but put over my Eigen work excluding my work in the system.cpp file (so most but not all of #432 ). Builds on #1158 and #1155

I also split out the "too many unknowns" removal and put it at the end, in case we want to keep a now-artificial limit.

No new leaks.

@rpavlik
Copy link
Contributor Author

rpavlik commented Dec 23, 2021

Hmm, something in there is making things slower, not sure what. No time to test today, already spent too much time on this :) I did manage to get a speed bump with #1160 (test suite from 5.0s to 4.9s) but still getting slower on my test model, not sure why.

@phkahler
Copy link
Member

You've included the commits from #1158 in this. Can you remove those?

And thank you for doing all this!

@rpavlik
Copy link
Contributor Author

rpavlik commented Dec 24, 2021

Sure, guess I can split out a few of mine from here. The idea was that the build system in the original pr wasn't great, and all but one of my eigen changes were little "peephole" optimizations based on hotspots i saw when profiling 4 years ago 😅 we'll see when I get a chance, I did way more Solvespace work the past few days than I was supposed to

@rpavlik rpavlik force-pushed the evilspirit-eigen-over-ryan-buildsys branch from 0c666b8 to c134c78 Compare December 27, 2021 03:22
@rpavlik
Copy link
Contributor Author

rpavlik commented Dec 27, 2021

Oh, ok, so I got the PR's mixed up in my head. The changes in here are necessarily dependent on at least a few commits from #1158. I did drop most of my (minimal) changes from #432 because I thought that's what you had asked for 🤦 . I also dropped the "remove too-many-constraints" commit for now. In any case, this is now rebased, builds on #1158 and by extension #1155 . Rebasing now in a different branch to drop as much of #1158 as possible.

@rpavlik
Copy link
Contributor Author

rpavlik commented Dec 27, 2021

OK, the version of this with as little of #1158 as possible, is here: master...rpavlik:evilspirit-eigen-over-ryan-buildsys-fewer-solver-changes I could drop the first three commits of #1158 but the rest were built upon by this code.

@rpavlik rpavlik force-pushed the evilspirit-eigen-over-ryan-buildsys branch 2 times, most recently from 2a7fab2 to 6d85a62 Compare December 27, 2021 03:46
@phkahler
Copy link
Member

@rpavlik Looks like the first 9 commits here conflict since they were merged in the previous PR. What's the best way to handle that?

@rpavlik
Copy link
Contributor Author

rpavlik commented Dec 30, 2021

Weird, must be squash merging or something. I'll just rebase this if you don't beat me to it.

@rpavlik rpavlik force-pushed the evilspirit-eigen-over-ryan-buildsys branch from 6d85a62 to e87d341 Compare December 31, 2021 16:48
@rpavlik
Copy link
Contributor Author

rpavlik commented Dec 31, 2021

OK, rebased!

@phkahler
Copy link
Member

@rpavlik Lets see how this goes ;-)

@phkahler phkahler merged commit 18dc8ee into solvespace:master Dec 31, 2021
@phkahler
Copy link
Member

@rpavlik question, in testing I ran into "Too many unknowns". The define is still set at 1024, but I thought the code was modified to not have an actual limit. Should we remove some checks, or increase the value?

BTW I made a long chain (snake) of connected rectangles much like evil_spirit showed in a video. This runs dramatically smoother when dragging it around. ;-)

@phkahler
Copy link
Member

Closes #225

@vespakoen
Copy link
Contributor

This is an awesome way to start the year!! Happy new year everybody! Thanks @Evil-Spirit and @rpavlik for making this happen!!

@rpavlik
Copy link
Contributor Author

rpavlik commented Jan 1, 2022

Awesome, thanks! The limit is now artificial, but left in to avoid getting to a point of being unresponsive. We can increase the define for Max unknowns as we see fit. Probably double it if we're a lot smoother now. (I do still have a commit here that I'll put in a draft pr maybe that totally removes that error, but it does seem reasonable to have a limit to avoid painting ourselves into a corner)

@rpavlik rpavlik deleted the evilspirit-eigen-over-ryan-buildsys branch January 1, 2022 20:05
@ruevs
Copy link
Member

ruevs commented Jan 4, 2022

After the fact I code-reviewed this fairly carefully and it is fine! Thank you very much for cleaning in up, making the integration clean and rebasing it @rpavlik and thank you very much @Evil-Spirit for writing it in the first place back in 2017 :-)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants