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

Hackathon/edge mesh #378

Merged
merged 59 commits into from
Oct 12, 2023
Merged

Hackathon/edge mesh #378

merged 59 commits into from
Oct 12, 2023

Conversation

Zhouyuan-Chen
Copy link
Collaborator

@Zhouyuan-Chen Zhouyuan-Chen commented Sep 22, 2023

Just add dummy .hpp/.cpp and modified cmake files.

@Zhouyuan-Chen Zhouyuan-Chen changed the base branch from main to hackathon/dev September 22, 2023 02:51
@Zhouyuan-Chen
Copy link
Collaborator Author

Zhouyuan-Chen commented Sep 22, 2023

fixed compilation problems

Copy link
Collaborator

@mtao mtao left a comment

Choose a reason for hiding this comment

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

this should probably be a PR draft. I started leaving some comments and then realized this is mostly a copy-paste of PointMesh :)

src/wmtk/EdgeMesh.cpp Outdated Show resolved Hide resolved
src/wmtk/EdgeMesh.cpp Outdated Show resolved Hide resolved
@mtao mtao marked this pull request as draft September 22, 2023 19:57
@mtao mtao changed the base branch from hackathon/dev to main September 22, 2023 20:42
Copy link
Contributor

@daniel-zint daniel-zint left a comment

Choose a reason for hiding this comment

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

Looks all good so far. I did not go through the functions labeled as not tested yet. I guess the next step is to add tests and make sure all these functions do what they are supposed to do.

src/wmtk/Types.hpp Outdated Show resolved Hide resolved
@Zhouyuan-Chen
Copy link
Collaborator Author

Zhouyuan-Chen commented Sep 27, 2023

I uploaded the current code and thought the main skeleton was done, but still, it should have some problems that need to be fixed.
Oh, the files related to tests are not finished, so compiled could be passed. I wrote comments for some specific implementations that I am not sure about. For now, all functions under EdgeMesh have a "throw" at the beginning of the function. Please remove it before using it. Therefore, the first simple tests fail.

@daniel-zint daniel-zint linked an issue Sep 27, 2023 that may be closed by this pull request
5 tasks
@JcDai JcDai requested review from mtao and daniel-zint October 2, 2023 14:24
@JcDai JcDai marked this pull request as ready for review October 2, 2023 14:25
Copy link
Contributor

@daniel-zint daniel-zint left a comment

Choose a reason for hiding this comment

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

This is a massive PR. My main concern is that there is a lot of code of which I am not sure if it was tested. I added a few comments regarding that. Especially, if you copy code, throw an exception in every function. The fact that they look like they do something reasonable but might have not been tested is extremely dangerous. So please make sure that every function is at least called once in a test or throws an exception.

tests/test_topology.cpp Outdated Show resolved Hide resolved
tests/test_topology.cpp Outdated Show resolved Hide resolved
tests/test_topology.cpp Outdated Show resolved Hide resolved
tests/test_tuple_1d.cpp Outdated Show resolved Hide resolved
tests/test_tuple_1d.cpp Outdated Show resolved Hide resolved
src/wmtk/EdgeMeshOperationExecutor.cpp Show resolved Hide resolved
src/wmtk/EdgeMeshOperationExecutor.cpp Outdated Show resolved Hide resolved
src/wmtk/EdgeMeshOperationExecutor.cpp Outdated Show resolved Hide resolved
src/wmtk/EdgeMesh.hpp Outdated Show resolved Hide resolved
src/wmtk/EdgeMesh.cpp Show resolved Hide resolved
@JcDai JcDai requested a review from daniel-zint October 3, 2023 20:27
Copy link
Contributor

@daniel-zint daniel-zint left a comment

Choose a reason for hiding this comment

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

Looks very good already. I am just still a bit concerned that there are functions that were implemented but never tested.

DEBUG_EdgeMesh::operator== needs to be fixed. There are a few more minor comments. I think the PR is almost there.

src/wmtk/EdgeMesh.cpp Outdated Show resolved Hide resolved
src/wmtk/EdgeMeshOperationExecutor.hpp Show resolved Hide resolved
tests/test_tuple_1d.cpp Outdated Show resolved Hide resolved
tests/test_tuple_1d.cpp Outdated Show resolved Hide resolved
tests/test_tuple_1d.cpp Show resolved Hide resolved
tests/tools/DEBUG_EdgeMesh.cpp Outdated Show resolved Hide resolved
@JcDai JcDai requested a review from daniel-zint October 4, 2023 16:31
Copy link
Contributor

@daniel-zint daniel-zint left a comment

Choose a reason for hiding this comment

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

lgtm

@@ -81,8 +81,9 @@ Tuple EdgeMesh::switch_tuple(const Tuple& tuple, PrimitiveType type) const

// TODO: This is for special case self-loop, just to make sure the local vid of the returned
Copy link
Contributor

Choose a reason for hiding this comment

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

Is this TODO still a TODO?

@codecov
Copy link

codecov bot commented Oct 9, 2023

Codecov Report

Merging #378 (e991d24) into main (cadf64c) will increase coverage by 0.48%.
The diff coverage is 89.03%.

@@            Coverage Diff             @@
##             main     #378      +/-   ##
==========================================
+ Coverage   81.95%   82.43%   +0.48%     
==========================================
  Files         154      158       +4     
  Lines        4162     4470     +308     
==========================================
+ Hits         3411     3685     +274     
- Misses        751      785      +34     
Flag Coverage Δ
wildmeshing 82.43% <89.03%> (+0.48%) ⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

Files Coverage Δ
src/wmtk/MultiMeshManager.hpp 100.00% <ø> (ø)
src/wmtk/TriMesh.cpp 93.04% <100.00%> (ø)
src/wmtk/TriMeshOperationExecutor.cpp 96.51% <ø> (ø)
src/wmtk/attribute/ConstAccessor.hpp 50.00% <ø> (ø)
src/wmtk/attribute/MutableAccessor.hpp 100.00% <ø> (ø)
...rc/wmtk/utils/edgemesh_topology_initialization.cpp 100.00% <100.00%> (ø)
src/wmtk/EdgeMesh.hpp 50.00% <50.00%> (ø)
src/wmtk/EdgeMeshOperationExecutor.cpp 95.20% <95.20%> (ø)
src/wmtk/EdgeMesh.cpp 83.66% <83.66%> (ø)

@mtao
Copy link
Collaborator

mtao commented Oct 11, 2023

What is left before we can merge this? I'll trust daniel's review on this, but what's left to finish off his comments?
If you're working on things that are not part of his comments this PR those changes will need to be deleted.

@JcDai
Copy link
Collaborator

JcDai commented Oct 11, 2023

What is left before we can merge this? I'll trust daniel's review on this, but what's left to finish off his comments? If you're working on things that are not part of his comments this PR those changes will need to be deleted.

I think daniel's comments are finished. There was one merge main branch to our branch after finishing the comments. I think nothing else there?

Copy link
Contributor

@daniel-zint daniel-zint left a comment

Choose a reason for hiding this comment

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

Just fix that compilation issue and then let's finish this PR.

src/wmtk/EdgeMeshOperationExecutor.cpp Outdated Show resolved Hide resolved
@zlyfunction zlyfunction merged commit 4073f06 into main Oct 12, 2023
9 checks passed
@zlyfunction zlyfunction deleted the hackathon/edge_mesh branch October 12, 2023 16:14
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.

EdgeMesh
5 participants