Skip to content

sessions: fix hetero builds #9982

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 1 commit into from
Feb 8, 2022
Merged

sessions: fix hetero builds #9982

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 ompi/mca/pml/ob1/pml_ob1.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -789,7 +789,7 @@ int mca_pml_ob1_send_cid (ompi_proc_t *proc, ompi_communicator_t *comm)
mca_pml_ob1_cid_hdr_t cid;

mca_pml_ob1_cid_hdr_prepare (&cid, comm);
ob1_hdr_hton ((mca_pml_ob1_hdr_t *) &cid, cid->hdr_common.hdr_type, proc);
ob1_hdr_hton ((mca_pml_ob1_hdr_t *) &cid, cid.hdr_common.hdr_type, proc);

return mca_pml_ob1_send_control_any (proc, MCA_BTL_NO_ORDER, (mca_pml_ob1_hdr_t *) &cid, sizeof (cid), true);
}
Expand Down
37 changes: 20 additions & 17 deletions ompi/mca/pml/ob1/pml_ob1_hdr.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,21 +97,6 @@ static inline void mca_pml_ob1_cid_hdr_prepare (mca_pml_ob1_cid_hdr_t *hdr, ompi
hdr->hdr_src = ompi_comm_rank (comm);
}

#define MCA_PML_OB1_EXT_CID_HDR_HTON(h) \
do { \
MCA_PML_OB1_COMMON_HDR_HTON((h).hdr_common); \
(h).hdr_src_comm_index = htons((h).hdr_src_comm_index); \
ompi_comm_cid_hton(&(h).hdr_cid); \
} while (0)

#define MCA_PML_OB1_EXT_CID_HDR_NTOH(h) \
do { \
MCA_PML_OB1_COMMON_HDR_NTOH((h).hdr_common); \
(h).hdr_src_comm_index = ntonh((h).hdr_src_comm_index); \
ompi_comm_cid_ntoh(&(h).hdr_cid); \
} while (0)


/**
* Header definition for the first fragment, contains the
* attributes required to match the corresponding posted receive.
Expand Down Expand Up @@ -166,6 +151,24 @@ do { \
(h).hdr_seq = htons((h).hdr_seq); \
} while (0)

#define MCA_PML_OB1_EXT_MATCH_HDR_NTOH(h) \
do {\
MCA_PML_OB1_COMMON_HDR_NTOH((h).hdr_common); \
(h).hdr_cid.cid_base = ntoh64((h).hdr_cid.cid_base); \
(h).hdr_cid.cid_sub.u64 = ntoh64((h).hdr_cid.cid_sub.u64); \
(h).hdr_src_comm_index = ntohs((h).hdr_src_comm_index); \
(h).hdr_src = ntohl((h).hdr_src); \
} while (0)

#define MCA_PML_OB1_EXT_MATCH_HDR_HTON(h) \
do {\
MCA_PML_OB1_COMMON_HDR_HTON((h).hdr_common); \
(h).hdr_cid.cid_base = hton64((h).hdr_cid.cid_base); \
(h).hdr_cid.cid_sub.u64 = hton64((h).hdr_cid.cid_sub.u64); \
(h).hdr_src_comm_index = htons((h).hdr_src_comm_index); \
(h).hdr_src = htonl((h).hdr_src); \
} while (0)

struct mca_pml_ob1_ext_match_hdr_t {
mca_pml_ob1_cid_hdr_t hdr_ext_cid;

Expand Down Expand Up @@ -531,7 +534,7 @@ ob1_hdr_ntoh(mca_pml_ob1_hdr_t *hdr, const uint8_t hdr_type)

MCA_PML_OB1_EXT_MATCH_HDR_NTOH(hdr->hdr_cid);
/* now swap the real header */
ob1_hdr_ntoh (next_hdr, hext_hdr->hdr_common.hdr_type);
ob1_hdr_ntoh (next_hdr, next_hdr->hdr_common.hdr_type);
break;
}
default:
Expand Down Expand Up @@ -586,7 +589,7 @@ ob1_hdr_hton_intr(mca_pml_ob1_hdr_t *hdr, const uint8_t hdr_type,

MCA_PML_OB1_EXT_MATCH_HDR_HTON(hdr->hdr_cid);
/* now swap the real header */
ob1_hdr_hton (next_hdr, hext_hdr->hdr_common.hdr_type, proc);
ob1_hdr_hton (next_hdr, next_hdr->hdr_common.hdr_type, proc);
break;
}
default:
Expand Down