-
Notifications
You must be signed in to change notification settings - Fork 271
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
OCPCalculator output_only option #922
Merged
+42
−1
Merged
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
5e3ee75
add optional field to calculator to output only requested
misko f724a36
Merge branch 'main' into add_calculator_only_output_field
lbluque 4c7c8dd
Merge branch 'main' into add_calculator_only_output_field
lbluque 15c946b
Merge branch 'main' into add_calculator_only_output_field
lbluque 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
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -80,6 +80,7 @@ def __init__( | |
max_neighbors: int = 50, | ||
cpu: bool = True, | ||
seed: int | None = None, | ||
only_output: list[str] | None = None, | ||
) -> None: | ||
""" | ||
OCP-ASE Calculator | ||
|
@@ -170,6 +171,20 @@ def __init__( | |
self.config["checkpoint"] = checkpoint_path | ||
del config["dataset"]["src"] | ||
|
||
# some models that are published have configs that include tasks | ||
# which are not output by the model | ||
if only_output is not None: | ||
assert isinstance( | ||
lbluque marked this conversation as resolved.
Show resolved
Hide resolved
|
||
only_output, list | ||
), "only output must be a list of targets to output" | ||
for key in only_output: | ||
assert ( | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. same as above |
||
key in config["outputs"] | ||
), f"{key} listed in only_outputs is not present in current model outputs {config['outputs'].keys()}" | ||
remove_outputs = set(config["outputs"].keys()) - set(only_output) | ||
for key in remove_outputs: | ||
config["outputs"].pop(key) | ||
|
||
self.trainer = registry.get_trainer_class(config["trainer"])( | ||
task=config.get("task", {}), | ||
model=config["model"], | ||
|
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,7 @@ | ||
# serializer version: 1 | ||
# name: test_energy_with_is2re_model | ||
1.09 | ||
# --- | ||
# name: test_relaxation_final_energy | ||
0.92 | ||
# --- |
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
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.
nit, better to have
only_output
as a tuple, since its not meant to be changed at all in the code