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

extracting attributes for grover model from batch graph #3312

Merged
merged 9 commits into from
Mar 31, 2023

Conversation

arunppsg
Copy link
Contributor

Description

Related to #3296

This pull request proposes a new approach to extract required attributes for a grover model from a batched molecular graph.

Type of change

Please check the option that is related to your PR.

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Breaking change (fix or feature that would cause existing functionality to not work as expected)
    • In this case, we recommend to discuss your modification on GitHub issues before creating the PR
  • Documentations (modification for documents)

Checklist

  • My code follows the style guidelines of this project
    • Run yapf -i <modified file> and check no errors (yapf version must be 0.32.0)
    • Run mypy -p deepchem and check no errors
    • Run flake8 <modified file> --count and check no errors
    • Run python -m doctest <modified file> and check no errors
  • I have performed a self-review of my own code
  • I have commented my code, particularly in hard-to-understand areas
  • I have made corresponding changes to the documentation
  • I have added tests that prove my fix is effective or that my feature works
  • New unit tests pass locally with my changes
  • I have checked my code and corrected any misspellings

Copy link
Member

@rbharath rbharath left a comment

Choose a reason for hiding this comment

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

Design in general looks good here. Some minor comments and questions below that should be straightforward to address

@@ -336,6 +336,7 @@ def __init__(self, graph_list: Sequence[GraphData]):
])

# graph_index indicates which nodes belong to which graph
# TODO should we rename this as node_index?
Copy link
Member

Choose a reason for hiding this comment

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

Can you remove TODO before merge?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I have removed TODO but a question I have is should we rename graph_index as node_index because I think node_index is more descriptive. The variable here stores a mapping for every node and the graph to which the node belongs to.

deepchem/models/torch_models/grover.py Show resolved Hide resolved
deepchem/utils/grover.py Show resolved Hide resolved
deepchem/utils/grover.py Show resolved Hide resolved
deepchem/utils/grover.py Show resolved Hide resolved


def _get_a2b(n_atoms, edge_index):
"""a2b is a mapping between atoms and their incoming bonds
Copy link
Member

Choose a reason for hiding this comment

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

Can you add a Parameters section here documenting the types of the argument?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

added

def extract_grover_attributes(molgraph: BatchGraphData):
"""Utility to extract grover attributes for grover model

Parameter
Copy link
Member

Choose a reason for hiding this comment

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

typo: Parameters (missing "s")

Copy link
Contributor Author

Choose a reason for hiding this comment

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

fixed type

Copy link
Member

@rbharath rbharath left a comment

Choose a reason for hiding this comment

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

LGTM, feel free to merge once CI is clear

@rbharath
Copy link
Member

@gusty1g Looks like some mypy errors which should be fixed before merge

@arunppsg arunppsg merged commit abfa660 into deepchem:master Mar 31, 2023
@arunppsg arunppsg deleted the grover-batch-v2 branch April 11, 2023 09:19
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants