diff options
Diffstat (limited to 'src/H5Dmpio.c')
| -rw-r--r-- | src/H5Dmpio.c | 226 |
1 files changed, 113 insertions, 113 deletions
diff --git a/src/H5Dmpio.c b/src/H5Dmpio.c index a9940c7..7a8b121 100644 --- a/src/H5Dmpio.c +++ b/src/H5Dmpio.c @@ -497,7 +497,7 @@ H5D__mpio_parse_debug_str(const char *s) { FUNC_ENTER_PACKAGE_NOERR - HDassert(s); + assert(s); while (*s) { int c = (int)(*s); @@ -544,7 +544,7 @@ H5D__mpio_debug_init(void) FUNC_ENTER_PACKAGE_NOERR - HDassert(!H5D_mpio_debug_inited); + assert(!H5D_mpio_debug_inited); /* Clear the debug flag buffer */ HDmemset(H5D_mpio_debug_flags_s, 0, sizeof(H5D_mpio_debug_flags_s)); @@ -596,11 +596,11 @@ H5D__mpio_opt_possible(H5D_io_info_t *io_info) FUNC_ENTER_PACKAGE /* Check args */ - HDassert(io_info); + assert(io_info); for (i = 0; i < io_info->count; i++) { - HDassert(io_info->dsets_info[i].file_space); - HDassert(io_info->dsets_info[i].mem_space); + assert(io_info->dsets_info[i].file_space); + assert(io_info->dsets_info[i].mem_space); } /* For independent I/O, get out quickly and don't try to form consensus */ @@ -671,7 +671,7 @@ H5D__mpio_opt_possible(H5D_io_info_t *io_info) if ((io_info->use_select_io == H5D_SELECTION_IO_MODE_OFF) && local_cause[0] && !(local_cause[0] & ~((unsigned)H5D_MPIO_DATATYPE_CONVERSION | (unsigned)H5D_MPIO_DATA_TRANSFORMS))) { - HDassert(io_info->no_selection_io_cause & H5D_MPIO_NO_SELECTION_IO_CAUSES); + assert(io_info->no_selection_io_cause & H5D_MPIO_NO_SELECTION_IO_CAUSES); local_cause[0] |= H5D_MPIO_NO_SELECTION_IO; } @@ -741,8 +741,8 @@ H5D__mpio_opt_possible(H5D_io_info_t *io_info) * selection I/O and re-enable collective I/O since it's supported by selection I/O */ if (global_cause[0] && !(global_cause[0] & ~((unsigned)H5D_MPIO_DATATYPE_CONVERSION | (unsigned)H5D_MPIO_DATA_TRANSFORMS))) { - HDassert(!(local_cause[0] & - ~((unsigned)H5D_MPIO_DATATYPE_CONVERSION | (unsigned)H5D_MPIO_DATA_TRANSFORMS))); + assert(!(local_cause[0] & + ~((unsigned)H5D_MPIO_DATATYPE_CONVERSION | (unsigned)H5D_MPIO_DATA_TRANSFORMS))); local_cause[0] = 0; global_cause[0] = 0; io_info->use_select_io = H5D_SELECTION_IO_MODE_ON; @@ -800,7 +800,7 @@ H5D__mpio_get_no_coll_cause_strings(char *local_cause, size_t local_cause_len, c FUNC_ENTER_PACKAGE - HDassert((local_cause && local_cause_len > 0) || (global_cause && global_cause_len > 0)); + assert((local_cause && local_cause_len > 0) || (global_cause && global_cause_len > 0)); /* * Use compile-time assertion so this routine is updated @@ -867,7 +867,7 @@ H5D__mpio_get_no_coll_cause_strings(char *local_cause, size_t local_cause_len, c case H5D_MPIO_COLLECTIVE: case H5D_MPIO_NO_COLLECTIVE_MAX_CAUSE: default: - HDassert(0 && "invalid no collective cause reason"); + assert(0 && "invalid no collective cause reason"); break; } @@ -1049,7 +1049,7 @@ H5D__mpio_get_sum_chunk_dset(const H5D_io_info_t *io_info, const H5D_dset_io_inf /* Check for non-chunked dataset, in this case we know the number of "chunks" * is simply the mpi size */ - HDassert(dset_info->layout->type == H5D_CHUNKED); + assert(dset_info->layout->type == H5D_CHUNKED); /* Get the number of chunks to perform I/O on */ num_chunkf = 0; @@ -1122,9 +1122,9 @@ H5D__piece_io(H5D_io_info_t *io_info) FUNC_ENTER_PACKAGE /* Sanity checks */ - HDassert(io_info); - HDassert(io_info->using_mpi_vfd); - HDassert(io_info->count > 0); + assert(io_info); + assert(io_info->using_mpi_vfd); + assert(io_info->count > 0); /* Obtain the current rank of the process and the number of ranks */ if ((mpi_rank = H5F_mpi_get_rank(io_info->dsets_info[0].dset->oloc.file)) < 0) @@ -1244,7 +1244,7 @@ H5D__piece_io(H5D_io_info_t *io_info) } else { /* Chunked I/O path */ - HDassert(io_info->dsets_info[i].layout->type == H5D_CHUNKED); + assert(io_info->dsets_info[i].layout->type == H5D_CHUNKED); /* Recalculate io_option if necessary */ if (recalc_io_option) { @@ -1472,7 +1472,7 @@ H5D__link_piece_collective_io(H5D_io_info_t *io_info, int H5_ATTR_UNUSED mpi_ran /* set actual_io_mode */ for (i = 0; i < io_info->count; i++) { - HDassert(io_info->dsets_info[i].dset->shared->dcpl_cache.pline.nused == 0); + assert(io_info->dsets_info[i].dset->shared->dcpl_cache.pline.nused == 0); if (io_info->dsets_info[i].layout->type == H5D_CHUNKED) actual_io_mode |= H5D_MPIO_CHUNK_COLLECTIVE; else if (io_info->dsets_info[i].layout->type == H5D_CONTIGUOUS) @@ -1512,9 +1512,9 @@ H5D__link_piece_collective_io(H5D_io_info_t *io_info, int H5_ATTR_UNUSED mpi_ran hbool_t need_sort = FALSE; /* Check if sel_pieces array is sorted */ - HDassert(io_info->sel_pieces[0]->faddr != HADDR_UNDEF); + assert(io_info->sel_pieces[0]->faddr != HADDR_UNDEF); for (i = 1; i < num_chunk; i++) { - HDassert(io_info->sel_pieces[i]->faddr != HADDR_UNDEF); + assert(io_info->sel_pieces[i]->faddr != HADDR_UNDEF); if (io_info->sel_pieces[i]->faddr < io_info->sel_pieces[i - 1]->faddr) { need_sort = TRUE; @@ -1595,7 +1595,7 @@ H5D__link_piece_collective_io(H5D_io_info_t *io_info, int H5_ATTR_UNUSED mpi_ran /* Sanity check */ if (is_permuted) - HDassert(permute_map); + assert(permute_map); if (H5S_mpio_space_type(piece_info->mspace, piece_info->dset_info->type_info.dst_type_size, &chunk_mtype[i], &chunk_mpi_mem_counts[i], &(chunk_mbt_is_derived_array[i]), FALSE, /* this is a memory @@ -1615,7 +1615,7 @@ H5D__link_piece_collective_io(H5D_io_info_t *io_info, int H5_ATTR_UNUSED mpi_ran HGOTO_ERROR(H5E_DATASPACE, H5E_BADTYPE, FAIL, "couldn't create MPI buf type") /* Sanity check */ if (is_permuted) - HDassert(!permute_map); + assert(!permute_map); /* Piece address relative to the first piece addr * Assign piece address to MPI displacement @@ -1813,7 +1813,7 @@ H5D__link_chunk_filtered_collective_io(H5D_io_info_t *io_info, H5D_dset_io_info_ FUNC_ENTER_PACKAGE_TAG(dset_info->dset->oloc.addr) - HDassert(io_info); + assert(io_info); #ifdef H5Dmpio_DEBUG H5D_MPIO_TRACE_ENTER(mpi_rank); @@ -1860,7 +1860,7 @@ H5D__link_chunk_filtered_collective_io(H5D_io_info_t *io_info, H5D_dset_io_info_ "unable to send chunk modification data between MPI ranks") /* Make sure the local chunk list was updated correctly */ - HDassert(chunk_list_num_entries == rank_chunks_assigned_map[mpi_rank]); + assert(chunk_list_num_entries == rank_chunks_assigned_map[mpi_rank]); } /* Proceed to update all the chunks this rank owns with its own @@ -2012,7 +2012,7 @@ H5D__multi_chunk_collective_io(H5D_io_info_t *io_info, H5D_dset_io_info_t *dset_ FUNC_ENTER_PACKAGE_TAG(dset_info->dset->oloc.addr) - HDassert(dset_info->layout->type == H5D_CHUNKED); + assert(dset_info->layout->type == H5D_CHUNKED); /* Get the current I/O collective opt mode so we can restore it later */ if (H5CX_get_mpio_coll_opt(&orig_coll_opt_mode) < 0) @@ -2023,7 +2023,7 @@ H5D__multi_chunk_collective_io(H5D_io_info_t *io_info, H5D_dset_io_info_t *dset_ /* Retrieve total # of chunks in dataset */ H5_CHECKED_ASSIGN(total_chunk, size_t, dset_info->layout->u.chunk.nchunks, hsize_t); - HDassert(total_chunk != 0); + assert(total_chunk != 0); /* Allocate memories */ chunk_io_option = (uint8_t *)H5MM_calloc(total_chunk); @@ -2068,8 +2068,8 @@ H5D__multi_chunk_collective_io(H5D_io_info_t *io_info, H5D_dset_io_info_t *dset_ /* Check if this chunk is the next chunk in the skip list, if there are * selected chunks left to process */ - HDassert(!num_chunk || next_chunk_info); - HDassert(!num_chunk || next_chunk_info->index >= u); + assert(!num_chunk || next_chunk_info); + assert(!num_chunk || next_chunk_info->index >= u); if (num_chunk && next_chunk_info->index == u) { /* Next chunk is this chunk */ chunk_info = next_chunk_info; @@ -2139,7 +2139,7 @@ H5D__multi_chunk_collective_io(H5D_io_info_t *io_info, H5D_dset_io_info_t *dset_ u); #endif - HDassert(chunk_io_option[u] == 0); + assert(chunk_io_option[u] == 0); /* Set the file & memory dataspaces */ if (chunk_info) { @@ -2289,7 +2289,7 @@ H5D__multi_chunk_filtered_collective_io(H5D_io_info_t *io_info, H5D_dset_io_info FUNC_ENTER_PACKAGE_TAG(dset_info->dset->oloc.addr) - HDassert(io_info); + assert(io_info); #ifdef H5Dmpio_DEBUG H5D_MPIO_TRACE_ENTER(mpi_rank); @@ -2518,7 +2518,7 @@ H5D__inter_collective_io(H5D_io_info_t *io_info, const H5D_dset_io_info_t *di, H HGOTO_ERROR(H5E_IO, H5E_MPI, FAIL, "unable to obtain MPI rank") #endif - HDassert(io_info); + assert(io_info); if ((file_space != NULL) && (mem_space != NULL)) { int mpi_file_count; /* Number of file "objects" to transfer */ @@ -2528,7 +2528,7 @@ H5D__inter_collective_io(H5D_io_info_t *io_info, const H5D_dset_io_info_t *di, H point selection of the file space */ hbool_t is_permuted = FALSE; - HDassert(di); + assert(di); /* Obtain disk and memory MPI derived datatype */ /* NOTE: The permute_map array can be allocated within H5S_mpio_space_type @@ -2550,7 +2550,7 @@ H5D__inter_collective_io(H5D_io_info_t *io_info, const H5D_dset_io_info_t *di, H HGOTO_ERROR(H5E_DATASPACE, H5E_BADTYPE, FAIL, "couldn't create MPI file type") /* Sanity check */ if (is_permuted) - HDassert(permute_map); + assert(permute_map); if (H5S_mpio_space_type(mem_space, di->type_info.src_type_size, &mpi_buf_type, &mpi_buf_count, &mbt_is_derived, /* OUT: datatype created */ FALSE, /* this is a memory space, so if @@ -2569,7 +2569,7 @@ H5D__inter_collective_io(H5D_io_info_t *io_info, const H5D_dset_io_info_t *di, H HGOTO_ERROR(H5E_DATASPACE, H5E_BADTYPE, FAIL, "couldn't create MPI buffer type") /* Sanity check */ if (is_permuted) - HDassert(!permute_map); + assert(!permute_map); } /* end if */ else { /* For non-selection, participate with a none MPI derived datatype, the count is 0. */ @@ -2898,7 +2898,7 @@ H5D__obtain_mpio_mode(H5D_io_info_t *io_info, H5D_dset_io_info_t *di, uint8_t as FUNC_ENTER_PACKAGE - HDassert(di->layout->type == H5D_CHUNKED); + assert(di->layout->type == H5D_CHUNKED); /* Assign the rank 0 to the root */ root = 0; @@ -3038,7 +3038,7 @@ done: if (mergebuf) H5MM_free(mergebuf); if (recv_io_mode_info) { - HDassert(mpi_rank == root); + assert(mpi_rank == root); H5MM_free(recv_io_mode_info); } /* end if */ @@ -3074,16 +3074,16 @@ H5D__mpio_collective_filtered_chunk_io_setup(const H5D_io_info_t *io_info, const FUNC_ENTER_PACKAGE - HDassert(io_info); - HDassert(di); - HDassert(chunk_list); - HDassert(num_entries); + assert(io_info); + assert(di); + assert(chunk_list); + assert(num_entries); #ifdef H5Dmpio_DEBUG H5D_MPIO_TRACE_ENTER(mpi_rank); H5D_MPIO_TIME_START(mpi_rank, "Filtered Collective I/O Setup"); #endif - HDassert(di->layout->type == H5D_CHUNKED); + assert(di->layout->type == H5D_CHUNKED); /* Each rank builds a local list of the chunks they have selected */ if ((num_chunks_selected = H5SL_count(di->layout_io_info.chunk_map->dset_sel_pieces))) { @@ -3293,9 +3293,9 @@ H5D__mpio_redistribute_shared_chunks(H5D_filtered_collective_io_info_t *chunk_li FUNC_ENTER_PACKAGE - HDassert(chunk_list || 0 == chunk_list_num_entries); - HDassert(io_info); - HDassert(mpi_size > 1); /* No chunk sharing is possible for MPI Comm size of 1 */ + assert(chunk_list || 0 == chunk_list_num_entries); + assert(io_info); + assert(mpi_size > 1); /* No chunk sharing is possible for MPI Comm size of 1 */ #ifdef H5Dmpio_DEBUG H5D_MPIO_TRACE_ENTER(mpi_rank); @@ -3436,10 +3436,10 @@ H5D__mpio_redistribute_shared_chunks_int(H5D_filtered_collective_io_info_t *chun FUNC_ENTER_PACKAGE - HDassert(num_chunks_assigned_map); - HDassert(chunk_list || 0 == num_chunks_assigned_map[mpi_rank]); - HDassert(io_info); - HDassert(mpi_size > 1); + assert(num_chunks_assigned_map); + assert(chunk_list || 0 == num_chunks_assigned_map[mpi_rank]); + assert(io_info); + assert(mpi_size > 1); #ifdef H5Dmpio_DEBUG H5D_MPIO_TRACE_ENTER(mpi_rank); @@ -3577,7 +3577,7 @@ H5D__mpio_redistribute_shared_chunks_int(H5D_filtered_collective_io_info_t *chun } while (++i < coll_chunk_list_num_entries && chunk_entry->chunk_idx == curr_chunk_idx); /* We should never have more writers to a chunk than the number of MPI ranks */ - HDassert(num_writers <= mpi_size); + assert(num_writers <= mpi_size); /* Set all processed chunk entries' "new_owner" and "num_writers" fields */ for (; set_begin_index < i; set_begin_index++) { @@ -3772,13 +3772,13 @@ H5D__mpio_share_chunk_modification_data(H5D_filtered_collective_io_info_t *chunk FUNC_ENTER_PACKAGE - HDassert(chunk_list_num_entries); - HDassert(chunk_list || 0 == *chunk_list_num_entries); - HDassert(io_info); - HDassert(dset_info); - HDassert(mpi_size > 1); - HDassert(chunk_msg_bufs); - HDassert(chunk_msg_bufs_len); + assert(chunk_list_num_entries); + assert(chunk_list || 0 == *chunk_list_num_entries); + assert(io_info); + assert(dset_info); + assert(mpi_size > 1); + assert(chunk_msg_bufs); + assert(chunk_msg_bufs_len); #ifdef H5Dmpio_DEBUG H5D_MPIO_TRACE_ENTER(mpi_rank); @@ -3990,7 +3990,7 @@ H5D__mpio_share_chunk_modification_data(H5D_filtered_collective_io_info_t *chunk if (msg_size <= 0) HGOTO_ERROR(H5E_DATASET, H5E_BADVALUE, FAIL, "invalid chunk modification message size") - HDassert((num_recv_requests + 1) <= num_msgs_incoming); + assert((num_recv_requests + 1) <= num_msgs_incoming); if (NULL == (msg_recv_bufs[num_recv_requests] = H5MM_malloc((size_t)msg_size * sizeof(unsigned char)))) HGOTO_ERROR(H5E_DATASET, H5E_CANTALLOC, FAIL, @@ -4176,8 +4176,8 @@ H5D__mpio_collective_filtered_chunk_common_io(H5D_filtered_collective_io_info_t FUNC_ENTER_PACKAGE - HDassert(chunk_list || 0 == chunk_list_num_entries); - HDassert(io_info); + assert(chunk_list || 0 == chunk_list_num_entries); + assert(io_info); /* Initialize temporary I/O info */ coll_io_info = *io_info; @@ -4198,7 +4198,7 @@ H5D__mpio_collective_filtered_chunk_common_io(H5D_filtered_collective_io_info_t */ if (io_info->op_type == H5D_IO_OP_READ) { for (i = 0, num_chunks = 0; i < chunk_list_num_entries; i++) { - HDassert(chunk_list[i].buf); + assert(chunk_list[i].buf); if (chunk_list[i].need_read) { if (!H5_addr_defined(base_read_offset)) @@ -4297,9 +4297,9 @@ H5D__mpio_collective_filtered_chunk_read(H5D_filtered_collective_io_info_t *chun FUNC_ENTER_PACKAGE - HDassert(chunk_list || 0 == chunk_list_num_entries); - HDassert(io_info); - HDassert(di); + assert(chunk_list || 0 == chunk_list_num_entries); + assert(io_info); + assert(di); #ifdef H5Dmpio_DEBUG H5D_MPIO_TRACE_ENTER(mpi_rank); @@ -4342,7 +4342,7 @@ H5D__mpio_collective_filtered_chunk_read(H5D_filtered_collective_io_info_t *chun * chunk size would of course be bad. */ for (i = 0; i < chunk_list_num_entries; i++) { - HDassert(chunk_list[i].need_read); + assert(chunk_list[i].need_read); chunk_list[i].chunk_buf_size = MAX(chunk_list[i].chunk_current.length, file_chunk_size); @@ -4379,7 +4379,7 @@ H5D__mpio_collective_filtered_chunk_read(H5D_filtered_collective_io_info_t *chun if (!fb_info_init) { hsize_t chunk_dims[H5S_MAX_RANK]; - HDassert(di->dset->shared->ndims == di->dset->shared->layout.u.chunk.ndims - 1); + assert(di->dset->shared->ndims == di->dset->shared->layout.u.chunk.ndims - 1); for (size_t j = 0; j < di->dset->shared->layout.u.chunk.ndims - 1; j++) chunk_dims[j] = (hsize_t)di->dset->shared->layout.u.chunk.dim[j]; @@ -4400,7 +4400,7 @@ H5D__mpio_collective_filtered_chunk_read(H5D_filtered_collective_io_info_t *chun } /* Write fill value to memory buffer */ - HDassert(fb_info.fill_buf); + assert(fb_info.fill_buf); if (H5D__fill(fb_info.fill_buf, di->dset->shared->type, chunk_list[i].buf, di->type_info.mem_type, fill_space) < 0) HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, FAIL, "couldn't fill chunk buffer with fill value") @@ -4520,10 +4520,10 @@ H5D__mpio_collective_filtered_chunk_update(H5D_filtered_collective_io_info_t *ch FUNC_ENTER_PACKAGE - HDassert(chunk_list || 0 == chunk_list_num_entries); - HDassert((chunk_msg_bufs && chunk_hash_table) || 0 == chunk_msg_bufs_len); - HDassert(io_info); - HDassert(di); + assert(chunk_list || 0 == chunk_list_num_entries); + assert((chunk_msg_bufs && chunk_hash_table) || 0 == chunk_msg_bufs_len); + assert(io_info); + assert(di); #ifdef H5Dmpio_DEBUG H5D_MPIO_TRACE_ENTER(mpi_rank); @@ -4532,7 +4532,7 @@ H5D__mpio_collective_filtered_chunk_update(H5D_filtered_collective_io_info_t *ch /* Set convenience pointers */ type_info = &(di->type_info); - HDassert(type_info); + assert(type_info); if (chunk_list_num_entries) { /* Retrieve filter settings from API context */ @@ -4570,7 +4570,7 @@ H5D__mpio_collective_filtered_chunk_update(H5D_filtered_collective_io_info_t *ch * chunk size would of course be bad. */ for (i = 0; i < chunk_list_num_entries; i++) { - HDassert(mpi_rank == chunk_list[i].new_owner); + assert(mpi_rank == chunk_list[i].new_owner); chunk_list[i].chunk_buf_size = MAX(chunk_list[i].chunk_current.length, file_chunk_size); @@ -4619,7 +4619,7 @@ H5D__mpio_collective_filtered_chunk_update(H5D_filtered_collective_io_info_t *ch if (!fb_info_init) { hsize_t chunk_dims[H5S_MAX_RANK]; - HDassert(di->dset->shared->ndims == di->dset->shared->layout.u.chunk.ndims - 1); + assert(di->dset->shared->ndims == di->dset->shared->layout.u.chunk.ndims - 1); for (size_t j = 0; j < di->dset->shared->layout.u.chunk.ndims - 1; j++) chunk_dims[j] = (hsize_t)di->dset->shared->layout.u.chunk.dim[j]; @@ -4642,7 +4642,7 @@ H5D__mpio_collective_filtered_chunk_update(H5D_filtered_collective_io_info_t *ch } /* Write fill value to memory buffer */ - HDassert(fb_info.fill_buf); + assert(fb_info.fill_buf); if (H5D__fill(fb_info.fill_buf, di->dset->shared->type, chunk_list[i].buf, type_info->mem_type, fill_space) < 0) HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, FAIL, @@ -4693,7 +4693,7 @@ H5D__mpio_collective_filtered_chunk_update(H5D_filtered_collective_io_info_t *ch /* Process all chunks with data from the owning rank first */ for (i = 0; i < chunk_list_num_entries; i++) { - HDassert(mpi_rank == chunk_list[i].new_owner); + assert(mpi_rank == chunk_list[i].new_owner); chunk_info = chunk_list[i].chunk_info; @@ -4865,10 +4865,10 @@ H5D__mpio_collective_filtered_chunk_reallocate(H5D_filtered_collective_io_info_t FUNC_ENTER_PACKAGE - HDassert(chunk_list || 0 == chunk_list_num_entries); - HDassert(io_info); - HDassert(idx_info); - HDassert(idx_info->storage->idx_type != H5D_CHUNK_IDX_NONE); + assert(chunk_list || 0 == chunk_list_num_entries); + assert(io_info); + assert(idx_info); + assert(idx_info->storage->idx_type != H5D_CHUNK_IDX_NONE); #ifdef H5Dmpio_DEBUG H5D_MPIO_TRACE_ENTER(mpi_rank); @@ -4964,8 +4964,8 @@ H5D__mpio_collective_filtered_chunk_reallocate(H5D_filtered_collective_io_info_t local_chunk = &chunk_list[num_local_chunks_processed]; /* Sanity check that this chunk is actually local */ - HDassert(mpi_rank == local_chunk->orig_owner); - HDassert(mpi_rank == local_chunk->new_owner); + assert(mpi_rank == local_chunk->orig_owner); + assert(mpi_rank == local_chunk->new_owner); local_chunk->chunk_new = coll_entry->chunk_new; local_chunk->index_info.need_insert = need_insert; @@ -4979,7 +4979,7 @@ H5D__mpio_collective_filtered_chunk_reallocate(H5D_filtered_collective_io_info_t haddr_t curr_chunk_offset = local_chunk->chunk_new.offset; haddr_t prev_chunk_offset = chunk_list[num_local_chunks_processed - 1].chunk_new.offset; - HDassert(H5_addr_defined(prev_chunk_offset) && H5_addr_defined(curr_chunk_offset)); + assert(H5_addr_defined(prev_chunk_offset) && H5_addr_defined(curr_chunk_offset)); if (curr_chunk_offset < prev_chunk_offset) need_sort = TRUE; } @@ -4988,7 +4988,7 @@ H5D__mpio_collective_filtered_chunk_reallocate(H5D_filtered_collective_io_info_t } } - HDassert(chunk_list_num_entries == num_local_chunks_processed); + assert(chunk_list_num_entries == num_local_chunks_processed); /* * Ensure this rank's local chunk list is sorted in @@ -5055,10 +5055,10 @@ H5D__mpio_collective_filtered_chunk_reinsert(H5D_filtered_collective_io_info_t * FUNC_ENTER_PACKAGE - HDassert(chunk_list || 0 == chunk_list_num_entries); - HDassert(io_info); - HDassert(di); - HDassert(idx_info); + assert(chunk_list || 0 == chunk_list_num_entries); + assert(io_info); + assert(di); + assert(idx_info); #ifdef H5Dmpio_DEBUG H5D_MPIO_TRACE_ENTER(mpi_rank); @@ -5193,8 +5193,8 @@ H5D__mpio_collective_filtered_chunk_reinsert(H5D_filtered_collective_io_info_t * hbool_t coords_match = !HDmemcmp(scaled_coords, chunk_list[dbg_idx].chunk_info->scaled, di->dset->shared->ndims * sizeof(hsize_t)); - HDassert(coords_match && "Calculated scaled coordinates for chunk didn't match " - "chunk's actual scaled coordinates!"); + assert(coords_match && "Calculated scaled coordinates for chunk didn't match " + "chunk's actual scaled coordinates!"); break; } } @@ -5266,10 +5266,10 @@ H5D__mpio_get_chunk_redistribute_info_types(MPI_Datatype *contig_type, hbool_t * FUNC_ENTER_PACKAGE - HDassert(contig_type); - HDassert(contig_type_derived); - HDassert(resized_type); - HDassert(resized_type_derived); + assert(contig_type); + assert(contig_type_derived); + assert(resized_type); + assert(resized_type_derived); *contig_type_derived = FALSE; *resized_type_derived = FALSE; @@ -5279,7 +5279,7 @@ H5D__mpio_get_chunk_redistribute_info_types(MPI_Datatype *contig_type, hbool_t * HGOTO_ERROR(H5E_DATASET, H5E_CANTGET, FAIL, "can't create derived type for chunk file description") field_count = 5; - HDassert(field_count == (sizeof(types) / sizeof(MPI_Datatype))); + assert(field_count == (sizeof(types) / sizeof(MPI_Datatype))); /* * Create structure type to pack chunk H5F_block_t structure @@ -5407,10 +5407,10 @@ H5D__mpio_get_chunk_alloc_info_types(MPI_Datatype *contig_type, hbool_t *contig_ FUNC_ENTER_PACKAGE - HDassert(contig_type); - HDassert(contig_type_derived); - HDassert(resized_type); - HDassert(resized_type_derived); + assert(contig_type); + assert(contig_type_derived); + assert(resized_type); + assert(resized_type_derived); *contig_type_derived = FALSE; *resized_type_derived = FALSE; @@ -5420,7 +5420,7 @@ H5D__mpio_get_chunk_alloc_info_types(MPI_Datatype *contig_type, hbool_t *contig_ HGOTO_ERROR(H5E_DATASET, H5E_CANTGET, FAIL, "can't create derived type for chunk file description") field_count = 3; - HDassert(field_count == (sizeof(types) / sizeof(MPI_Datatype))); + assert(field_count == (sizeof(types) / sizeof(MPI_Datatype))); /* * Create structure type to pack both chunk H5F_block_t structures @@ -5538,10 +5538,10 @@ H5D__mpio_get_chunk_insert_info_types(MPI_Datatype *contig_type, hbool_t *contig FUNC_ENTER_PACKAGE - HDassert(contig_type); - HDassert(contig_type_derived); - HDassert(resized_type); - HDassert(resized_type_derived); + assert(contig_type); + assert(contig_type_derived); + assert(resized_type); + assert(resized_type_derived); *contig_type_derived = FALSE; *resized_type_derived = FALSE; @@ -5551,7 +5551,7 @@ H5D__mpio_get_chunk_insert_info_types(MPI_Datatype *contig_type, hbool_t *contig HGOTO_ERROR(H5E_DATASET, H5E_CANTGET, FAIL, "can't create derived type for chunk file description") field_count = 4; - HDassert(field_count == (sizeof(types) / sizeof(MPI_Datatype))); + assert(field_count == (sizeof(types) / sizeof(MPI_Datatype))); /* * Create struct type to pack information into memory as follows: @@ -5664,11 +5664,11 @@ H5D__mpio_collective_filtered_io_type(H5D_filtered_collective_io_info_t *chunk_l FUNC_ENTER_PACKAGE - HDassert(chunk_list || 0 == num_entries); - HDassert(new_mem_type); - HDassert(mem_type_derived); - HDassert(new_file_type); - HDassert(file_type_derived); + assert(chunk_list || 0 == num_entries); + assert(new_mem_type); + assert(mem_type_derived); + assert(new_file_type); + assert(file_type_derived); *mem_type_derived = FALSE; *file_type_derived = FALSE; @@ -5768,7 +5768,7 @@ H5D__mpio_collective_filtered_io_type(H5D_filtered_collective_io_info_t *chunk_l * Set the current chunk entry's offset in the file, relative to * the first chunk entry */ - HDassert(H5_addr_defined(chunk_block->offset)); + assert(H5_addr_defined(chunk_block->offset)); file_offset_array[chunk_count] = (MPI_Aint)(chunk_block->offset - base_offset); /* @@ -5776,7 +5776,7 @@ H5D__mpio_collective_filtered_io_type(H5D_filtered_collective_io_info_t *chunk_l * offset in the file */ if (chunk_count) - HDassert(file_offset_array[chunk_count] > file_offset_array[chunk_count - 1]); + assert(file_offset_array[chunk_count] > file_offset_array[chunk_count - 1]); /* Set the current chunk entry's size for the I/O operation */ H5_CHECK_OVERFLOW(chunk_block->length, hsize_t, int); @@ -5837,9 +5837,9 @@ H5D__mpio_collective_filtered_io_type(H5D_filtered_collective_io_info_t *chunk_l HMPI_GOTO_ERROR(FAIL, "MPI_Type_commit failed", mpi_code) } else { - HDassert(file_offset_array); - HDassert(length_array); - HDassert(io_buf_array); + assert(file_offset_array); + assert(length_array); + assert(io_buf_array); /* Multiple chunks - use an hindexed type for both memory and file */ @@ -5907,7 +5907,7 @@ H5D__mpio_dump_collective_filtered_chunk_list(H5D_filtered_collective_io_info_t chunk_entry = &chunk_list[i]; - HDassert(chunk_entry->chunk_info); + assert(chunk_entry->chunk_info); chunk_rank = (unsigned)H5S_GET_EXTENT_NDIMS(chunk_entry->chunk_info->fspace); H5D_MPIO_DEBUG(mpi_rank, " {"); |