Skip to content

mtl/ofi: Remove unused variables, and check ompi_ret #11686

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

Merged
merged 2 commits into from
Jan 16, 2024
Merged

mtl/ofi: Remove unused variables, and check ompi_ret #11686

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
eb0ca97
mtl/ofi: Check ompi_ret in ompi_mtl_ofi_send_generic
May 16, 2023
7eab3f6
mtl/ofi: Remove unused variables
May 16, 2023
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
3 changes: 0 additions & 3 deletions ompi/mca/mtl/ofi/mtl_ofi.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -224,15 +224,12 @@ ompi_mtl_ofi_add_procs(struct mca_mtl_base_module_t *mtl,
int ret = OMPI_SUCCESS;
size_t i;
size_t size;
size_t namelen;
int count = 0;
char *ep_name = NULL;
fi_addr_t *fi_addrs = NULL;
mca_mtl_ofi_endpoint_t *endpoint = NULL;
int num_peers_limit = (1 << ompi_mtl_ofi.num_bits_source_rank) - 1;

namelen = ompi_mtl_ofi.epnamelen;

/* We cannot add more ranks than available tag bits */
if ((false == ompi_mtl_ofi.fi_cq_data) &&
OPAL_UNLIKELY(((int) (nprocs + ompi_mtl_ofi.num_peers) > num_peers_limit))) {
Expand Down
6 changes: 6 additions & 0 deletions ompi/mca/mtl/ofi/mtl_ofi.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -865,11 +865,17 @@ ompi_mtl_ofi_send_generic(struct mca_mtl_base_module_t *mtl,
if (mtl_comm->c_index_vec[dest].c_index_state == MCA_MTL_OFI_CID_NOT_EXCHANGED) {
mtl_comm->c_index_vec[dest].c_index_state = MCA_MTL_OFI_CID_EXCHANGING;
ompi_ret = ompi_mtl_ofi_send_excid(mtl, comm, dest, ofi_cq_data, true);
if (OPAL_UNLIKELY(OMPI_SUCCESS != ompi_ret)) {
return ompi_ret;
}
}

if (mtl_comm->c_index_vec[dest].c_index_state > MCA_MTL_OFI_CID_EXCHANGED) {
while (mtl_comm->c_index_vec[dest].c_index_state > MCA_MTL_OFI_CID_EXCHANGED) {
ompi_ret = ompi_mtl_ofi_post_recv_excid_buffer(true, comm, dest);
if (OPAL_UNLIKELY(OMPI_SUCCESS != ompi_ret)) {
return ompi_ret;
}
}
}
c_index_for_tag = mtl_comm->c_index_vec[dest].c_index;
Expand Down
4 changes: 0 additions & 4 deletions ompi/mca/mtl/ofi/mtl_ofi_component.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -576,7 +576,6 @@ ompi_mtl_ofi_component_init(bool enable_progress_threads,
struct fi_info *hints, *hints_dup = NULL;
struct fi_info *providers = NULL;
struct fi_info *prov = NULL;
struct fi_info *prov_cq_data = NULL;
void *ep_name = NULL;
size_t namelen = 0;
int universe_size;
Expand Down Expand Up @@ -1137,9 +1136,6 @@ ompi_mtl_ofi_component_init(bool enable_progress_threads,
if (providers) {
(void) fi_freeinfo(providers);
}
if (prov_cq_data) {
(void) fi_freeinfo(prov_cq_data);
}
if (hints) {
(void) fi_freeinfo(hints);
}
Expand Down