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

Fix issue with unmatched messages in ph5diff #3719

Merged
merged 1 commit into from
Oct 19, 2023
Merged

Fix issue with unmatched messages in ph5diff #3719

merged 1 commit into from
Oct 19, 2023

Conversation

jhendersonHDF
Copy link
Collaborator

Fixes #3123 by only sending completion messages once

@jhendersonHDF jhendersonHDF added Merge - To 1.14 Priority - 1. High 🔼 These are important issues that should be resolved in the next release Component - Tools Command-line tools like h5dump, includes high-level tools Component - Parallel Parallel HDF5 (NOT thread-safety) Type - Bug / Bugfix Please report security issues to [email protected] instead of creating an issue on GitHub labels Oct 19, 2023
jhendersonHDF
jhendersonHDF commented Oct 19, 2023
View reviewed changes
tools/lib/h5diff.c
@@ -1485,9 +1485,6 @@ diff_match(hid_t file1_id, const char *grp1, trav_info_t *info1, hid_t file2_id,
} /* end else */
} /* end while */

for (i = 1; (int)i < g_nTasks; i++)
MPI_Send(NULL, 0, MPI_BYTE, (int)i, MPI_TAG_END, MPI_COMM_WORLD);
Copy link
Collaborator Author

Choose a reason for hiding this comment

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

This same loop already exists in phdiff_dismiss_workers in tools/lib/h5diff.c and gets called by the manager rank on ph5diff exit. This loop was just causing the same messages to be sent twice and end up unmatched.

jhendersonHDF
jhendersonHDF commented Oct 19, 2023
View reviewed changes
tools/src/h5diff/ph5diff_main.c
@@ -127,7 +127,7 @@ ph5diff_worker(int nID)
char filenames[2][MAX_FILENAME];

/* Retrieve filenames */
MPI_Recv(filenames, MAX_FILENAME * 2, MPI_CHAR, 0, MPI_ANY_TAG, MPI_COMM_WORLD, &Status);
MPI_Recv(filenames, MAX_FILENAME * 2, MPI_CHAR, 0, MPI_TAG_PARALLEL, MPI_COMM_WORLD, &Status);
Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Match MPI_TAG_PARALLEL from above rather than just any message tag

jhendersonHDF
jhendersonHDF commented Oct 19, 2023
View reviewed changes
tools/src/h5diff/ph5diff_main.c
@@ -173,7 +173,7 @@ ph5diff_worker(int nID)

/* When get token, send all of our output to the manager task and then return the token */
for (i = 0; i < outBuffOffset; i += PRINT_DATA_MAX_SIZE)
MPI_Send(outBuff + i, PRINT_DATA_MAX_SIZE, MPI_BYTE, 0, MPI_TAG_PRINT_DATA,
MPI_Send(outBuff + i, PRINT_DATA_MAX_SIZE, MPI_CHAR, 0, MPI_TAG_PRINT_DATA,
Copy link
Collaborator Author

Choose a reason for hiding this comment

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

The manager rank specifies MPI_CHAR when receiving these messages. It doesn't seem to make much of a difference anyway for char vs. byte, but it seems better to make sure we match the types anyway.

@lrknox lrknox merged commit c4a146e into HDFGroup:develop Oct 19, 2023
40 checks passed
@jhendersonHDF jhendersonHDF deleted the ph5diff_unmatched branch October 20, 2023 18:04
jhendersonHDF added a commit to jhendersonHDF/hdf5 that referenced this pull request Oct 20, 2023
@jhendersonHDF
Fix issue with unmatched messages in ph5diff (HDFGroup#3719)
6b50da7
derobins added a commit that referenced this pull request Oct 21, 2023
@jhendersonHDF @hyoklee
@byrnHDF @brtnfld @derobins @fortnern @glennsong09 @bmribler
Sync with develop (#3737)
b16808d 
* Correct ld in format strings in cmpd_dset.c (#3697)

Removes clang warnings

* Clean up comments. (#3695)

* Add NVidia compiler support and CI (#3686)

* Work around Theta system issue failure in links test (#3710)

When the Subfiling VFD is enabled, the links test may
try to initialize the Subfiling VFD and call MPI_Init_thread.
On Theta, this appears to have an issue that will cause
the links test to fail. Reworked the test to check for
the same conditions in a more roundabout way that doesn't
involved initializing the Subfiling VFD

* Fix issue with unmatched messages in ph5diff (#3719)

* provide an alternative to mapfile for older bash (#3717)

* Attempt to quiet some warnings with cray compilers. (#3724)

* Fix CMake VOL passthrough tests by copying files to correct directory (#3721)

* Develop intel split (#3722)

* Split intel compiler flags into sub-folders
* Update Intel options for warnings
* Mostly CMake, Autotools needs additional work

* Fixes and adjustments to t_filters_parallel (#3714)

Broadcast number of datasets to create in multi-dataset I/O cases
so that interference with random number generation doesn't cause
mismatches between ranks

Set fill time for datasets to "never" by default and adjust on a
per-test basis to avoid writing fill values to chunks when it's
unnecessary

Reduce number of loops run in some tests when performing multi-dataset
I/O

Fix an issue in the "fill time never" test where data verification
could fill if file space reuse causes application buffers to be
filled with chosen fill value when reading from datasets with
uninitialized storage

Skip multi-chunk I/O test configurations for multi-dataset I/O
configurations when the TestExpress level is > 1 since those
tests can be more stressful on the file system

Disable use of persistent file free space management for now
since it occasionally runs into an infinite loop in the library's
free space management code

* Suppress cast-qual warning in H5TB Fortran wrapper (#3728)

This interface is fundamentally broken, const-wise.

* Add new API function H5Pget_actual_select_io_mode() (#2974)

This function allows the user to determine if the library performed selection I/O, vector I/O, or scalar (legacy) I/O during the last HDF5 operation performed with the provided DXPL. Expanded existing tests to check this functionality.

* Test scripts now execute in-source with creation of tmp dir (#3723)

Fixes a few issues created in #3580:

* Fixes a problem where committed tools test files were deleted when cleaning after an in-source build
* Fixes issues with test file paths in Autotools tools test scripts

* Add -h and --help as flags in h5cc & h5fc (#3729)

Adds these common help flags in addition to -help

* Update the library version matrix for H5Pset_libver_bounds() (#3702)

* Fixed #3524

Added 1.12, 1.14, and 1.16 to the table for libver bounds in the H5Pset_libver_bounds docs.

* Remove references to LIBVER_V116

---------

Co-authored-by: H. Joe Lee <[email protected]>
Co-authored-by: Allen Byrne <[email protected]>
Co-authored-by: Scot Breitenfeld <[email protected]>
Co-authored-by: Dana Robinson <[email protected]>
Co-authored-by: Neil Fortner <[email protected]>
Co-authored-by: Glenn Song <[email protected]>
Co-authored-by: bmribler <[email protected]>
@opoplawski
Copy link
Contributor

Is this going to make it into the hdf5_1_14 branch?

@jhendersonHDF
Copy link
Collaborator Author

@opoplawski Yes, this has made it into the hdf5_1_14 branch and will be in the 1.14.3 release.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@byrnHDF byrnHDF byrnHDF approved these changes

@lrknox lrknox lrknox approved these changes

@derobins derobins Awaiting requested review from derobins derobins is a code owner

@fortnern fortnern Awaiting requested review from fortnern fortnern is a code owner

@qkoziol qkoziol Awaiting requested review from qkoziol qkoziol is a code owner

@vchoi-hdfgroup vchoi-hdfgroup Awaiting requested review from vchoi-hdfgroup vchoi-hdfgroup is a code owner

@bmribler bmribler Awaiting requested review from bmribler bmribler is a code owner

@glennsong09 glennsong09 Awaiting requested review from glennsong09 glennsong09 is a code owner

@mattjala mattjala Awaiting requested review from mattjala mattjala is a code owner

@brtnfld brtnfld Awaiting requested review from brtnfld brtnfld is a code owner

Assignees
No one assigned
Labels
Component - Parallel Parallel HDF5 (NOT thread-safety) Component - Tools Command-line tools like h5dump, includes high-level tools Priority - 1. High 🔼 These are important issues that should be resolved in the next release Type - Bug / Bugfix Please report security issues to [email protected] instead of creating an issue on GitHub
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

ph5diff crashes with mpich 4.1 due to unmatched messages
4 participants
@jhendersonHDF @opoplawski @lrknox @byrnHDF