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.

Sign up for GitHub

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

Jump to bottom

#26: Zoltan2: MatrixAdapter refactor API #49

Merged
merged 11 commits into from
Aug 1, 2023
Merged

#26: Zoltan2: MatrixAdapter refactor API #49

merged 11 commits into from
Aug 1, 2023

Conversation

cwschilly
Copy link
Collaborator

Fixes #26 and adds TpetraCrsMatrixAdapter

@cwschilly cwschilly marked this pull request as draft July 17, 2023 16:51
@cwschilly
Copy link
Collaborator Author

This PR is almost ready for review; I just want to run it using the graph.cpp example to make sure everything works as expected (this example requires use of TPL's that I haven't installed yet)

@cwschilly
Copy link
Collaborator Author

Since the doMigration() method was originally defined in XpetraTraits.hpp, and there is no corresponding TpetraTraits file, it had to be redefined within the new TpetraCrsMatrixAdapter.hpp. It is also defined in TpetraRowMatrixAdapter.hpp, but I considered this duplication to be the best option to minimize changes to external API.

@cwschilly cwschilly marked this pull request as ready for review July 28, 2023 21:22
stmcgovern
stmcgovern requested changes Jul 31, 2023
View reviewed changes
Copy link
Collaborator

@stmcgovern stmcgovern left a comment

Choose a reason for hiding this comment

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

looks good - please fix the new lines issue

packages/zoltan2/core/src/input/Zoltan2_TpetraCrsMatrixAdapter.hpp Outdated Show resolved Hide resolved
packages/zoltan2/core/src/input/Zoltan2_XpetraCrsMatrixAdapter.hpp Outdated Show resolved Hide resolved
packages/zoltan2/test/core/helpers/Zoltan2_TestHelpers.hpp Outdated Show resolved Hide resolved
packages/zoltan2/test/core/unit/input/TpetraCrsMatrixInput.cpp Outdated Show resolved Hide resolved
packages/zoltan2/test/core/unit/input/TpetraRowMatrixInput.cpp Outdated Show resolved Hide resolved
@JacobDomagala
Copy link
Collaborator

JacobDomagala commented Jul 31, 2023 •
edited
Loading

I believe the changes will break NGA-develop branch. Please rebase with recent changes to NGA-develop and fix compilation errors

@cwschilly cwschilly linked an issue Jul 31, 2023 that may be closed by this pull request
Zoltan2: MatrixAdapter refactor API #26
Closed
6 tasks
@JacobDomagala
Copy link
Collaborator

See e066b2f for reference on how to deal with Weights getters (we want to support both 2D and 1D versions - #14 (comment))

@cwschilly cwschilly force-pushed the 26-zoltan2-matrixadapter-refactor-api branch from a4dc732 to 1429716 Compare July 31, 2023 17:47
@cwschilly cwschilly force-pushed the 26-zoltan2-matrixadapter-refactor-api branch from 1429716 to adbbb49 Compare July 31, 2023 20:07
@stmcgovern stmcgovern self-requested a review July 31, 2023 21:01
stmcgovern
stmcgovern approved these changes Aug 1, 2023
View reviewed changes
Copy link
Collaborator

@stmcgovern stmcgovern left a comment

Choose a reason for hiding this comment

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

It passes local tests with the new API. Thanks @cwschilly!

@stmcgovern stmcgovern merged commit a24bce4 into NGA-FY23-develop Aug 1, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@stmcgovern stmcgovern stmcgovern approved these changes

@mperrinel mperrinel Awaiting requested review from mperrinel

@JacobDomagala JacobDomagala Awaiting requested review from JacobDomagala

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Zoltan2: MatrixAdapter refactor API
3 participants
@cwschilly @JacobDomagala @stmcgovern