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

Fix MFEMSidreDataCollection::LoadExternalData and add test cases for various LoadExternalData functions #1473

Merged
merged 27 commits into from
Jan 13, 2025

Conversation

white238
Copy link
Member

@white238 white238 commented Nov 14, 2024

Enables LLNL/serac#1258

@white238 white238 force-pushed the task/white238/quadrature_data_sidre branch from e284561 to 470de37 Compare November 27, 2024 22:34
@white238
Copy link
Member Author

/style

@white238 white238 force-pushed the task/white238/quadrature_data_sidre branch from 9c2795c to 1fbf8dd Compare January 9, 2025 21:29
@white238 white238 changed the title WIP: Add test case for array of user-defined struct containing POD data Fix MFEMSidreDataCollection::LoadExternalData and add test cases for various LoadExternalData functions Jan 9, 2025
@white238 white238 added bug Something isn't working Sidre Issues related to Axom's 'sidre' component Spio Issues related to paralle I/O for Axom's Sidre component User Request Issues related to user requests labels Jan 9, 2025
#if defined(AXOM_USE_MPI) && defined(MFEM_USE_MPI)
if(m_comm != MPI_COMM_NULL)
{
// The conduit abstraction appears to automatically handle the ".root"
Copy link
Member

@rhornung67 rhornung67 Jan 9, 2025

Choose a reason for hiding this comment

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

Would it be cleaner to move the logic for the path suffix into the reader.loadExternalData() method?

Copy link
Member Author

Choose a reason for hiding this comment

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

I am willing to put this in this PR or make an issue of it. I was just following the previous pattern and advice of @nselliott (i think)

@rhornung67
Copy link
Member

@white238 I think by linking issue #1479 in the description of this PR above, the issue will be closed when this PR is merged. We probably don't want that since it describes follow-on work for the solution we really want.

@white238
Copy link
Member Author

@white238 I think by linking issue #1479 in the description of this PR above, the issue will be closed when this PR is merged. We probably don't want that since it describes follow-on work for the solution we really want.

It only closes it if you do a keyword before the issue. See here:

https://docs.github.com/en/issues/tracking-your-work-with-issues/using-issues/linking-a-pull-request-to-an-issue#linking-a-pull-request-to-an-issue-using-a-keyword

Copy link
Member

@kennyweiss kennyweiss left a comment

Choose a reason for hiding this comment

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

Thanks @white238

RELEASE-NOTES.md Show resolved Hide resolved
Comment on lines +966 to +968
SLIC_ERROR(
"Loading external data with a group name is not supported in "
"parallel.");
Copy link
Member

Choose a reason for hiding this comment

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

Will this be resolved by #1479 ?

Copy link
Contributor

Choose a reason for hiding this comment

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

Yes, that is the intention.

Copy link
Member Author

Choose a reason for hiding this comment

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

I put this in because I kept forgetting and getting no loading and feedback. So I put in an error to warn the user until @nselliott adds the new capability.

src/axom/sidre/tests/sidre_read_write_userdefined_data.cpp Outdated Show resolved Hide resolved
{
test_MFEMSidreDataCollection_user_defined_data<double, 1>();
}
/*
Copy link
Member

Choose a reason for hiding this comment

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

Please add a comment about why these are commented out, and add or update an issue to fix these when SPIO can load into the specified group in the MFEMSidreDataCollection

Copy link
Member Author

Choose a reason for hiding this comment

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

I completely forgot I wrote these then wrote a much simpler single test in the MFEMSidreDataCollection test file..... good catch! They even passed just uncommenting them. Past Me was great!

@rhornung67
Copy link
Member

@white238 I think by linking issue #1479 in the description of this PR above, the issue will be closed when this PR is merged. We probably don't want that since it describes follow-on work for the solution we really want.

It only closes it if you do a keyword before the issue. See here:

https://docs.github.com/en/issues/tracking-your-work-with-issues/using-issues/linking-a-pull-request-to-an-issue#linking-a-pull-request-to-an-issue-using-a-keyword

Ah. Got it.

//------------------------------------------------------------------------------
TEST(spio_parallel, external_piecemeal_writeread)
{
if(PROTOCOL != "sidre_hdf5")
Copy link
Contributor

@nselliott nselliott Jan 10, 2025

Choose a reason for hiding this comment

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

I have an equivalent test in my work for #1479 , so that will probably replace this in the future, possibly incorporating some pieces of what you have here.

@white238 white238 force-pushed the task/white238/quadrature_data_sidre branch from b42ca90 to 3066766 Compare January 11, 2025 01:54
@white238 white238 merged commit b811391 into develop Jan 13, 2025
13 checks passed
@white238 white238 deleted the task/white238/quadrature_data_sidre branch January 13, 2025 20:46
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug Something isn't working Sidre Issues related to Axom's 'sidre' component Spio Issues related to paralle I/O for Axom's Sidre component User Request Issues related to user requests
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants