search

Mikolaj / horde-ad

Higher Order Reverse Derivatives Efficiently - Automatic Differentiation library based on the paper "Provably correct, asymptotically efficient, higher-order reverse-mode automatic differentiation"
BSD 3-Clause "New" or "Revised" License
34 stars 6 forks source link

Merge simplify #32

Closed tomjaguarpaw closed 2 years ago

tomjaguarpaw commented 2 years ago

This is mikolaj/simplify rebased on master. If you like it then please merge.

Mikolaj commented 2 years ago

Thank you. Just to double-check: there were no conflicts, right? If so, once CI passes I will merge, so you can safely work on top of this PR.

tomjaguarpaw commented 2 years ago

Correct, no conflicts.

Mikolaj commented 2 years ago

Oh dear, when I click the "command line instruction" link at the bottom, it seems that github wants to merge this into masterinstead of into mikolaj/simplify.

tomjaguarpaw commented 2 years ago

Oh, I thought that's why you wanted it rebased.

Well, feel free to close this pull request and instead use tomjaguarpaw/merge-simplify in away way you choose to change mikolajsimplify to your liking.

tomjaguarpaw commented 2 years ago

(I'm quite happy porting changes anywhere I make them to anywhere else, so don't worry about inconveniencing me.)

Mikolaj commented 2 years ago

(I'm quite happy porting changes anywhere I make them to anywhere else, so don't worry about inconveniencing me.)

OK, sure. I just wanted to prevent you having to cherry-pick your commits, but there should be no conflicts, so that's indeed no big problem. I've done

git rebase master; git push -f

I'm closing the PR.