Hi Alex, Why did you push this "OSHMEM: spml ikrit..." commit twice? I see it here (together with an undesirable merge-of-master commit) and also as 065dc9b4.
-Dave On Nov 3, 2014, at 2:03 AM, git...@crest.iu.edu wrote: > 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 "open-mpi/ompi". > > The branch, master has been updated > via 87dffacc56b4ebcecaa2e65e19c2f813d2a5d078 (commit) > via e1cf6f37baf2b6240ab3aa3a219b8856cfa2caf4 (commit) > from 065dc9b4deec9cd9500f2fdc6bb53bbf58a9c2f6 (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 ----------------------------------------------------------------- > https://github.com/open-mpi/ompi/commit/87dffacc56b4ebcecaa2e65e19c2f813d2a5d078 > > commit 87dffacc56b4ebcecaa2e65e19c2f813d2a5d078 > Merge: e1cf6f3 065dc9b > Author: Alex Mikheev <al...@mellanox.com> > Date: Mon Nov 3 10:02:29 2014 +0200 > > Merge branch 'master' of github.com:open-mpi/ompi > > Conflicts: > oshmem/mca/spml/ikrit/spml_ikrit_component.c > > > > https://github.com/open-mpi/ompi/commit/e1cf6f37baf2b6240ab3aa3a219b8856cfa2caf4 > > commit e1cf6f37baf2b6240ab3aa3a219b8856cfa2caf4 > Author: Alex Mikheev <al...@mellanox.com> > Date: Sun Nov 2 12:41:20 2014 +0200 > > OSHMEM: spml ikrit: disable rdmap op DCI pool > > Instead use single pool for both rdma and send receive ops. > > diff --git a/oshmem/mca/spml/ikrit/spml_ikrit_component.c > b/oshmem/mca/spml/ikrit/spml_ikrit_component.c > index 2079640..e021666 100644 > --- a/oshmem/mca/spml/ikrit/spml_ikrit_component.c > +++ b/oshmem/mca/spml/ikrit/spml_ikrit_component.c > @@ -92,6 +92,12 @@ static inline int set_mxm_tls() > { > char *tls; > > + /* disable dci pull for rdma ops. Use single pool. > + * Pool size is controlled by MXM_DC_QP_LIMIT > + * variable > + */ > + setenv("MXM_OSHMEM_DC_RNDV_QP_LIMIT", "0", 0); > + > tls = getenv("MXM_OSHMEM_TLS"); > if (NULL != tls) { > return check_mxm_tls("MXM_OSHMEM_TLS"); > > > ----------------------------------------------------------------------- > > Summary of changes: > oshmem/mca/spml/ikrit/spml_ikrit_component.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > > hooks/post-receive > -- > open-mpi/ompi > _______________________________________________ > ompi-commits mailing list > ompi-comm...@open-mpi.org > http://www.open-mpi.org/mailman/listinfo.cgi/ompi-commits
