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

Change internal fixed-point API to (x, info) = f(x, info) to simplify SCF metadata tracking #811

Merged
merged 31 commits into from
Aug 5, 2024

Conversation

epolack
Copy link
Collaborator

@epolack epolack commented Jan 12, 2023

PR from @niklasschmitz. Will fix the tests when CI completes.

@mfherbst
Copy link
Member

Since there are conflicts against master the CI will not run. @epolack @niklasschmitz You must first resolve the conflicts and/or rebase.

@epolack
Copy link
Collaborator Author

epolack commented Jan 13, 2023

@mfherbst, thanks.
Although I do not understand how Github did the PR. The branch is directly on DFTK.jl, so I cannot modify it. Should I close it and open a new one?

@mfherbst
Copy link
Member

Should I close it and open a new one?

If you want to continue the development I'd say that's the simplest.

You can already get an idea what's the issue right now from https://git.uni-paderborn.de/herbstm/DFTK.jl/-/jobs/123457 by the way.

@epolack epolack closed this Jan 18, 2023
@niklasschmitz
Copy link
Collaborator

Reopening now after pulling, let's see what the CI says

@niklasschmitz niklasschmitz reopened this Feb 15, 2023
@niklasschmitz niklasschmitz changed the title Modification of fixed-point API Change internal fixed-point API to (x, info) = f(x, info) to simplify SCF metadata tracking Feb 15, 2023
@niklasschmitz niklasschmitz marked this pull request as ready for review February 16, 2023 14:38
Copy link
Member

@mfherbst mfherbst left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Very nice. Has the potential for quite some simplifications (e.g. unifying SCF routines in density and potential).

src/scf/scf_solvers.jl Outdated Show resolved Hide resolved
src/scf/self_consistent_field.jl Outdated Show resolved Hide resolved
src/scf/scf_solvers.jl Outdated Show resolved Hide resolved
src/scf/scf_solvers.jl Outdated Show resolved Hide resolved
Copy link
Member

@mfherbst mfherbst left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Main blocker for me is the thing with the MPI tests. Might be due to the removed broadcast.

src/scf/scf_solvers.jl Outdated Show resolved Hide resolved
src/scf/self_consistent_field.jl Show resolved Hide resolved
src/scf/self_consistent_field.jl Outdated Show resolved Hide resolved
src/scf/self_consistent_field.jl Outdated Show resolved Hide resolved
@mfherbst mfherbst added the breaking Breaks public API and requires major version bump label Jul 31, 2024
Copy link
Member

@mfherbst mfherbst left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nits on the docs.

examples/custom_solvers.jl Outdated Show resolved Hide resolved
docs/src/guide/self_consistent_field.jl Outdated Show resolved Hide resolved
src/scf/scf_solvers.jl Outdated Show resolved Hide resolved
examples/custom_solvers.jl Outdated Show resolved Hide resolved
src/scf/self_consistent_field.jl Outdated Show resolved Hide resolved
examples/custom_solvers.jl Outdated Show resolved Hide resolved
@mfherbst mfherbst merged commit 4f3c4bb into master Aug 5, 2024
5 of 7 checks passed
@niklasschmitz niklasschmitz deleted the fp-solvers-functional-api branch October 23, 2024 09:04
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
breaking Breaks public API and requires major version bump
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants