[mpich-commits] [mpich] MPICH primary repository branch, master, updated. v3.2a2-38-gcae6aae
Service Account
noreply at mpich.org
Tue Dec 9 16:57:58 CST 2014
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "MPICH primary repository".
The branch, master has been updated
via cae6aae24be0d5b075e29162682dc10976b6a67e (commit)
from c44a365ae8073e0d930cd6dc79a1d4c11bdd07bd (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://git.mpich.org/mpich.git/commitdiff/cae6aae24be0d5b075e29162682dc10976b6a67e
commit cae6aae24be0d5b075e29162682dc10976b6a67e
Author: Charles J Archer <charles.j.archer at intel.com>
Date: Tue Dec 9 14:30:33 2014 -0800
Compile time fixes to latest OFI interfaces
diff --git a/src/mpid/ch3/channels/nemesis/netmod/sfi/errnames.txt b/src/mpid/ch3/channels/nemesis/netmod/sfi/errnames.txt
index c1ae0e3..09cb0f6 100644
--- a/src/mpid/ch3/channels/nemesis/netmod/sfi/errnames.txt
+++ b/src/mpid/ch3/channels/nemesis/netmod/sfi/errnames.txt
@@ -1,9 +1,9 @@
**sfi_avmap:SFI get address vector map failed
**sfi_avmap %s %d %s %s:SFI address vector map failed (%s:%d:%s:%s)
-**sfi_tsendto:SFI tagged sendto failed
-**sfi_tsendto %s %d %s %s:SFI tagged sendto failed (%s:%d:%s:%s)
-**sfi_trecvfrom:SFI tagged recvfrom failed
-**sfi_trecvfrom %s %d %s %s:SFI tagged recvfrom failed (%s:%d:%s:%s)
+**sfi_tsend:SFI tagged sendto failed
+**sfi_tsend %s %d %s %s:SFI tagged sendto failed (%s:%d:%s:%s)
+**sfi_trecv:SFI tagged recvfrom failed
+**sfi_trecv %s %d %s %s:SFI tagged recvfrom failed (%s:%d:%s:%s)
**sfi_getinfo:SFI getinfo() failed
**sfi_getinfo %s %d %s %s:SFI getinfo() failed (%s:%d:%s:%s)
**sfi_openep:SFI endpoint open failed
diff --git a/src/mpid/ch3/channels/nemesis/netmod/sfi/sfi_cm.c b/src/mpid/ch3/channels/nemesis/netmod/sfi/sfi_cm.c
index b39517a..54bf757 100644
--- a/src/mpid/ch3/channels/nemesis/netmod/sfi/sfi_cm.c
+++ b/src/mpid/ch3/channels/nemesis/netmod/sfi/sfi_cm.c
@@ -101,14 +101,14 @@ static inline int MPID_nem_sfi_conn_req_callback(cq_tagged_entry_t * wc, MPID_Re
MPIU_Memcpy(bc, rreq->dev.user_buf, wc->len);
bc[wc->len] = '\0';
MPIU_Assert(gl_data.conn_req == rreq);
- FI_RC(fi_trecvfrom(gl_data.endpoint,
+ FI_RC(fi_trecv(gl_data.endpoint,
gl_data.conn_req->dev.user_buf,
SFI_KVSAPPSTRLEN,
gl_data.mr,
0,
MPID_CONN_REQ,
~MPID_PROTOCOL_MASK,
- (void *) &(REQ_SFI(gl_data.conn_req)->sfi_context)), trecvfrom);
+ (void *) &(REQ_SFI(gl_data.conn_req)->sfi_context)), trecv);
addr = MPIU_Malloc(gl_data.bound_addrlen);
MPIU_Assertp(addr);
@@ -221,34 +221,34 @@ static inline int MPID_nem_sfi_preposted_callback(cq_tagged_entry_t * wc, MPID_R
REQ_SFI(new_rreq)->vc = vc;
REQ_SFI(new_rreq)->pack_buffer = pack_buffer;
REQ_SFI(new_rreq)->pack_buffer_size = pkt_len;
- FI_RC(fi_trecvfrom(gl_data.endpoint,
+ FI_RC(fi_trecv(gl_data.endpoint,
REQ_SFI(new_rreq)->pack_buffer,
REQ_SFI(new_rreq)->pack_buffer_size,
gl_data.mr,
VC_SFI(vc)->direct_addr,
- wc->tag | MPID_MSG_DATA, 0, &(REQ_SFI(new_rreq)->sfi_context)), trecvfrom);
+ wc->tag | MPID_MSG_DATA, 0, &(REQ_SFI(new_rreq)->sfi_context)), trecv);
MPID_nem_sfi_create_req(&sreq, 1);
sreq->dev.OnDataAvail = NULL;
sreq->dev.next = NULL;
REQ_SFI(sreq)->event_callback = MPID_nem_sfi_cts_send_callback;
REQ_SFI(sreq)->parent = new_rreq;
- FI_RC(fi_tsendto(gl_data.endpoint,
+ FI_RC(fi_tsend(gl_data.endpoint,
NULL,
0,
gl_data.mr,
VC_SFI(vc)->direct_addr,
- wc->tag | MPID_MSG_CTS, &(REQ_SFI(sreq)->sfi_context)), tsendto);
+ wc->tag | MPID_MSG_CTS, &(REQ_SFI(sreq)->sfi_context)), tsend);
MPIU_Assert(gl_data.persistent_req == rreq);
rreq->dev.user_count = 0;
- FI_RC(fi_trecvfrom(gl_data.endpoint,
+ FI_RC(fi_trecv(gl_data.endpoint,
&rreq->dev.user_count,
sizeof rreq->dev.user_count,
gl_data.mr,
0,
MPID_MSG_RTS,
- ~MPID_PROTOCOL_MASK, &(REQ_SFI(rreq)->sfi_context)), trecvfrom);
+ ~MPID_PROTOCOL_MASK, &(REQ_SFI(rreq)->sfi_context)), trecv);
END_FUNC_RC(FCNAME);
}
@@ -303,14 +303,14 @@ int MPID_nem_sfi_cm_init(MPIDI_PG_t * pg_p, int pg_rank ATTRIBUTE((unused)))
persistent_req->dev.next = NULL;
REQ_SFI(persistent_req)->vc = NULL;
REQ_SFI(persistent_req)->event_callback = MPID_nem_sfi_preposted_callback;
- FI_RC(fi_trecvfrom(gl_data.endpoint,
+ FI_RC(fi_trecv(gl_data.endpoint,
&persistent_req->dev.user_count,
sizeof persistent_req->dev.user_count,
gl_data.mr,
0,
MPID_MSG_RTS,
~MPID_PROTOCOL_MASK,
- (void *) &(REQ_SFI(persistent_req)->sfi_context)), trecvfrom);
+ (void *) &(REQ_SFI(persistent_req)->sfi_context)), trecv);
gl_data.persistent_req = persistent_req;
/* --------------------------------- */
@@ -322,13 +322,13 @@ int MPID_nem_sfi_cm_init(MPIDI_PG_t * pg_p, int pg_rank ATTRIBUTE((unused)))
conn_req->dev.next = NULL;
REQ_SFI(conn_req)->vc = NULL; /* We don't know the source yet */
REQ_SFI(conn_req)->event_callback = MPID_nem_sfi_conn_req_callback;
- FI_RC(fi_trecvfrom(gl_data.endpoint,
+ FI_RC(fi_trecv(gl_data.endpoint,
conn_req->dev.user_buf,
SFI_KVSAPPSTRLEN,
gl_data.mr,
0,
MPID_CONN_REQ,
- ~MPID_PROTOCOL_MASK, (void *) &(REQ_SFI(conn_req)->sfi_context)), trecvfrom);
+ ~MPID_PROTOCOL_MASK, (void *) &(REQ_SFI(conn_req)->sfi_context)), trecv);
gl_data.conn_req = conn_req;
@@ -537,12 +537,12 @@ int MPID_nem_sfi_connect_to_root(const char *business_card, MPIDI_VC_t * new_vc)
REQ_SFI(sreq)->event_callback = MPID_nem_sfi_connect_to_root_callback;
REQ_SFI(sreq)->pack_buffer = my_bc;
conn_req_send_bits = init_sendtag(0, MPIR_Process.comm_world->rank, 0, MPID_CONN_REQ);
- FI_RC(fi_tsendto(gl_data.endpoint,
+ FI_RC(fi_tsend(gl_data.endpoint,
REQ_SFI(sreq)->pack_buffer,
my_bc_len,
gl_data.mr,
VC_SFI(new_vc)->direct_addr,
- conn_req_send_bits, &(REQ_SFI(sreq)->sfi_context)), tsendto);
+ conn_req_send_bits, &(REQ_SFI(sreq)->sfi_context)), tsend);
MPID_nem_sfi_poll(MPID_NONBLOCKING_POLL);
VC_SFI(new_vc)->is_cmvc = 1;
VC_SFI(new_vc)->next = gl_data.cm_vcs;
diff --git a/src/mpid/ch3/channels/nemesis/netmod/sfi/sfi_impl.h b/src/mpid/ch3/channels/nemesis/netmod/sfi/sfi_impl.h
index 9e8b93f..d720170 100644
--- a/src/mpid/ch3/channels/nemesis/netmod/sfi/sfi_impl.h
+++ b/src/mpid/ch3/channels/nemesis/netmod/sfi/sfi_impl.h
@@ -29,7 +29,7 @@ typedef struct fi_info info_t;
typedef struct fi_cq_attr cq_attr_t;
typedef struct fi_av_attr av_attr_t;
typedef struct fi_domain_attr domain_attr_t;
-typedef struct fi_tx_ctx_attr tx_ctx_attr_t;
+typedef struct fi_tx_attr tx_attr_t;
typedef struct fi_cq_tagged_entry cq_tagged_entry_t;
typedef struct fi_cq_err_entry cq_err_entry_t;
typedef struct fi_context context_t;
diff --git a/src/mpid/ch3/channels/nemesis/netmod/sfi/sfi_init.c b/src/mpid/ch3/channels/nemesis/netmod/sfi/sfi_init.c
index 88a6496..586e522 100644
--- a/src/mpid/ch3/channels/nemesis/netmod/sfi/sfi_init.c
+++ b/src/mpid/ch3/channels/nemesis/netmod/sfi/sfi_init.c
@@ -75,7 +75,7 @@ int MPID_nem_sfi_init(MPIDI_PG_t * pg_p, int pg_rank, char **bc_val_p, int *val_
domain_attr_t domain_attr;
memset(&domain_attr, 0, sizeof(domain_attr));
- tx_ctx_attr_t tx_attr;
+ tx_attr_t tx_attr;
memset(&tx_attr, 0, sizeof(tx_attr));
domain_attr.threading = FI_THREAD_PROGRESS;
@@ -334,8 +334,8 @@ static inline int compile_time_checking()
/* ------------------------------------------------------------------------ */
#if 0
MPIU_ERR_SET2(e, MPI_ERR_OTHER, "**sfi_avmap", "**sfi_avmap %s %d %s %s", a, b, a, a);
- MPIU_ERR_SET2(e, MPI_ERR_OTHER, "**sfi_tsendto", "**sfi_tsendto %s %d %s %s", a, b, a, a);
- MPIU_ERR_SET2(e, MPI_ERR_OTHER, "**sfi_trecvfrom", "**sfi_trecvfrom %s %d %s %s", a, b, a, a);
+ MPIU_ERR_SET2(e, MPI_ERR_OTHER, "**sfi_tsend", "**sfi_tsend %s %d %s %s", a, b, a, a);
+ MPIU_ERR_SET2(e, MPI_ERR_OTHER, "**sfi_trecv", "**sfi_trecv %s %d %s %s", a, b, a, a);
MPIU_ERR_SET2(e, MPI_ERR_OTHER, "**sfi_getinfo", "**sfi_getinfo %s %d %s %s", a, b, a, a);
MPIU_ERR_SET2(e, MPI_ERR_OTHER, "**sfi_openep", "**sfi_openep %s %d %s %s", a, b, a, a);
MPIU_ERR_SET2(e, MPI_ERR_OTHER, "**sfi_openfabric", "**sfi_openfabric %s %d %s %s", a, b, a, a);
diff --git a/src/mpid/ch3/channels/nemesis/netmod/sfi/sfi_msg.c b/src/mpid/ch3/channels/nemesis/netmod/sfi/sfi_msg.c
index 3797f92..c202997 100644
--- a/src/mpid/ch3/channels/nemesis/netmod/sfi/sfi_msg.c
+++ b/src/mpid/ch3/channels/nemesis/netmod/sfi/sfi_msg.c
@@ -73,21 +73,21 @@
REQ_SFI(cts_req)->event_callback = MPID_nem_sfi_cts_recv_callback; \
REQ_SFI(cts_req)->parent = sreq; \
\
- FI_RC(fi_trecvfrom(gl_data.endpoint, \
+ FI_RC(fi_trecv(gl_data.endpoint, \
NULL, \
0, \
gl_data.mr, \
VC_SFI(vc)->direct_addr, \
match_bits | MPID_MSG_CTS, \
0, /* Exact tag match, no ignore bits */ \
- &(REQ_SFI(cts_req)->sfi_context)),trecvfrom); \
- FI_RC(fi_tsendto(gl_data.endpoint, \
+ &(REQ_SFI(cts_req)->sfi_context)),trecv); \
+ FI_RC(fi_tsend(gl_data.endpoint, \
&REQ_SFI(sreq)->pack_buffer_size, \
sizeof(REQ_SFI(sreq)->pack_buffer_size), \
gl_data.mr, \
VC_SFI(vc)->direct_addr, \
match_bits, \
- &(REQ_SFI(sreq)->sfi_context)),tsendto); \
+ &(REQ_SFI(sreq)->sfi_context)),tsend); \
})
@@ -108,12 +108,12 @@ static int MPID_nem_sfi_data_callback(cq_tagged_entry_t * wc, MPID_Request * sre
if (sreq->cc == 2) {
vc = REQ_SFI(sreq)->vc;
REQ_SFI(sreq)->tag = tag | MPID_MSG_DATA;
- FI_RC(fi_tsendto(gl_data.endpoint,
+ FI_RC(fi_tsend(gl_data.endpoint,
REQ_SFI(sreq)->pack_buffer,
REQ_SFI(sreq)->pack_buffer_size,
gl_data.mr,
VC_SFI(vc)->direct_addr,
- wc->tag | MPID_MSG_DATA, (void *) &(REQ_SFI(sreq)->sfi_context)), tsendto);
+ wc->tag | MPID_MSG_DATA, (void *) &(REQ_SFI(sreq)->sfi_context)), tsend);
}
if (sreq->cc == 1) {
if (REQ_SFI(sreq)->pack_buffer)
diff --git a/src/mpid/ch3/channels/nemesis/netmod/sfi/sfi_progress.c b/src/mpid/ch3/channels/nemesis/netmod/sfi/sfi_progress.c
index 8f40aeb..fdb1bbf 100644
--- a/src/mpid/ch3/channels/nemesis/netmod/sfi/sfi_progress.c
+++ b/src/mpid/ch3/channels/nemesis/netmod/sfi/sfi_progress.c
@@ -258,7 +258,7 @@ int MPID_nem_sfi_poll(int in_blocking_poll)
}
else if (ret < 0) {
if (ret == -FI_EAVAIL) {
- ret = fi_cq_readerr(gl_data.cq, (void *) &error, sizeof(error), 0);
+ ret = fi_cq_readerr(gl_data.cq, (void *) &error, 0);
if (error.err == FI_EMSGSIZE) {
/* ----------------------------------------------------- */
/* This error message should only be delivered on send */
diff --git a/src/mpid/ch3/channels/nemesis/netmod/sfi/sfi_tagged.c b/src/mpid/ch3/channels/nemesis/netmod/sfi/sfi_tagged.c
index 2d88c10..237c735 100644
--- a/src/mpid/ch3/channels/nemesis/netmod/sfi/sfi_tagged.c
+++ b/src/mpid/ch3/channels/nemesis/netmod/sfi/sfi_tagged.c
@@ -104,12 +104,12 @@ static inline int MPID_nem_sfi_recv_callback(cq_tagged_entry_t * wc, MPID_Reques
sync_req->dev.next = NULL;
REQ_SFI(sync_req)->event_callback = MPID_nem_sfi_sync_recv_callback;
REQ_SFI(sync_req)->parent = rreq;
- FI_RC(fi_tsendto(gl_data.endpoint,
+ FI_RC(fi_tsend(gl_data.endpoint,
NULL,
0,
gl_data.mr,
VC_SFI(vc)->direct_addr,
- ssend_bits, &(REQ_SFI(sync_req)->sfi_context)), tsendto);
+ ssend_bits, &(REQ_SFI(sync_req)->sfi_context)), tsend);
}
else {
/* ---------------------------------------------------- */
@@ -185,22 +185,22 @@ static inline int do_isend(struct MPIDI_VC *vc,
REQ_SFI(sync_req)->parent = sreq;
ssend_match = init_recvtag(&ssend_mask, comm->context_id + context_offset, dest, tag);
ssend_match |= MPID_SYNC_SEND_ACK;
- FI_RC(fi_trecvfrom(gl_data.endpoint, /* endpoint */
+ FI_RC(fi_trecv(gl_data.endpoint, /* endpoint */
NULL, /* recvbuf */
0, /* data sz */
gl_data.mr, /* dynamic mr */
VC_SFI(vc)->direct_addr, /* remote proc */
ssend_match, /* match bits */
0ULL, /* mask bits */
- &(REQ_SFI(sync_req)->sfi_context)), trecvfrom);
+ &(REQ_SFI(sync_req)->sfi_context)), trecv);
}
- FI_RC(fi_tsendto(gl_data.endpoint, /* Endpoint */
+ FI_RC(fi_tsend(gl_data.endpoint, /* Endpoint */
send_buffer, /* Send buffer(packed or user) */
data_sz, /* Size of the send */
gl_data.mr, /* Dynamic memory region */
VC_SFI(vc)->direct_addr, /* Use the address of this VC */
match_bits, /* Match bits */
- &(REQ_SFI(sreq)->sfi_context)), tsendto);
+ &(REQ_SFI(sreq)->sfi_context)), tsend);
*request = sreq;
END_FUNC_RC(FCNAME);
}
@@ -250,12 +250,12 @@ int MPID_nem_sfi_recv_posted(struct MPIDI_VC *vc, struct MPID_Request *rreq)
/* ---------------- */
/* Post the receive */
/* ---------------- */
- FI_RC(fi_trecvfrom(gl_data.endpoint,
+ FI_RC(fi_trecv(gl_data.endpoint,
recv_buffer,
data_sz,
gl_data.mr,
remote_proc,
- match_bits, mask_bits, &(REQ_SFI(rreq)->sfi_context)), trecvfrom);
+ match_bits, mask_bits, &(REQ_SFI(rreq)->sfi_context)), trecv);
MPID_nem_sfi_poll(MPID_NONBLOCKING_POLL);
END_FUNC_RC(FCNAME);
}
-----------------------------------------------------------------------
Summary of changes:
.../ch3/channels/nemesis/netmod/sfi/errnames.txt | 8 +++---
src/mpid/ch3/channels/nemesis/netmod/sfi/sfi_cm.c | 28 ++++++++++----------
.../ch3/channels/nemesis/netmod/sfi/sfi_impl.h | 2 +-
.../ch3/channels/nemesis/netmod/sfi/sfi_init.c | 6 ++--
src/mpid/ch3/channels/nemesis/netmod/sfi/sfi_msg.c | 12 ++++----
.../ch3/channels/nemesis/netmod/sfi/sfi_progress.c | 2 +-
.../ch3/channels/nemesis/netmod/sfi/sfi_tagged.c | 16 +++++-----
7 files changed, 37 insertions(+), 37 deletions(-)
hooks/post-receive
--
MPICH primary repository
More information about the commits
mailing list