mirror/hdf5
2
0
Fork 0
mirror of https://github.com/HDFGroup/hdf5.git synced 2025-02-17 16:10:24 +08:00
Code Issues Packages Projects Releases Wiki Activity

[svn-r17076] bug fix: h5repack was not applying a requested contiguous layout for a dataset with filters

Browse Source 
added a test to the C program test (not to the script), that verifies the layout and filters

tested: windows (development and tested manually) , linux, solaris
This commit is contained in:
Pedro Vicente Nunes 2009-06-17 13:32:04 -05:00
parent 2a876ea086
commit 98d6ce7de1
3 changed files with 41 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
tools/h5repack/h5repack_filters.c
View File

@ -445,14 +445,22 @@ int apply_filters(const char* name, /* object name from traverse list */
if (H5Pset_layout(dcpl_id, obj.layout)<0)
return -1;
if (H5D_CHUNKED==obj.layout) { /* set up chunk */
if (H5D_CHUNKED == obj.layout)
{
if(H5Pset_chunk(dcpl_id, obj.chunk.rank, obj.chunk.chunk_lengths)<0)
return -1;
}
else if (H5D_COMPACT==obj.layout) {
else if (H5D_COMPACT == obj.layout)
{
if (H5Pset_alloc_time(dcpl_id, H5D_ALLOC_TIME_EARLY)<0)
return -1;
}
/* remove filters for the H5D_CONTIGUOUS case */
else if (H5D_CONTIGUOUS == obj.layout)
{
if (H5Premove_filter(dcpl_id,H5Z_FILTER_ALL)<0)
return -1;
}
}

32
tools/h5repack/h5repack_verify.c
View File

@ -18,8 +18,8 @@
#include "h5tools_utils.h"
extern char *progname;
static int has_layout(hid_t pid, pack_info_t *obj);
static int has_filters(hid_t pid, hid_t tid, int nfilters, filter_info_t *filter);
static int verify_layout(hid_t pid, pack_info_t *obj);
static int verify_filters(hid_t pid, hid_t tid, int nfilters, filter_info_t *filter);
/*-------------------------------------------------------------------------
@ -82,7 +82,7 @@ int h5repack_verify(const char *fname,
* filter check
*-------------------------------------------------------------------------
*/
if(has_filters(pid, tid, obj->nfilters, obj->filter) <= 0)
if(verify_filters(pid, tid, obj->nfilters, obj->filter) <= 0)
ok = 0;
@ -90,7 +90,7 @@ int h5repack_verify(const char *fname,
* layout check
*-------------------------------------------------------------------------
*/
if((obj->layout != -1) && (has_layout(pid, obj) == 0))
if((obj->layout != -1) && (verify_layout(pid, obj) == 0))
ok = 0;
/*-------------------------------------------------------------------------
@ -151,7 +151,7 @@ int h5repack_verify(const char *fname,
if(options->all_filter == 1)
{
if(has_filters(pid, tid, options->n_filter_g, options->filter_g) <= 0)
if(verify_filters(pid, tid, options->n_filter_g, options->filter_g) <= 0)
ok = 0;
}
@ -165,7 +165,7 @@ int h5repack_verify(const char *fname,
init_packobject(&pack);
pack.layout = options->layout_g;
pack.chunk = options->chunk_g;
if(has_layout(pid, &pack) == 0)
if(verify_layout(pid, &pack) == 0)
ok = 0;
}
@ -215,13 +215,13 @@ error:
/*-------------------------------------------------------------------------
* Function: has_layout
* Function: verify_layout
*
* Purpose: verify which layout is present in the property list DCPL_ID
*
* H5D_COMPACT = 0
* H5D_CONTIGUOUS = 1
* H5D_CHUNKED = 2
* H5D_CHUNKED = 2
*
* Return: 1 has, 0 does not, -1 error
*
@ -232,8 +232,8 @@ error:
*-------------------------------------------------------------------------
*/
int has_layout(hid_t pid,
pack_info_t *obj)
int verify_layout(hid_t pid,
pack_info_t *obj)
{
hsize_t chsize[64]; /* chunk size in elements */
H5D_layout_t layout; /* layout */
@ -241,17 +241,13 @@ int has_layout(hid_t pid,
int rank; /* rank */
int i; /* index */
/* if no information about the input layout is requested return exit */
if (obj==NULL)
return 1;
/* check if we have filters in the input object */
if ((nfilters = H5Pget_nfilters(pid)) < 0)
return -1;
/* a non chunked layout was requested on a filtered object; avoid the test */
/* a non chunked layout was requested on a filtered object */
if (nfilters && obj->layout!=H5D_CHUNKED)
return 1;
return 0;
/* get layout */
if ((layout = H5Pget_layout(pid)) < 0)
@ -458,7 +454,7 @@ error:
/*-------------------------------------------------------------------------
* Function: has_filters
* Function: verify_filters
*
* Purpose: verify if all requested filters in the array FILTER obtained
* from user input are present in the property list PID obtained from
@ -477,7 +473,7 @@ error:
*/
static
int has_filters(hid_t pid, hid_t tid, int nfilters, filter_info_t *filter)
int verify_filters(hid_t pid, hid_t tid, int nfilters, filter_info_t *filter)
{
int nfilters_dcpl; /* number of filters in DCPL*/
unsigned filt_flags; /* filter flags */

17
tools/h5repack/h5repacktst.c
View File

@ -659,6 +659,23 @@ int main (void)
if (h5repack_end (&pack_options) < 0)
GOERROR;
/*-------------------------------------------------------------------------
* do the same test for a file with filters (chunked)
*-------------------------------------------------------------------------
*/
if (h5repack_init (&pack_options, 0) < 0)
GOERROR;
if (h5repack_addlayout("CONTI",&pack_options) < 0)
GOERROR;
if (h5repack(FNAME8,FNAME8OUT,&pack_options) < 0)
GOERROR;
if (h5diff(FNAME8,FNAME8OUT,NULL,NULL,&diff_options) >0)
GOERROR;
if (h5repack_verify(FNAME8OUT,&pack_options)<=0)
GOERROR;
if (h5repack_end (&pack_options) < 0)
GOERROR;
PASSED();
TESTING(" adding layout compact");