-
Notifications
You must be signed in to change notification settings - Fork 26
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
ExternalObjective
function to wrap external codes
#1028
Draft
ddudt
wants to merge
69
commits into
master
Choose a base branch
from
dd/external
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Draft
Changes from 44 commits
Commits
Show all changes
69 commits
Select commit
Hold shift + click to select a range
456a02b
initial commit
daniel-dudt 6a557ec
get external objective working
daniel-dudt fc9ef77
test comparison to generic
daniel-dudt 9a64f25
allow string kwargs in external fun
daniel-dudt ae84d5e
Merge branch 'master' into dd/external
ddudt 11c1438
exclude ExternalObjective from tests
daniel-dudt bedcee1
Merge branch 'master' into dd/external
ddudt aff7d46
make external fun take eq as its argument
daniel-dudt 7f3ff5b
Merge branch 'master' into dd/external
ddudt 2bb9017
simplify wrapped fun to take params
daniel-dudt 7b1cfaf
Merge branch 'master' into dd/external
ddudt debecad
numpifying to make vectorization work
daniel-dudt 633fa5b
Merge branch 'dd/external' of https://github.com/PlasmaControl/DESC i…
daniel-dudt 9ea37fb
Revert "numpifying to make vectorization work"
daniel-dudt 87ab19f
vectorization working!
daniel-dudt 5395611
allow vectorized to be an int
daniel-dudt 52d58d0
fix numpy cond
daniel-dudt 96bf929
Merge branch 'master' into dd/external
ddudt 30aeea4
merging but no change?
daniel-dudt 90296ea
update test with new UI
daniel-dudt d16e95d
remove unused pool code
daniel-dudt 6b3f86d
Merge branch 'master' into dd/external
ddudt f9b7562
remove comment note
daniel-dudt fe5e95c
Merge branch 'master' into dd/external
ddudt f1f466b
fix black formatting from merge conflict
daniel-dudt ecc5b3b
repair test from merge conflict
daniel-dudt 800b9bb
Merge branch 'master' into dd/external
ddudt bf62014
remove multiprocessing from ExternalObjective class
daniel-dudt 0547bd7
jaxify as a util function
daniel-dudt e3057dd
Merge branch 'master' into dd/external
ddudt 4323b8a
Merge branch 'master' into dd/external
ddudt 03d0cb5
ExternalObjective no longer an ABC
daniel-dudt 7723ecd
re-add print logic in backend
daniel-dudt 4864b56
Merge branch 'yge/cpu' into dd/external
ddudt ef9711b
Merge branch 'yge/cpu' into dd/external
ddudt 180c503
Merge branch 'yge/cpu' into dd/external
ddudt cea3f4a
Merge branch 'master' into dd/external
ddudt 09c02ec
Merge branch 'master' into dd/external
ddudt 0b2207f
exclude ExternalObjective from tests
daniel-dudt f6a395b
Merge branch 'master' into dd/external
ddudt aa570d4
scale FD derivatives by tangent norm
daniel-dudt d62d9ca
Merge branch 'dd/external' of https://github.com/PlasmaControl/DESC i…
daniel-dudt 8c7bcb1
Merge branch 'master' into dd/external
ddudt 7f1907b
Merge branch 'master' into dd/external
ddudt 76b2a3c
Merge branch 'master' into dd/external
dpanici ef98142
Merge branch 'master' into dd/external
ddudt 16bb59b
Merge branch 'master' into dd/external
ddudt a83a671
resolve merge conflict
daniel-dudt 8beb2e6
Merge branch 'master' into dd/external
ddudt 9e57ee1
Merge branch 'master' into dd/external
ddudt 11521b2
fix formatting from merge conflict
daniel-dudt c004724
add static_attrs, update test
daniel-dudt 37f9ee3
Merge branch 'master' into dd/external
ddudt aab0bdb
update with master
daniel-dudt 829af5a
Merge branch 'master' into dd/external
ddudt ba1a252
update depricated jax.pure_callback vmap arg
daniel-dudt bb8a535
update vmap_method
daniel-dudt 56d6662
Merge branch 'master' into dd/external
ddudt 655fe06
Merge branch 'master' into dd/external
YigitElma 44c25a2
Merge branch 'master' into dd/external
ddudt 795350d
remove duplicate line from merge conflict
daniel-dudt 6fef120
fix test with block_until_ready
daniel-dudt 021106d
Merge branch 'master' into dd/external
ddudt 0f35919
Merge branch 'master' into dd/external
ddudt 24dd2f3
update documentation
daniel-dudt d3aa2dd
Merge branch 'master' into dd/external
ddudt ac1aa63
make vectorized a required arg
daniel-dudt 4db5c9f
make ExternalObjective args keyword only
daniel-dudt 96aec58
Merge branch 'master' into dd/external
ddudt File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains 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
This file contains 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
This file contains 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
This file contains 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
This file contains 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
Oops, something went wrong.
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
can't this just be
eq.params_dict = params
?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
No, because when vectorized
params
is a dict of 2D arrays with each row the params for a different equilibrium