v2.1.x: mpi/fortran: fix parsing arrays of Fortran strings #5019
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
MPI defines the "argv" param to Fortran MPI_COMM_SPAWN as being terminated by a blank string. While not precisely defined (except through a non-binding example, Example 10.2, MPI-3.1 p382:6-29), one can infer that the "array_of_argv" param to Fortran MPI_COMM_SPAWN_MULTIPLE is also a set of argv, each of which are terminated by a blank line. The "array_of_commands" argument to Fortran MPI_COMM_SPAWN_MULTIPLE is a little less well-defined. It is *assumed* to be of length "count" (another parameter to MPI_COMM_SPAWN_MULTIPLE) -- and *not* be terminated by a blank string. This is also given credence by the same example 10.2 in MPI-3.1. The previous code assumed that "array_of_commands" should also be terminated by a blank line -- but per the above, this is incorrect. Instead, we should just parse our "count" number of strings from "array_of_commands" and *not* look for a blank line termination. This commit separates these two cases: * ompi_fortran_argv_blank_f2c(): parse a Fortran array of strings out and stop when reaching a blank string. * ompi_fortran_argv_count_f2c(): parse a Fortran array of strings out and stop when "count" number of strings have been parsed. Signed-off-by: Jeff Squyres <[email protected]> (cherry picked from commit open-mpi/ompi@0ab6b20)
jsquyres
approved these changes
Apr 5, 2018
|
@hppritcha This is good to go. |
jsquyres
changed the title
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
MPI defines the "argv" param to Fortran MPI_COMM_SPAWN as being
terminated by a blank string. While not precisely defined (except
through a non-binding example, Example 10.2, MPI-3.1 p382:6-29), one
can infer that the "array_of_argv" param to Fortran
MPI_COMM_SPAWN_MULTIPLE is also a set of argv, each of which are
terminated by a blank line.
The "array_of_commands" argument to Fortran MPI_COMM_SPAWN_MULTIPLE is
a little less well-defined. It is assumed to be of length "count"
(another parameter to MPI_COMM_SPAWN_MULTIPLE) -- and not be
terminated by a blank string. This is also given credence by the same
example 10.2 in MPI-3.1.
The previous code assumed that "array_of_commands" should also be
terminated by a blank line -- but per the above, this is incorrect.
Instead, we should just parse our "count" number of strings from
"array_of_commands" and not look for a blank line termination.
This commit separates these two cases:
and stop when reaching a blank string.
and stop when "count" number of strings have been parsed.
Signed-off-by: Jeff Squyres [email protected]
(cherry picked from commit 0ab6b20)