mirror of
https://github.com/HDFGroup/hdf5.git
synced 2025-02-17 16:10:24 +08:00
[svn-r4241] Purpose:
Code Cleanup/Bug Fixes
Description:
Raymond's last fix corrected the problem with eirene, but there were still
a number of warnings, etc. during compiles.
Solution:
Clean up the warnings, neaten up the code a little and change a few hsize_t's
into size_t's that were missed in my previous sweep through the code.
Platforms tested:
Linux 2.2 (eirene)
This commit is contained in:
Quincey Koziol
parent
61a6e70c42
commit
2e8cb48786
221
src/H5Smpio.c
221
src/H5Smpio.c
@ -16,6 +16,7 @@
|
||||
#include "H5private.h"
|
||||
#include "H5Eprivate.h"
|
||||
#include "H5Fpkg.h" /* Ugly, but necessary for the MPIO I/O accesses */
|
||||
#include "H5FDprivate.h" /* Necessary for the H5FD_write & H5FD_read prototypes.. */
|
||||
#include "H5Spkg.h"
|
||||
|
||||
#include "H5FDmpio.h" /*the MPIO file driver */
|
||||
@ -41,19 +42,19 @@ static herr_t
|
||||
H5S_mpio_all_type( const H5S_t *space, const size_t elmt_size,
|
||||
/* out: */
|
||||
MPI_Datatype *new_type,
|
||||
hsize_t *count,
|
||||
size_t *count,
|
||||
hbool_t *is_derived_type );
|
||||
static herr_t
|
||||
H5S_mpio_hyper_type( const H5S_t *space, const size_t elmt_size,
|
||||
/* out: */
|
||||
MPI_Datatype *new_type,
|
||||
hsize_t *count,
|
||||
size_t *count,
|
||||
hbool_t *is_derived_type );
|
||||
static herr_t
|
||||
H5S_mpio_space_type( const H5S_t *space, const size_t elmt_size,
|
||||
/* out: */
|
||||
MPI_Datatype *new_type,
|
||||
hsize_t *count,
|
||||
size_t *count,
|
||||
hbool_t *is_derived_type );
|
||||
static herr_t
|
||||
H5S_mpio_spaces_xfer(H5F_t *f, const struct H5O_layout_t *layout,
|
||||
@ -85,11 +86,11 @@ herr_t
|
||||
H5S_mpio_all_type( const H5S_t *space, const size_t elmt_size,
|
||||
/* out: */
|
||||
MPI_Datatype *new_type,
|
||||
hsize_t *count,
|
||||
size_t *count,
|
||||
hbool_t *is_derived_type )
|
||||
{
|
||||
hsize_t total_bytes;
|
||||
int i;
|
||||
unsigned u;
|
||||
|
||||
FUNC_ENTER (H5S_mpio_all_type, FAIL);
|
||||
|
||||
@ -98,12 +99,12 @@ H5S_mpio_all_type( const H5S_t *space, const size_t elmt_size,
|
||||
|
||||
/* Just treat the entire extent as a block of bytes */
|
||||
total_bytes = (hsize_t)elmt_size;
|
||||
for (i=0; i<space->extent.u.simple.rank; ++i) {
|
||||
total_bytes *= space->extent.u.simple.size[i];
|
||||
}
|
||||
for (u=0; u<space->extent.u.simple.rank; ++u)
|
||||
total_bytes *= space->extent.u.simple.size[u];
|
||||
|
||||
/* fill in the return values */
|
||||
*new_type = MPI_BYTE;
|
||||
H5_CHECK_OVERFLOW(total_bytes, hsize_t, size_t);
|
||||
*count = total_bytes;
|
||||
*is_derived_type = 0;
|
||||
|
||||
@ -141,15 +142,15 @@ herr_t
|
||||
H5S_mpio_hyper_type( const H5S_t *space, const size_t elmt_size,
|
||||
/* out: */
|
||||
MPI_Datatype *new_type,
|
||||
hsize_t *count,
|
||||
size_t *count,
|
||||
hbool_t *is_derived_type )
|
||||
{
|
||||
struct dim { /* less hassle than malloc/free & ilk */
|
||||
hssize_t start;
|
||||
hsize_t strid;
|
||||
hsize_t block;
|
||||
hsize_t xtent;
|
||||
hsize_t count;
|
||||
hssize_t start;
|
||||
hsize_t strid;
|
||||
hsize_t block;
|
||||
hsize_t xtent;
|
||||
hsize_t count;
|
||||
} d[H5S_MAX_RANK];
|
||||
|
||||
int i, err, new_rank, num_to_collapse;
|
||||
@ -170,27 +171,34 @@ H5S_mpio_hyper_type( const H5S_t *space, const size_t elmt_size,
|
||||
assert (diminfo);
|
||||
rank = space->extent.u.simple.rank;
|
||||
assert (rank >= 0);
|
||||
if (0==rank) goto empty;
|
||||
if (0==elmt_size) goto empty;
|
||||
if (0==rank)
|
||||
goto empty;
|
||||
if (0==elmt_size)
|
||||
goto empty;
|
||||
|
||||
/* make a local copy of the dimension info so we can transform them */
|
||||
assert(rank<=H5S_MAX_RANK); /* within array bounds */
|
||||
for ( i=0; i<rank; ++i) {
|
||||
d[i].start = diminfo[i].start;
|
||||
d[i].strid = diminfo[i].stride;
|
||||
d[i].block = diminfo[i].block;
|
||||
d[i].count = diminfo[i].count;
|
||||
d[i].xtent = space->extent.u.simple.size[i];
|
||||
d[i].start = diminfo[i].start;
|
||||
d[i].strid = diminfo[i].stride;
|
||||
d[i].block = diminfo[i].block;
|
||||
d[i].count = diminfo[i].count;
|
||||
d[i].xtent = space->extent.u.simple.size[i];
|
||||
#ifdef H5Smpi_DEBUG
|
||||
HDfprintf(stdout, "hyper_type: start=%Hd stride=%Hu count=%Hu "
|
||||
"block=%Hu xtent=%Hu",
|
||||
d[i].start, d[i].strid, d[i].count, d[i].block, d[i].xtent );
|
||||
if (i==0) HDfprintf(stdout, " rank=%d\n", rank );
|
||||
else HDfprintf(stdout, "\n" );
|
||||
HDfprintf(stdout, "hyper_type: start=%Hd stride=%Hu count=%Hu "
|
||||
"block=%Hu xtent=%Hu",
|
||||
d[i].start, d[i].strid, d[i].count, d[i].block, d[i].xtent );
|
||||
if (i==0)
|
||||
HDfprintf(stdout, " rank=%d\n", rank );
|
||||
else
|
||||
HDfprintf(stdout, "\n" );
|
||||
#endif
|
||||
if (0==d[i].block) goto empty;
|
||||
if (0==d[i].count) goto empty;
|
||||
if (0==d[i].xtent) goto empty;
|
||||
if (0==d[i].block)
|
||||
goto empty;
|
||||
if (0==d[i].count)
|
||||
goto empty;
|
||||
if (0==d[i].xtent)
|
||||
goto empty;
|
||||
}
|
||||
|
||||
/**********************************************************************
|
||||
@ -200,15 +208,15 @@ H5S_mpio_hyper_type( const H5S_t *space, const size_t elmt_size,
|
||||
offset[rank-1] = 1;
|
||||
max_xtent[rank-1] = d[rank-1].xtent;
|
||||
#ifdef H5Smpi_DEBUG
|
||||
i=rank-1;
|
||||
HDfprintf(stdout, " offset[%2d]=%d; max_xtent[%2d]=%d\n",
|
||||
i=rank-1;
|
||||
HDfprintf(stdout, " offset[%2d]=%d; max_xtent[%2d]=%d\n",
|
||||
i, offset[i], i, max_xtent[i]);
|
||||
#endif
|
||||
for (i=rank-2; i>=0; --i) {
|
||||
offset[i] = offset[i+1]*d[i+1].xtent;
|
||||
max_xtent[i] = max_xtent[i+1]*d[i].xtent;
|
||||
#ifdef H5Smpi_DEBUG
|
||||
HDfprintf(stdout, " offset[%2d]=%d; max_xtent[%2d]=%d\n",
|
||||
HDfprintf(stdout, " offset[%2d]=%d; max_xtent[%2d]=%d\n",
|
||||
i, offset[i], i, max_xtent[i]);
|
||||
#endif
|
||||
}
|
||||
@ -241,13 +249,13 @@ H5S_mpio_hyper_type( const H5S_t *space, const size_t elmt_size,
|
||||
/* This loop examines contiguity from the inside out. */
|
||||
for ( i=0; i<rank; ++i) {
|
||||
if ((d[rank-i-1].strid != d[rank-i-1].block)
|
||||
||
|
||||
(d[rank-i-1].count*d[rank-i-1].block) != space->extent.u.simple.size[rank-i-1]) {
|
||||
break;
|
||||
}
|
||||
|| (d[rank-i-1].count*d[rank-i-1].block) != space->extent.u.simple.size[rank-i-1])
|
||||
break;
|
||||
} /* end for */
|
||||
|
||||
num_to_collapse = i;
|
||||
if (num_to_collapse == rank) num_to_collapse--;
|
||||
if (num_to_collapse == rank)
|
||||
num_to_collapse--;
|
||||
|
||||
assert(0<=num_to_collapse && num_to_collapse<rank);
|
||||
new_rank = rank - num_to_collapse;
|
||||
@ -259,21 +267,21 @@ H5S_mpio_hyper_type( const H5S_t *space, const size_t elmt_size,
|
||||
/* To collapse dims, just transform dimension info (from inner to outer) */
|
||||
/* must multiply r.h.s. by "count" --- ppw 03/11/99 */
|
||||
for (i=rank-1; i>=new_rank; --i) {
|
||||
d[i-1].block *= d[i].count * d[i].block;
|
||||
d[i-1].strid *= d[i].count * d[i].block;
|
||||
d[i-1].xtent *= d[i].count * d[i].block;
|
||||
assert( d[i].start == 0 );
|
||||
/* d[i-1].start stays unchanged */
|
||||
/* d[i-1].count stays unchanged */
|
||||
d[i-1].block *= d[i].count * d[i].block;
|
||||
d[i-1].strid *= d[i].count * d[i].block;
|
||||
d[i-1].xtent *= d[i].count * d[i].block;
|
||||
assert( d[i].start == 0 );
|
||||
/* d[i-1].start stays unchanged */
|
||||
/* d[i-1].count stays unchanged */
|
||||
}
|
||||
|
||||
/* check for possibility to coalesce blocks of the uncoalesced dimensions */
|
||||
for (i=0; i<new_rank; ++i) {
|
||||
if (d[i].strid == d[i].block) {
|
||||
/* transform smaller blocks to 1 larger block of combined size */
|
||||
d[i].strid = d[i].block *= d[i].count;
|
||||
d[i].count = 1;
|
||||
}
|
||||
/* transform smaller blocks to 1 larger block of combined size */
|
||||
d[i].strid = d[i].block *= d[i].count;
|
||||
d[i].count = 1;
|
||||
}
|
||||
}
|
||||
|
||||
/*******************************************************
|
||||
@ -281,14 +289,12 @@ H5S_mpio_hyper_type( const H5S_t *space, const size_t elmt_size,
|
||||
*******************************************************/
|
||||
#ifdef H5Smpi_DEBUG
|
||||
HDfprintf(stdout, "hyper_type: Making contig type %d MPI_BYTEs\n", elmt_size );
|
||||
for (i=new_rank-1; i>=0; --i) {
|
||||
HDfprintf(stdout, "d[%d].xtent=%Hu \n", i, d[i].xtent);
|
||||
}
|
||||
for (i=new_rank-1; i>=0; --i)
|
||||
HDfprintf(stdout, "d[%d].xtent=%Hu \n", i, d[i].xtent);
|
||||
#endif
|
||||
err = MPI_Type_contiguous( (int)elmt_size, MPI_BYTE, &inner_type );
|
||||
if (err) {
|
||||
HRETURN_ERROR(H5E_DATASPACE, H5E_MPI, FAIL,"couldn't create MPI contiguous type");
|
||||
}
|
||||
if (err)
|
||||
HRETURN_ERROR(H5E_DATASPACE, H5E_MPI, FAIL,"couldn't create MPI contiguous type");
|
||||
|
||||
/*******************************************************
|
||||
* Construct the type by walking the hyperslab dims
|
||||
@ -296,41 +302,40 @@ H5S_mpio_hyper_type( const H5S_t *space, const size_t elmt_size,
|
||||
*******************************************************/
|
||||
for ( i=new_rank-1; i>=0; --i) {
|
||||
#ifdef H5Smpi_DEBUG
|
||||
HDfprintf(stdout, "hyper_type: Dimension i=%d \n"
|
||||
"count=%Hu block=%Hu stride=%Hu\n",
|
||||
i, d[i].count, d[i].block, d[i].strid );
|
||||
HDfprintf(stdout, "hyper_type: Dimension i=%d \n"
|
||||
"count=%Hu block=%Hu stride=%Hu\n",
|
||||
i, d[i].count, d[i].block, d[i].strid );
|
||||
#endif
|
||||
|
||||
#ifdef H5Smpi_DEBUG
|
||||
HDfprintf(stdout, "hyper_type: i=%d Making vector-type \n", i);
|
||||
HDfprintf(stdout, "hyper_type: i=%d Making vector-type \n", i);
|
||||
#endif
|
||||
/****************************************
|
||||
* Build vector in current dimension:
|
||||
****************************************/
|
||||
err = MPI_Type_vector ( (int)(d[i].count), /* count */
|
||||
(int)(d[i].block), /* blocklength */
|
||||
err = MPI_Type_vector ( (int)(d[i].count), /* count */
|
||||
(int)(d[i].block), /* blocklength */
|
||||
(int)(d[i].strid), /* stride */
|
||||
inner_type, /* old type */
|
||||
&outer_type ); /* new type */
|
||||
|
||||
MPI_Type_free( &inner_type );
|
||||
if (err) {
|
||||
HRETURN_ERROR(H5E_DATASPACE, H5E_MPI, FAIL,"couldn't create MPI vector type");
|
||||
}
|
||||
MPI_Type_free( &inner_type );
|
||||
if (err)
|
||||
HRETURN_ERROR(H5E_DATASPACE, H5E_MPI, FAIL,"couldn't create MPI vector type");
|
||||
|
||||
displacement[1] = (MPI_Aint)elmt_size * max_xtent[i];
|
||||
err = MPI_Type_extent(outer_type, &extent_len);
|
||||
displacement[1] = (MPI_Aint)elmt_size * max_xtent[i];
|
||||
err = MPI_Type_extent(outer_type, &extent_len);
|
||||
|
||||
/*************************************************
|
||||
* Restructure this datatype ("outer_type")
|
||||
* so that it still starts at 0, but its extent
|
||||
* is the full extent in this dimension.
|
||||
*************************************************/
|
||||
if ((int)extent_len < displacement[1]) {
|
||||
if ((int)extent_len < displacement[1]) {
|
||||
|
||||
#ifdef H5Smpi_DEBUG
|
||||
HDfprintf(stdout, "hyper_type: i=%d Extending struct type\n"
|
||||
"***displacements: 0, %d\n", i, displacement[1]);
|
||||
HDfprintf(stdout, "hyper_type: i=%d Extending struct type\n"
|
||||
"***displacements: 0, %d\n", i, displacement[1]);
|
||||
#endif
|
||||
|
||||
#ifdef H5_HAVE_MPI2 /* have MPI-2 */
|
||||
@ -348,8 +353,8 @@ H5S_mpio_hyper_type( const H5S_t *space, const size_t elmt_size,
|
||||
old_type[0] = outer_type;
|
||||
old_type[1] = MPI_UB;
|
||||
#ifdef H5Smpi_DEBUG
|
||||
HDfprintf(stdout, "hyper_type: i=%d Extending struct type\n"
|
||||
"***displacements: 0, %d\n", i, displacement[1]);
|
||||
HDfprintf(stdout, "hyper_type: i=%d Extending struct type\n"
|
||||
"***displacements: 0, %d\n", i, displacement[1]);
|
||||
#endif
|
||||
err = MPI_Type_struct ( 2, /* count */
|
||||
block_length, /* blocklengths */
|
||||
@ -359,13 +364,12 @@ H5S_mpio_hyper_type( const H5S_t *space, const size_t elmt_size,
|
||||
#endif
|
||||
|
||||
MPI_Type_free (&outer_type);
|
||||
if (err) {
|
||||
if (err)
|
||||
HRETURN_ERROR(H5E_DATASPACE, H5E_MPI, FAIL,"couldn't resize MPI vector type");
|
||||
}
|
||||
}
|
||||
else {
|
||||
}
|
||||
else {
|
||||
inner_type = outer_type;
|
||||
}
|
||||
}
|
||||
} /* end for */
|
||||
/***************************
|
||||
* End of loop, walking
|
||||
@ -382,42 +386,39 @@ H5S_mpio_hyper_type( const H5S_t *space, const size_t elmt_size,
|
||||
***************************************************************/
|
||||
displacement[0] = 0;
|
||||
for (i=new_rank-1; i>=0; i--)
|
||||
displacement[0] += d[i].start * offset[i];
|
||||
displacement[0] += d[i].start * offset[i];
|
||||
|
||||
if (displacement[0] > 0) {
|
||||
displacement[0] *= elmt_size;
|
||||
block_length[0] = 1;
|
||||
old_type[0] = inner_type;
|
||||
displacement[0] *= elmt_size;
|
||||
block_length[0] = 1;
|
||||
old_type[0] = inner_type;
|
||||
|
||||
#ifdef H5Smpi_DEBUG
|
||||
HDfprintf(stdout, "hyper_type: Making final struct\n"
|
||||
"***count=1:\n");
|
||||
HDfprintf(stdout, "hyper_type: Making final struct\n***count=1:\n");
|
||||
HDfprintf(stdout, "\tblocklength[0]=%d; displacement[0]=%d\n",
|
||||
block_length[0], displacement[0]);
|
||||
#endif
|
||||
|
||||
err = MPI_Type_struct( 1, /* count */
|
||||
block_length, /* blocklengths */
|
||||
err = MPI_Type_struct( 1, /* count */
|
||||
block_length, /* blocklengths */
|
||||
displacement, /* displacements */
|
||||
old_type, /* old type */
|
||||
new_type ); /* new type */
|
||||
|
||||
if (err) {
|
||||
HRETURN_ERROR(H5E_DATASPACE, H5E_MPI, FAIL,"couldn't create MPI struct type");
|
||||
}
|
||||
MPI_Type_free (&old_type[0]);
|
||||
if (err) {
|
||||
if (err)
|
||||
HRETURN_ERROR(H5E_DATASPACE, H5E_MPI, FAIL,"couldn't create MPI struct type");
|
||||
|
||||
err=MPI_Type_free (&old_type[0]);
|
||||
if (err)
|
||||
HRETURN_ERROR(H5E_DATASPACE, H5E_MPI, FAIL,"couldn't resize MPI vector type");
|
||||
}
|
||||
}
|
||||
else {
|
||||
*new_type = inner_type;
|
||||
*new_type = inner_type;
|
||||
}
|
||||
|
||||
err = MPI_Type_commit( new_type );
|
||||
if (err) {
|
||||
HRETURN_ERROR(H5E_DATASPACE, H5E_MPI, FAIL,"couldn't commit MPI vector type");
|
||||
}
|
||||
if (err)
|
||||
HRETURN_ERROR(H5E_DATASPACE, H5E_MPI, FAIL,"couldn't commit MPI vector type");
|
||||
|
||||
/* fill in the remaining return values */
|
||||
*count = 1; /* only have to move one of these suckers! */
|
||||
@ -462,7 +463,7 @@ herr_t
|
||||
H5S_mpio_space_type( const H5S_t *space, const size_t elmt_size,
|
||||
/* out: */
|
||||
MPI_Datatype *new_type,
|
||||
hsize_t *count,
|
||||
size_t *count,
|
||||
hbool_t *is_derived_type )
|
||||
{
|
||||
int err;
|
||||
@ -477,31 +478,29 @@ H5S_mpio_space_type( const H5S_t *space, const size_t elmt_size,
|
||||
switch (space->extent.type) {
|
||||
case H5S_SCALAR:
|
||||
/* not yet implemented */
|
||||
ret_value = FAIL;
|
||||
ret_value = FAIL;
|
||||
break;
|
||||
|
||||
case H5S_SIMPLE:
|
||||
switch(space->select.type) {
|
||||
case H5S_SEL_NONE:
|
||||
case H5S_SEL_ALL:
|
||||
err = H5S_mpio_all_type( space, elmt_size,
|
||||
/* out: */ new_type, count, is_derived_type );
|
||||
if (err<0) {
|
||||
HRETURN_ERROR(H5E_DATASPACE, H5E_BADTYPE, FAIL,"couldn't convert \"all\" selection to MPI type");
|
||||
}
|
||||
err = H5S_mpio_all_type( space, elmt_size,
|
||||
/* out: */ new_type, count, is_derived_type );
|
||||
if (err<0)
|
||||
HRETURN_ERROR(H5E_DATASPACE, H5E_BADTYPE, FAIL,"couldn't convert \"all\" selection to MPI type");
|
||||
break;
|
||||
|
||||
case H5S_SEL_POINTS:
|
||||
/* not yet implemented */
|
||||
ret_value = FAIL;
|
||||
/* not yet implemented */
|
||||
ret_value = FAIL;
|
||||
break;
|
||||
|
||||
case H5S_SEL_HYPERSLABS:
|
||||
err = H5S_mpio_hyper_type( space, elmt_size,
|
||||
/* out: */ new_type, count, is_derived_type );
|
||||
if (err) {
|
||||
HRETURN_ERROR(H5E_DATASPACE, H5E_BADTYPE, FAIL,"couldn't convert \"all\" selection to MPI type");
|
||||
}
|
||||
err = H5S_mpio_hyper_type( space, elmt_size,
|
||||
/* out: */ new_type, count, is_derived_type );
|
||||
if (err)
|
||||
HRETURN_ERROR(H5E_DATASPACE, H5E_BADTYPE, FAIL,"couldn't convert \"all\" selection to MPI type");
|
||||
break;
|
||||
|
||||
default:
|
||||
@ -512,7 +511,7 @@ H5S_mpio_space_type( const H5S_t *space, const size_t elmt_size,
|
||||
|
||||
case H5S_COMPLEX:
|
||||
/* not yet implemented */
|
||||
ret_value = FAIL;
|
||||
ret_value = FAIL;
|
||||
break;
|
||||
|
||||
default:
|
||||
@ -560,7 +559,7 @@ H5S_mpio_spaces_xfer(H5F_t *f, const struct H5O_layout_t *layout,
|
||||
int err;
|
||||
haddr_t disp, addr;
|
||||
size_t mpi_count;
|
||||
hsize_t mpi_buf_count, mpi_unused_count;
|
||||
size_t mpi_buf_count, mpi_unused_count;
|
||||
MPI_Datatype mpi_buf_type, mpi_file_type;
|
||||
hbool_t mbt_is_derived=0,
|
||||
mft_is_derived=0;
|
||||
@ -654,10 +653,6 @@ H5S_mpio_spaces_xfer(H5F_t *f, const struct H5O_layout_t *layout,
|
||||
/* transfer the data */
|
||||
H5_CHECK_OVERFLOW(mpi_buf_count, hsize_t, size_t);
|
||||
mpi_count = (size_t)mpi_buf_count;
|
||||
if (mpi_count != mpi_buf_count) {
|
||||
HGOTO_ERROR(H5E_DATASPACE, H5E_BADTYPE, FAIL,
|
||||
"transfer size overflows size_t");
|
||||
}
|
||||
if (do_write) {
|
||||
err = H5FD_write(f->shared->lf, H5FD_MEM_DRAW, dxpl_id, addr, mpi_count, buf);
|
||||
if (err) {
|
||||
|
||||
Loading…
Reference in New Issue
Block a user