Commit a1e9f8ae authored by Guillaume Mercier's avatar Guillaume Mercier
Browse files

[svn-r7383] Small fixes for MX module

parent e5598f21
......@@ -6,6 +6,11 @@
#ifndef MX_MODULE_IMPL_H
#define MX_MODULE_IMPL_H
#ifdef USE_PMI2_API
#include "pmi2.h"
#else
#include "pmi.h"
#endif
#include <myriexpress.h>
#include "mx_extensions.h"
#include "mpid_nem_impl.h"
......@@ -175,12 +180,12 @@ typedef int16_t Mx_Nem_tag_t;
((_match) |= (((uint64_t)((_tag)&(NEM_MX_MAX_TAG))) << SHIFT_TAG)); \
}while(0)
#define NEM_MX_SET_SRC(_match, _src) do { \
MPIU_Assert(_src >= 0)&&(_src<=(NEM_MX_MAX_RANK))); \
MPIU_Assert((_src >= 0)&&(_src<=(NEM_MX_MAX_RANK))); \
((_match) |= (((uint64_t)(_src)) << SHIFT_RANK)); \
}while(0)
#define NEM_MX_SET_CTXT(_match, _ctxt) do { \
MPIU_Assert(_ctxt >= 0)&&(_ctxt<=(NEM_MX_MAX_CTXT))); \
((_match) |= (((uint64_t)(_ctxt)) << SHIFT_CTXT)); \
#define NEM_MX_SET_CTXT(_match, _ctxt) do { \
MPIU_Assert((_ctxt >= 0)&&(_ctxt<=(NEM_MX_MAX_CTXT))); \
((_match) |= (((uint64_t)(_ctxt)) << SHIFT_CTXT)); \
}while(0)
#define NEM_MX_SET_PGRANK(_match, _pg_rank) do { \
((_match) |= (((uint64_t)(_pg_rank)) << SHIFT_PGRANK)); \
......
......@@ -22,17 +22,6 @@ int MPID_nem_mx_probe(MPIDI_VC_t *vc, int source, int tag, MPID_Comm *comm, int
uint32_t result;
NEM_MX_DIRECT_MATCH(match_info,0,source,comm->context_id + context_offset);
/*
NEM_MX_SET_CTXT(match_info,comm->context_id + context_offset);
if( source == MPI_ANY_SOURCE)
{
NEM_MX_SET_ANYSRC(match_info);
NEM_MX_SET_ANYSRC(match_mask);
}
else
NEM_MX_SET_SRC(match_info,source);
*/
if (tag == MPI_ANY_TAG)
{
NEM_MX_SET_ANYTAG(match_info);
......@@ -71,8 +60,6 @@ int MPID_nem_mx_iprobe(MPIDI_VC_t *vc, int source, int tag, MPID_Comm *comm, in
mx_status_t mx_status;
uint32_t result;
NEM_MX_DIRECT_MATCH(match_info,0,source,comm->context_id + context_offset);
/*
NEM_MX_SET_CTXT(match_info,comm->context_id + context_offset);
if( source == MPI_ANY_SOURCE)
{
......@@ -81,8 +68,6 @@ int MPID_nem_mx_iprobe(MPIDI_VC_t *vc, int source, int tag, MPID_Comm *comm, in
}
else
NEM_MX_SET_SRC(match_info,source);
*/
if (tag == MPI_ANY_TAG)
{
NEM_MX_SET_ANYTAG(match_info);
......@@ -90,7 +75,6 @@ int MPID_nem_mx_iprobe(MPIDI_VC_t *vc, int source, int tag, MPID_Comm *comm, in
}
else
NEM_MX_SET_TAG(match_info,tag);
ret = mx_iprobe(MPID_nem_mx_local_endpoint,match_info,match_mask,&mx_status,&result);
MPIU_Assert(ret == MX_SUCCESS);
......
......@@ -15,7 +15,7 @@ int MPID_nem_mx_iSendContig(MPIDI_VC_t *vc, MPID_Request *sreq, void *hdr, MPIDI
{
int mpi_errno = MPI_SUCCESS;
mx_request_t mx_request;
mx_segment_t mx_iov[3];
mx_segment_t mx_iov[2];
uint32_t num_seg = 1;
mx_return_t ret;
uint64_t match_info = 0;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment