Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

misc: Assorted cleanups #7274

Merged
merged 3 commits into from
Jan 29, 2025
Merged

misc: Assorted cleanups #7274

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
15c0f79
romio: warning fixes
roblatham00 Jan 22, 2025
ec176dc
romio: daos: missing headers
roblatham00 Jan 22, 2025
aa1e42f
shadow declaration fix
roblatham00 Jan 22, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/mpi/romio/adio/ad_daos/ad_daos_open.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ static int share_cont_info(struct ADIO_DAOS_cont *cont, int rank, MPI_Comm comm)
uint64_t total_size;
daos_size_t buf_size;
#if CHECK_DAOS_API_VERSION(1, 4)
daos_size_t pool_len, cont_len;
daos_size_t pool_len = 0, cont_len = 0;
#else
daos_size_t pool_len = 37, cont_len = 37;
#endif
Expand Down
2 changes: 1 addition & 1 deletion src/mpi/romio/adio/ad_gpfs/ad_gpfs_wrcoll.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ void ADIOI_GPFS_WriteStridedColl(ADIO_File fd, const void *buf, MPI_Aint count,
ADIO_Offset *offset_list = NULL, *st_offsets = NULL, *fd_start = NULL,
*fd_end = NULL, *end_offsets = NULL;
ADIO_Offset *gpfs_offsets0 = NULL, *gpfs_offsets = NULL;
ADIO_Offset *count_sizes;
ADIO_Offset *count_sizes = NULL;
int ii;

MPI_Aint *buf_idx = NULL;
Expand Down
2 changes: 1 addition & 1 deletion src/mpi/romio/adio/ad_lustre/ad_lustre_wrcoll.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1304,7 +1304,7 @@ static void ADIOI_LUSTRE_IterateOneSided(ADIO_File fd, const void *buf, int *str
&(offset_list[startingOffsetListIndex]),
&(len_list[startingOffsetListIndex]),
segmentContigAccessCount,
buf + totalDataWrittenLastRound, datatype,
(char *) buf + totalDataWrittenLastRound, datatype,
error_code, segmentFirstFileOffset,
segmentLastFileOffset, currentValidDataIndex,
segment_stripe_start, segment_stripe_end,
Expand Down
3 changes: 3 additions & 0 deletions src/mpi/romio/adio/common/ad_fstype.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,9 @@
#endif

#ifdef ROMIO_DAOS
#include <daos_prop.h> // daos_cont_layout_t and daos_pro_t
#include <daos_obj_class.h> // daos_oclass_id_t
#include <daos_cont.h> // DAOS_CONT_HINT_MAX_LEN
#include <daos_uns.h>
#endif

Expand Down
2 changes: 1 addition & 1 deletion src/mpl/src/gpu/mpl_gpu_ze.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1607,7 +1607,7 @@ static int update_lru_mapped_order(void *ipc_buf, int dev_id)
}

/* Add to the map for constant access during reorder */
MPL_ze_ipc_lru_map_t *map_entry =
map_entry =
(MPL_ze_ipc_lru_map_t *) MPL_calloc(1, sizeof(MPL_ze_ipc_lru_map_t), MPL_MEM_OTHER);
if (map_entry == NULL) {
mpl_err = MPL_ERR_GPU_NOMEM;
Expand Down