Skip to content

Separate face matching from _compute_facial_adjacency_from_vertices#207

Merged
inducer merged 13 commits into
inducer:mainfrom
majosm:separate-face-matching
Jun 10, 2021
Merged

Separate face matching from _compute_facial_adjacency_from_vertices#207
inducer merged 13 commits into
inducer:mainfrom
majosm:separate-face-matching

Conversation

@majosm

@majosm majosm commented Jun 3, 2021

Copy link
Copy Markdown
Collaborator

Pulled out of #204 to declutter.

⚠️ Remove _FlatFacialAdjacencyData again before merging. ⚠️

@majosm majosm force-pushed the separate-face-matching branch from ff040e6 to 245149d Compare June 3, 2021 15:49

@inducer inducer left a comment

Copy link
Copy Markdown
Owner

Choose a reason for hiding this comment

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

Thanks! Some review bits that came up during our meeting.

Comment thread meshmode/mesh/__init__.py Outdated
Comment thread meshmode/mesh/__init__.py
Comment thread meshmode/mesh/__init__.py Outdated
Comment thread meshmode/mesh/__init__.py Outdated
@inducer

inducer commented Jun 3, 2021

Copy link
Copy Markdown
Owner

Unsubscribing... @-mention or request review once it's ready for a look or needs attention.

@majosm majosm force-pushed the separate-face-matching branch 5 times, most recently from b5820a6 to a156f8f Compare June 8, 2021 04:22
@majosm majosm force-pushed the separate-face-matching branch from a156f8f to 0e7dbe6 Compare June 8, 2021 15:56
@majosm majosm marked this pull request as ready for review June 8, 2021 17:24
@majosm

majosm commented Jun 8, 2021

Copy link
Copy Markdown
Collaborator Author

Ready for a look @inducer.

I temporarily restored _FlatFacialAdjacencyData to make the diff a little less nasty. We'll have to remove it again before merging.

@majosm majosm requested a review from inducer June 8, 2021 17:31

@inducer inducer left a comment

Copy link
Copy Markdown
Owner

Choose a reason for hiding this comment

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

Thanks! This looks great functionally. Just some nitpicking around docs and explanation, so that (hopefully) reading this becomes easier, then this is ready to go.

Comment thread meshmode/mesh/__init__.py Outdated
Comment thread meshmode/mesh/__init__.py Outdated
Comment thread meshmode/mesh/__init__.py Outdated

def _match_faces_by_vertices(groups, face_ids, vertex_index_map_func=None):
"""
Return matching faces in *face_ids*, where two faces match if they have the

Copy link
Copy Markdown
Owner

Choose a reason for hiding this comment

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

Return matching faces

In what form?

Comment thread meshmode/mesh/__init__.py Outdated
Comment on lines +1122 to +1124
indices into *face_ids*. *vertex_index_map_func* is used to map vertices to
other vertices; it must accept (possibly multidimensional) numpy arrays of
vertex indices.

Copy link
Copy Markdown
Owner

Choose a reason for hiding this comment

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

Document arguments. Specifically, document the signature and return type (also acceptable shapes) of vertex_index_map_func.

Also document the return type and meaning of returned data from _match_faces_by_vertices.

Comment thread meshmode/mesh/__init__.py Outdated
Comment thread meshmode/mesh/__init__.py Outdated
@inducer

inducer commented Jun 9, 2021

Copy link
Copy Markdown
Owner

Remove _FlatFacialAdjacencyData again before merging.

Don't see that anywhere? What's this referring to?

majosm and others added 3 commits June 9, 2021 16:22
Co-authored-by: Andreas Klöckner <inform@tiker.net>
Co-authored-by: Andreas Klöckner <inform@tiker.net>
Co-authored-by: Andreas Klöckner <inform@tiker.net>
@majosm majosm force-pushed the separate-face-matching branch from 3dde10c to 043ea11 Compare June 9, 2021 21:44
@majosm

majosm commented Jun 9, 2021

Copy link
Copy Markdown
Collaborator Author

Remove _FlatFacialAdjacencyData again before merging.

Don't see that anywhere? What's this referring to?

It's right above _FaceIDs in meshmode/mesh/__init__.py. I removed it because it isn't needed anymore, but then I added it back in fe50f62 because removing it made the diff hard to follow.

@majosm majosm force-pushed the separate-face-matching branch from 043ea11 to a47023f Compare June 9, 2021 22:53

@inducer inducer left a comment

Copy link
Copy Markdown
Owner

Choose a reason for hiding this comment

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

Thanks! This LGTM now. I'll wait for you to remove _FlatFacialAdjacencyData. Let me know if/when it's ready to merge from your end.

@majosm

majosm commented Jun 9, 2021

Copy link
Copy Markdown
Collaborator Author

Good to go @inducer.

@inducer inducer merged commit b91cf8f into inducer:main Jun 10, 2021
@inducer

inducer commented Jun 10, 2021

Copy link
Copy Markdown
Owner

Thanks! (Hope you're OK with me squashing this... if not, please tell me, although I won't be able to do much to fix it.)

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.

2 participants