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

Lineax Control Terms #436

Merged
merged 10 commits into from
Jun 29, 2024
Merged

Lineax Control Terms #436

merged 10 commits into from
Jun 29, 2024

Conversation

lockwo
Copy link
Contributor

@lockwo lockwo commented Jun 7, 2024 •
edited
Loading

Addresses #370

@lockwo
Copy link
Contributor Author

lockwo commented Jun 7, 2024

New PR for #434. Will take into account #370 (comment) then mark as ready for review

@lockwo lockwo marked this pull request as ready for review June 8, 2024 22:43
@lockwo
Copy link
Contributor Author

lockwo commented Jun 8, 2024

Supports lineax control term. Removes weakly diagonal from docs.

patrick-kidger
patrick-kidger reviewed Jun 9, 2024
View reviewed changes
diffrax/_misc.py Outdated Show resolved Hide resolved
diffrax/_misc.py Outdated Show resolved Hide resolved
diffrax/_term.py Outdated Show resolved Hide resolved
diffrax/_term.py Outdated Show resolved Hide resolved
docs/usage/extending.md Outdated Show resolved Hide resolved
test/test_adjoint.py Outdated Show resolved Hide resolved
@lockwo
Copy link
Contributor Author

lockwo commented Jun 11, 2024

Tests are failing because tests are failing on main: #441

@lockwo lockwo changed the title lineax draft Lineax Control Terms Jun 17, 2024
@lockwo
Copy link
Contributor Author

lockwo commented Jun 17, 2024 •
edited
Loading

The rebase makes the tests pass @patrick-kidger

@lockwo lockwo requested a review from patrick-kidger June 17, 2024 23:34
@patrick-kidger patrick-kidger mentioned this pull request Jun 24, 2024
Merged
@patrick-kidger patrick-kidger changed the base branch from main to dev June 24, 2024 21:42
@patrick-kidger
Copy link
Owner

Great stuff! This PR looks ready to go to me. If you can rebase on top of the latest dev then I'd love to merge this.

@lockwo
Copy link
Contributor Author

lockwo commented Jun 25, 2024

Great stuff! This PR looks ready to go to me. If you can rebase on top of the latest dev then I'd love to merge this.

Rebased!

@patrick-kidger
Copy link
Owner

Hmm, GitHub doesn't seem to believe so?
"This branch cannot be rebased due to conflicts."

Screenshot 2024-06-26 at 22 37 00

@lockwo
Copy link
Contributor Author

lockwo commented Jun 26, 2024

Ok, seems like my git locally somehow got messed up with the remote tracking. Let me know if this fixes it

@patrick-kidger patrick-kidger merged commit e40e59c into patrick-kidger:dev Jun 29, 2024
2 checks passed
@patrick-kidger
Copy link
Owner

And merged! Thank you for all your hard work getting this in :D I'm really glad to be able to take advantage of Lineax like this now :)

patrick-kidger pushed a commit that referenced this pull request Jul 1, 2024
@lockwo @patrick-kidger
Lineax Control Terms (#436)
c27f6c7 
* lineax draft

* remove from docs

* add tests everywhere weakly is

* review feedback

* move test out of misc now

* extra weak removal

* add deprecate

* simplify tree map

* remove warning test

* warning fix
@lockwo lockwo deleted the Owen/lineax-v2 branch August 27, 2024 18:16
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@tttc3 tttc3 tttc3 left review comments

@patrick-kidger patrick-kidger Awaiting requested review from patrick-kidger

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@lockwo @patrick-kidger @tttc3