Skip to content

Commit

Permalink
use new MPI big count routines
Browse files Browse the repository at this point in the history
  • Loading branch information
@roblatham00
roblatham00 committed Mar 20, 2024
1 parent b666c40 commit 6a851d7
Show file tree
Hide file tree
Showing 3 changed files with 89 additions and 17 deletions.
5 changes: 5 additions & 0 deletions configure.ac
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,8 +49,11 @@ AC_CHECK_HEADERS([fcntl.h libintl.h stdlib.h string.h strings.h sys/ioctl.h sys/
# Checks for typedefs, structures, and compiler characteristics.
AC_TYPE_SIZE_T

AC_CHECK_TYPES([MPI_Count], [], [], [[#include <mpi.h>]])

# Checks for library functions.
AC_CHECK_FUNCS([sysconf gettimeofday memset mkdir pow putenv realpath regcomp sqrt strcasecmp strchr strerror strncasecmp strstr uname statfs statvfs])
AC_CHECK_FUNCS([MPI_File_read_c])
AC_SEARCH_LIBS([sqrt], [m], [],
[AC_MSG_ERROR([Math library not found])])

Expand Down Expand Up @@ -141,6 +144,8 @@ AM_COND_IF([HAVE_GPU_DIRECT],[
])


AC_CHECK_FUNCS


# Check for system capabilities
AC_SYS_LARGEFILE
Expand Down
99 changes: 83 additions & 16 deletions src/aiori-MPIIO.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -322,6 +322,73 @@ static aiori_fd_t *MPIIO_Open(char *testFileName, int flags, aiori_mod_opt_t * m
/*
* Write or read access to file using the MPIIO interface.
*/

#ifndef HAVE_MPI_FILE_READ_C
static int MPI_File_read_c(MPI_File f, void * buf, MPI_Count c,
MPI_Datatype t, MPI_Status *s)
{
if (c > INT_MAX)
ERR("count too large for this MPI implementation");
return MPI_File_read(f, buf, c, t, s);
}

static int MPI_File_read_at_c(MPI_File f, MPI_Offset off, void * buf, MPI_Count c,
MPI_Datatype t, MPI_Status *s)
{
if (c > INT_MAX)
ERR("count too large for this MPI implementation");
return MPI_File_read_at(f, off, buf, c, t, s);
}

static int MPI_File_read_all_c(MPI_File f, void * buf, MPI_Count c,
MPI_Datatype t, MPI_Status *s)
{
if (c > INT_MAX)
ERR("count too large for this MPI implementation");
return MPI_File_read_all(f, buf, c, t, s);
}

static int MPI_File_read_at_all_c(MPI_File f, MPI_Offset off, void * buf, MPI_Count c,
MPI_Datatype t, MPI_Status *s)
{
if (c > INT_MAX)
ERR("count too large for this MPI implementation");
return MPI_File_read_at_all(f, off, buf, c, t, s);
}

static int MPI_File_write_c(MPI_File f, const void * buf, MPI_Count c,
MPI_Datatype t, MPI_Status *s)
{
if (c > INT_MAX)
ERR("count too large for this MPI implementation");
return MPI_File_write(f, buf, c, t, s);
}

static int MPI_File_write_at_c(MPI_File f, MPI_Offset off, const void * buf, MPI_Count c,
MPI_Datatype t, MPI_Status *s)
{
if (c > INT_MAX)
ERR("count too large for this MPI implementation");
return MPI_File_write_at(f, off, buf, c, t, s);
}

static int MPI_File_write_all_c(MPI_File f, const void * buf, MPI_Count c,
MPI_Datatype t, MPI_Status *s)
{
if (c > INT_MAX)
ERR("count too large for this MPI implementation");
return MPI_File_write_all(f, buf, c, t, s);
}

static int MPI_File_write_at_all_c(MPI_File f, MPI_Offset off, const void * buf, MPI_Count c,
MPI_Datatype t, MPI_Status *s)
{
if (c > INT_MAX)
ERR("count too large for this MPI implementation");
return MPI_File_write_at_all(f, off, buf, c, t, s);
}
#endif

static IOR_offset_t MPIIO_Xfer(int access, aiori_fd_t * fdp, IOR_size_t * buffer,
IOR_offset_t length, IOR_offset_t offset, aiori_mod_opt_t * module_options)
{
Expand All @@ -334,13 +401,13 @@ static IOR_offset_t MPIIO_Xfer(int access, aiori_fd_t * fdp, IOR_size_t * buffer
return length;
mpiio_fd_t * mfd = (mpiio_fd_t*) fdp;

int (MPIAPI * Access) (MPI_File, void *, int,
int (MPIAPI * Access) (MPI_File, void *, MPI_Count,
MPI_Datatype, MPI_Status *);
int (MPIAPI * Access_at) (MPI_File, MPI_Offset, void *, int,
int (MPIAPI * Access_at) (MPI_File, MPI_Offset, void *, MPI_Count,
MPI_Datatype, MPI_Status *);
int (MPIAPI * Access_all) (MPI_File, void *, int,
int (MPIAPI * Access_all) (MPI_File, void *, MPI_Count,
MPI_Datatype, MPI_Status *);
int (MPIAPI * Access_at_all) (MPI_File, MPI_Offset, void *, int,
int (MPIAPI * Access_at_all) (MPI_File, MPI_Offset, void *, MPI_Count,
MPI_Datatype, MPI_Status *);
/*
* this needs to be properly implemented:
Expand All @@ -352,24 +419,24 @@ static IOR_offset_t MPIIO_Xfer(int access, aiori_fd_t * fdp, IOR_size_t * buffer

/* point functions to appropriate MPIIO calls */
if (access == WRITE) { /* WRITE */
Access = (int (MPIAPI *)(MPI_File, void *, int,
MPI_Datatype, MPI_Status *)) MPI_File_write;
Access_at = (int (MPIAPI *)(MPI_File, MPI_Offset, void *, int,
MPI_Datatype, MPI_Status *)) MPI_File_write_at;
Access_all = (int (MPIAPI *) (MPI_File, void *, int,
MPI_Datatype, MPI_Status *)) MPI_File_write_all;
Access_at_all = (int (MPIAPI *) (MPI_File, MPI_Offset, void *, int,
MPI_Datatype, MPI_Status *)) MPI_File_write_at_all;
Access = (int (MPIAPI *)(MPI_File, void *, MPI_Count,
MPI_Datatype, MPI_Status *)) MPI_File_write_c;
Access_at = (int (MPIAPI *)(MPI_File, MPI_Offset, void *, MPI_Count,
MPI_Datatype, MPI_Status *)) MPI_File_write_at_c;
Access_all = (int (MPIAPI *) (MPI_File, void *, MPI_Count,
MPI_Datatype, MPI_Status *)) MPI_File_write_all_c;
Access_at_all = (int (MPIAPI *) (MPI_File, MPI_Offset, void *, MPI_Count,
MPI_Datatype, MPI_Status *)) MPI_File_write_at_all_c;
/*
* this needs to be properly implemented:
*
* Access_ordered = MPI_File_write_ordered;
*/
} else { /* READ or CHECK */
Access = MPI_File_read;
Access_at = MPI_File_read_at;
Access_all = MPI_File_read_all;
Access_at_all = MPI_File_read_at_all;
Access = MPI_File_read_c;
Access_at = MPI_File_read_at_c;
Access_all = MPI_File_read_all_c;
Access_at_all = MPI_File_read_at_all_c;
/*
* this needs to be properly implemented:
*
Expand Down
2 changes: 1 addition & 1 deletion src/parse_options.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -456,7 +456,7 @@ option_help * createGlobalOptions(IOR_param_t * params){
{'Q', NULL, "taskPerNodeOffset for read tests use with -C & -Z options (-C constant N, -Z at least N)", OPTION_OPTIONAL_ARGUMENT, 'd', & params->taskPerNodeOffset},
{'r', NULL, "readFile -- read existing file", OPTION_FLAG, 'd', & params->readFile},
{'R', NULL, "checkRead -- verify that the output of read matches the expected signature (used with -G)", OPTION_FLAG, 'd', & params->checkRead},
{'s', NULL, "segmentCount -- number of segments", OPTION_OPTIONAL_ARGUMENT, 'd', & params->segmentCount},
{'s', NULL, "segmentCount -- number of segments", OPTION_OPTIONAL_ARGUMENT, 'l', & params->segmentCount},
{'t', NULL, "transferSize -- size of transfer in bytes (e.g.: 8, 4k, 2m, 1g)", OPTION_OPTIONAL_ARGUMENT, 'l', & params->transferSize},
{'T', NULL, "maxTimeDuration -- max time in minutes executing repeated test; it aborts only between iterations and not within a test!", OPTION_OPTIONAL_ARGUMENT, 'd', & params->maxTimeDuration},
{'u', NULL, "uniqueDir -- use unique directory name for each file-per-process", OPTION_FLAG, 'd', & params->uniqueDir},
Expand Down

0 comments on commit 6a851d7

Please sign in to comment.