[mpich-commits] [mpich] MPICH primary repository branch, master, updated. v3.2a1-21-g7d47006

[Service Account]

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  7d470066ce297d407a79bf10fdd9676d10c7b202 (commit)
       via  e8b11d0a99db3f814a093d4a3c1949669aea6746 (commit)
      from  04a01da2240f956fcd43b42bef9c46ae89010f97 (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/7d470066ce297d407a79bf10fdd9676d10c7b202

commit 7d470066ce297d407a79bf10fdd9676d10c7b202
Author: Michael Blocksome <blocksom at us.ibm.com>
Date:   Wed Sep 17 11:43:23 2014 -0500

    pamid: Do not compile/link C++ source if it is not used.
    
    Signed-off-by: Sameh Sharkawi <sssharka at us.ibm.com>

diff --git a/src/mpid/pamid/include/mpidi_platform.h b/src/mpid/pamid/include/mpidi_platform.h
index e9d6e5b..e5ac1d8 100644
--- a/src/mpid/pamid/include/mpidi_platform.h
+++ b/src/mpid/pamid/include/mpidi_platform.h
@@ -142,7 +142,6 @@ static const char _ibm_release_version_[] = "V1R2M0";
 #define MPIDI_NO_ASSERT       1
 #define TOKEN_FLOW_CONTROL    1
 #define DYNAMIC_TASKING       1
-#define QUEUE_BINARY_SEARCH_SUPPORT 1
 
 /* 'is local task' extension and limits */
 #define PAMIX_IS_LOCAL_TASK
diff --git a/src/mpid/pamid/src/Makefile.mk b/src/mpid/pamid/src/Makefile.mk
index 9ccd933..0ec7698 100644
--- a/src/mpid/pamid/src/Makefile.mk
+++ b/src/mpid/pamid/src/Makefile.mk
@@ -58,8 +58,14 @@ mpi_core_sources +=               \
     src/mpid/pamid/src/mpid_mprobe.c            \
     src/mpid/pamid/src/mpid_imrecv.c            \
     src/mpid/pamid/src/mpid_improbe.c           \
-    src/mpid/pamid/src/mpidi_nbc_sched.c        \
+    src/mpid/pamid/src/mpidi_nbc_sched.c
+
+if QUEUE_BINARY_SEARCH_SUPPORT
+mpi_core_sources +=                             \
     src/mpid/pamid/src/mpid_recvq_mmap.cpp
+endif QUEUE_BINARY_SEARCH_SUPPORT
+
+
 
 endif BUILD_PAMID
 
diff --git a/src/mpid/pamid/subconfigure.m4 b/src/mpid/pamid/subconfigure.m4
index 2fd507a..c9160e0 100644
--- a/src/mpid/pamid/subconfigure.m4
+++ b/src/mpid/pamid/subconfigure.m4
@@ -101,6 +101,19 @@ if test "$with_shared_memory" != "mmap" -a "$with_shared_memory" != "sysv"; then
 fi
 
 dnl
+dnl The default is to enable the use of the recv queue binary search
+dnl ... except on BGQ
+dnl
+enable_queue_binary_search=yes
+if test "${pamid_platform}" = "BGQ" ; then
+  enable_queue_binary_search=no
+fi
+
+AC_ARG_ENABLE(queue-binary-search,
+        AC_HELP_STRING([--queue-binary-search], [Enable C++ binary search]),enable_queue_binary_search=no,enable_queue_binary_search=yes)
+AM_CONDITIONAL([QUEUE_BINARY_SEARCH_SUPPORT],[test "$enable_queue_binary_search" = "yes"])
+
+dnl
 dnl This configure option allows "sandbox" bgq system software to be used.
 dnl
 AC_ARG_WITH(bgq-install-dir,
@@ -325,7 +338,6 @@ fi
 
 
 
-
 ])dnl end AM_COND_IF(BUILD_PAMID,...)
 ])dnl end _BODY
 

http://git.mpich.org/mpich.git/commitdiff/e8b11d0a99db3f814a093d4a3c1949669aea6746

commit e8b11d0a99db3f814a093d4a3c1949669aea6746
Author: Michael Blocksome <blocksom at us.ibm.com>
Date:   Wed Sep 17 14:22:58 2014 -0500

    pamid: Add bgq libraries to wrapper scripts
    
    Signed-off-by: Sameh Sharkawi <sssharka at us.ibm.com>

diff --git a/src/mpid/pamid/subconfigure.m4 b/src/mpid/pamid/subconfigure.m4
index c1992b1..2fd507a 100644
--- a/src/mpid/pamid/subconfigure.m4
+++ b/src/mpid/pamid/subconfigure.m4
@@ -196,6 +196,17 @@ if test "${pamid_platform}" = "BGQ" ; then
   PAC_APPEND_FLAG([-lpthread],        [LIBS])
   PAC_APPEND_FLAG([-lstdc++],         [LIBS])
 
+  dnl
+  dnl The wrapper scripts require these libraries.
+  dnl
+  PAC_APPEND_FLAG([-l${PAMILIBNAME}], [WRAPPER_LIBS])
+  PAC_APPEND_FLAG([-lSPI],            [WRAPPER_LIBS])
+  PAC_APPEND_FLAG([-lSPI_cnk],        [WRAPPER_LIBS])
+  PAC_APPEND_FLAG([-lrt],             [WRAPPER_LIBS])
+  PAC_APPEND_FLAG([-lpthread],        [WRAPPER_LIBS])
+  PAC_APPEND_FLAG([-lstdc++],         [WRAPPER_LIBS])
+
+
   AC_SEARCH_LIBS([PAMI_Send], [${PAMILIBNAME} pami-gcc])
 
 

-----------------------------------------------------------------------

Summary of changes:
 src/mpid/pamid/include/mpidi_platform.h |    1 -
 src/mpid/pamid/src/Makefile.mk          |    8 +++++++-
 src/mpid/pamid/subconfigure.m4          |   25 ++++++++++++++++++++++++-
 3 files changed, 31 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
MPICH primary repository