0ab6b201fe
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 <jsquyres@cisco.com>
128 строки
4.8 KiB
C
128 строки
4.8 KiB
C
/*
|
|
* Copyright (c) 2004-2007 The Trustees of Indiana University and Indiana
|
|
* University Research and Technology
|
|
* Corporation. All rights reserved.
|
|
* Copyright (c) 2004-2005 The University of Tennessee and The University
|
|
* of Tennessee Research Foundation. All rights
|
|
* reserved.
|
|
* Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
|
|
* University of Stuttgart. All rights reserved.
|
|
* Copyright (c) 2004-2005 The Regents of the University of California.
|
|
* All rights reserved.
|
|
* Copyright (c) 2010-2018 Cisco Systems, Inc. All rights reserved
|
|
* Copyright (c) 2015-2017 Research Organization for Information Science
|
|
* and Technology (RIST). All rights reserved.
|
|
* $COPYRIGHT$
|
|
*
|
|
* Additional copyrights may follow
|
|
*
|
|
* $HEADER$
|
|
*/
|
|
|
|
#include "ompi_config.h"
|
|
|
|
#include "ompi/mpi/fortran/mpif-h/bindings.h"
|
|
#include "ompi/mpi/fortran/base/constants.h"
|
|
#include "ompi/mpi/fortran/base/fortran_base_strings.h"
|
|
#include "opal/util/argv.h"
|
|
|
|
#if OMPI_BUILD_MPI_PROFILING
|
|
#if OPAL_HAVE_WEAK_SYMBOLS
|
|
#pragma weak PMPI_COMM_SPAWN = ompi_comm_spawn_f
|
|
#pragma weak pmpi_comm_spawn = ompi_comm_spawn_f
|
|
#pragma weak pmpi_comm_spawn_ = ompi_comm_spawn_f
|
|
#pragma weak pmpi_comm_spawn__ = ompi_comm_spawn_f
|
|
|
|
#pragma weak PMPI_Comm_spawn_f = ompi_comm_spawn_f
|
|
#pragma weak PMPI_Comm_spawn_f08 = ompi_comm_spawn_f
|
|
#else
|
|
OMPI_GENERATE_F77_BINDINGS (PMPI_COMM_SPAWN,
|
|
pmpi_comm_spawn,
|
|
pmpi_comm_spawn_,
|
|
pmpi_comm_spawn__,
|
|
pompi_comm_spawn_f,
|
|
(char *command, char *argv, MPI_Fint *maxprocs, MPI_Fint *info, MPI_Fint *root, MPI_Fint *comm, MPI_Fint *intercomm, MPI_Fint *array_of_errcodes, MPI_Fint *ierr, int cmd_len, int string_len),
|
|
(command, argv, maxprocs, info, root, comm, intercomm, array_of_errcodes, ierr, cmd_len, string_len) )
|
|
#endif
|
|
#endif
|
|
|
|
#if OPAL_HAVE_WEAK_SYMBOLS
|
|
#pragma weak MPI_COMM_SPAWN = ompi_comm_spawn_f
|
|
#pragma weak mpi_comm_spawn = ompi_comm_spawn_f
|
|
#pragma weak mpi_comm_spawn_ = ompi_comm_spawn_f
|
|
#pragma weak mpi_comm_spawn__ = ompi_comm_spawn_f
|
|
|
|
#pragma weak MPI_Comm_spawn_f = ompi_comm_spawn_f
|
|
#pragma weak MPI_Comm_spawn_f08 = ompi_comm_spawn_f
|
|
#else
|
|
#if ! OMPI_BUILD_MPI_PROFILING
|
|
OMPI_GENERATE_F77_BINDINGS (MPI_COMM_SPAWN,
|
|
mpi_comm_spawn,
|
|
mpi_comm_spawn_,
|
|
mpi_comm_spawn__,
|
|
ompi_comm_spawn_f,
|
|
(char *command, char *argv, MPI_Fint *maxprocs, MPI_Fint *info, MPI_Fint *root, MPI_Fint *comm, MPI_Fint *intercomm, MPI_Fint *array_of_errcodes, MPI_Fint *ierr, int cmd_len, int string_len),
|
|
(command, argv, maxprocs, info, root, comm, intercomm, array_of_errcodes, ierr, cmd_len, string_len) )
|
|
#else
|
|
#define ompi_comm_spawn_f pompi_comm_spawn_f
|
|
#endif
|
|
#endif
|
|
|
|
|
|
void ompi_comm_spawn_f(char *command, char *argv, MPI_Fint *maxprocs,
|
|
MPI_Fint *info, MPI_Fint *root, MPI_Fint *comm,
|
|
MPI_Fint *intercomm, MPI_Fint *array_of_errcodes,
|
|
MPI_Fint *ierr, int cmd_len, int string_len)
|
|
{
|
|
MPI_Comm c_comm, c_new_comm;
|
|
MPI_Info c_info;
|
|
int size, c_ierr;
|
|
int *c_errs;
|
|
char **c_argv;
|
|
char *c_command;
|
|
OMPI_ARRAY_NAME_DECL(array_of_errcodes);
|
|
|
|
c_comm = PMPI_Comm_f2c(*comm);
|
|
c_info = PMPI_Info_f2c(*info);
|
|
PMPI_Comm_size(c_comm, &size);
|
|
ompi_fortran_string_f2c(command, cmd_len, &c_command);
|
|
|
|
/* It's allowed to ignore the errcodes */
|
|
|
|
if (OMPI_IS_FORTRAN_ERRCODES_IGNORE(array_of_errcodes)) {
|
|
c_errs = MPI_ERRCODES_IGNORE;
|
|
} else {
|
|
OMPI_ARRAY_FINT_2_INT_ALLOC(array_of_errcodes, size);
|
|
c_errs = OMPI_ARRAY_NAME_CONVERT(array_of_errcodes);
|
|
}
|
|
|
|
/* It's allowed to have no argv */
|
|
|
|
if (OMPI_IS_FORTRAN_ARGV_NULL(argv)) {
|
|
c_argv = MPI_ARGV_NULL;
|
|
} else {
|
|
ompi_fortran_argv_blank_f2c(argv, string_len, string_len, &c_argv);
|
|
}
|
|
|
|
c_ierr = PMPI_Comm_spawn(c_command, c_argv,
|
|
OMPI_FINT_2_INT(*maxprocs),
|
|
c_info,
|
|
OMPI_FINT_2_INT(*root),
|
|
c_comm, &c_new_comm, c_errs);
|
|
if (NULL != ierr) *ierr = OMPI_INT_2_FINT(c_ierr);
|
|
|
|
if (MPI_SUCCESS == c_ierr) {
|
|
*intercomm = PMPI_Comm_c2f(c_new_comm);
|
|
}
|
|
free(c_command);
|
|
if (MPI_ARGV_NULL != c_argv && NULL != c_argv) {
|
|
opal_argv_free(c_argv);
|
|
}
|
|
if (!OMPI_IS_FORTRAN_ERRCODES_IGNORE(array_of_errcodes)) {
|
|
OMPI_ARRAY_INT_2_FINT(array_of_errcodes, size);
|
|
} else {
|
|
OMPI_ARRAY_FINT_2_INT_CLEANUP(array_of_errcodes);
|
|
}
|
|
}
|
|
|