mirror/hdf5
2
0
Fork 0
mirror of https://github.com/HDFGroup/hdf5.git synced 2025-03-01 16:28:09 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1886 in HDFFV/hdf5 from ~DEROBINS/hdf5_der:develop_minor_pr to develop

Browse Source 
* commit 'e747237a9c03e551eef017cf4a0de5d67ca4fd71':
  Removed unnecessary H5S_FRIEND and dead code.
This commit is contained in:
Dana Robinson 2019-08-20 19:55:41 -05:00
commit f0272e4945
1 changed files with 23 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

80
testpar/t_span_tree.c
View File

@ -32,14 +32,7 @@
*/
#define H5S_FRIEND /*suppress error about including H5Spkg */
/* Define this macro to indicate that the testing APIs should be available */
#define H5S_TESTING
#include "hdf5.h"
#include "H5private.h"
#include "H5Spkg.h" /* Dataspaces */
#include "testphdf5.h"
@ -51,7 +44,7 @@ static void coll_read_test(int chunk_factor);
* Function: coll_irregular_cont_write
*
* Purpose: Wrapper to test the collectively irregular hyperslab write in
contiguous storage
* contiguous storage
*
* Return: Success: 0
*
@ -76,7 +69,7 @@ coll_irregular_cont_write(void)
* Function: coll_irregular_cont_read
*
* Purpose: Wrapper to test the collectively irregular hyperslab read in
contiguous storage
* contiguous storage
*
* Return: Success: 0
*
@ -100,7 +93,7 @@ coll_irregular_cont_read(void)
* Function: coll_irregular_simple_chunk_write
*
* Purpose: Wrapper to test the collectively irregular hyperslab write in
chunk storage(1 chunk)
* chunk storage(1 chunk)
*
* Return: Success: 0
*
@ -125,7 +118,7 @@ coll_irregular_simple_chunk_write(void)
* Function: coll_irregular_simple_chunk_read
*
* Purpose: Wrapper to test the collectively irregular hyperslab read in chunk
storage(1 chunk)
* storage(1 chunk)
*
* Return: Success: 0
*
@ -148,7 +141,7 @@ coll_irregular_simple_chunk_read(void)
* Function: coll_irregular_complex_chunk_write
*
* Purpose: Wrapper to test the collectively irregular hyperslab write in chunk
storage(4 chunks)
* storage(4 chunks)
*
* Return: Success: 0
*
@ -173,7 +166,7 @@ coll_irregular_complex_chunk_write(void)
* Function: coll_irregular_complex_chunk_read
*
* Purpose: Wrapper to test the collectively irregular hyperslab read in chunk
storage(1 chunk)
* storage(1 chunk)
*
* Return: Success: 0
*
@ -197,9 +190,9 @@ coll_irregular_complex_chunk_read(void)
* Function: coll_write_test
*
* Purpose: To test the collectively irregular hyperslab write in chunk
storage
* storage
* Input: number of chunks on each dimension
if number is equal to 0, contiguous storage
* if number is equal to 0, contiguous storage
* Return: Success: 0
*
* Failure: -1
@ -217,19 +210,11 @@ void coll_write_test(int chunk_factor)
hid_t file, datasetc,dataseti; /* File and dataset identifiers */
hid_t mspaceid1, mspaceid, fspaceid,fspaceid1; /* Dataspace identifiers */
hsize_t mdim1[1],fsdim[2],mdim[2];
#if 0
hsize_t mdim1[] = {MSPACE1_DIM}; /* Dimension size of the first dataset
(in memory) */
hsize_t fsdim[] = {FSPACE_DIM1, FSPACE_DIM2}; /* Dimension sizes of the dataset
(on disk) */
hsize_t mdim[] = {MSPACE_DIM1, MSPACE_DIM2}; /* Dimension sizes of the
dataset in memory when we
read selection from the
dataset on the disk */
#endif
hsize_t mdim1[1]; /* Dimension size of the first dataset (in memory) */
hsize_t fsdim[2]; /* Dimension sizes of the dataset (on disk) */
hsize_t mdim[2]; /* Dimension sizes of the dataset in memory when we
* read selection from the dataset on the disk
*/
hsize_t start[2]; /* Start of hyperslab */
hsize_t stride[2]; /* Stride of hyperslab */
@ -241,15 +226,9 @@ void coll_write_test(int chunk_factor)
unsigned i;
int fillvalue = 0; /* Fill value for the dataset */
#if 0
int matrix_out[MSPACE_DIM1][MSPACE_DIM2];
int matrix_out1[MSPACE_DIM1][MSPACE_DIM2]; /* Buffer to read from the
dataset */
int vector[MSPACE1_DIM];
#endif
int *matrix_out = NULL, *matrix_out1 = NULL, *vector = NULL;
int *matrix_out = NULL;
int *matrix_out1 = NULL; /* Buffer to read from the dataset */
int *vector = NULL;
int mpi_size,mpi_rank;
@ -670,9 +649,9 @@ void coll_write_test(int chunk_factor)
* Function: coll_read_test
*
* Purpose: To test the collectively irregular hyperslab read in chunk
storage
* storage
* Input: number of chunks on each dimension
if number is equal to 0, contiguous storage
* if number is equal to 0, contiguous storage
* Return: Success: 0
*
* Failure: -1
@ -693,14 +672,10 @@ coll_read_test(int chunk_factor)
/* Dimension sizes of the dataset (on disk) */
#if 0
hsize_t mdim[] = {MSPACE_DIM1, MSPACE_DIM2}; /* Dimension sizes of the
dataset in memory when we
read selection from the
dataset on the disk */
hsize_t mdim[2]; /* Dimension sizes of the dataset in memory when we
* read selection from the dataset on the disk
*/
#endif
hsize_t mdim[2];
hsize_t start[2]; /* Start of hyperslab */
hsize_t stride[2]; /* Stride of hyperslab */
hsize_t count[2]; /* Block count */
@ -710,13 +685,8 @@ coll_read_test(int chunk_factor)
unsigned i;
int *matrix_out;
int *matrix_out1;
#if 0
int matrix_out[MSPACE_DIM1][MSPACE_DIM2];
int matrix_out1[MSPACE_DIM1][MSPACE_DIM2]; /* Buffer to read from the
dataset */
int *matrix_out1; /* Buffer to read from the dataset */
#endif
int mpi_size,mpi_rank;
MPI_Comm comm = MPI_COMM_WORLD;
@ -923,7 +893,7 @@ coll_read_test(int chunk_factor)
ret = H5Fclose(file);
VRFY((ret >= 0),"");
return ;
return;
}
@ -2602,10 +2572,6 @@ lower_dim_size_comp_test(void)
int chunk_edge_size = 0;
int use_collective_io;
#if 0
HDsleep(60);
#endif
HDcompile_assert(sizeof(uint32_t) == sizeof(unsigned));
for(use_collective_io = 0; use_collective_io <= 1; use_collective_io++) {
chunk_edge_size = 0;