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

Matgl upgrade to 1.1.3 + CHGNet Integration #273

Merged
merged 5 commits into from
Aug 15, 2024

Conversation

melo-gonzo
Copy link
Collaborator

This PR takes over dependabot PR #269 and also includes the addition of CHGNet from matgl which was introduced in matgl-v1.1.0. The PR also includes updates to TensorNet forward pass which still must be copied in manually.

@melo-gonzo melo-gonzo requested a review from laserkelvin August 15, 2024 19:28
Copy link
Collaborator

@laserkelvin laserkelvin left a comment

Choose a reason for hiding this comment

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

For the most part it looks good to me, but I wasn't 100% sure what you were referring to RE: the TensorNet forward copying changes?

@@ -0,0 +1,22 @@
encoder_class:
class_path: matsciml.models.M3GNet
Copy link
Collaborator

Choose a reason for hiding this comment

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

Is this correct?

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

fixed this d436989

Returns:
torch.Tensor: Model output.
"""
# g.edata["pbc_offshift"] = g.edata["offsets"]
Copy link
Collaborator

Choose a reason for hiding this comment

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

Did you want to leave these in?

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

purged em 991edef

@laserkelvin laserkelvin added the models Issues related to existing or new model implementations label Aug 15, 2024
@melo-gonzo
Copy link
Collaborator Author

For the most part it looks good to me, but I wasn't 100% sure what you were referring to RE: the TensorNet forward copying changes?

Just that we have to copy-paste in the forward method for TensorNet (and CHGNet) since they dont offer the same interface as the M3GNet model where we can return the embeddings only with return_all_layer_output=True.

@laserkelvin
Copy link
Collaborator

Please go ahead and merge!

@melo-gonzo melo-gonzo merged commit 46bb7db into IntelLabs:main Aug 15, 2024
2 of 3 checks passed
@melo-gonzo melo-gonzo deleted the matgl-upgrade branch August 15, 2024 23:45
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
models Issues related to existing or new model implementations
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants