[mpich-commits] [mpich] MPICH primary repository branch, master, updated. v3.0.4-302-g1199e48
mysql vizuser
noreply at mpich.org
Tue Jun 11 12:44:20 CDT 2013
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 1199e48387de78086f2c4037dad3ea1aac156174 (commit)
via cc5bafd7e2c5bc6fd6162d2c77f31d462066d785 (commit)
from 40e4efb73d8b88f8a47ea38f95cd67c1df96c700 (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/1199e48387de78086f2c4037dad3ea1aac156174
commit 1199e48387de78086f2c4037dad3ea1aac156174
Author: Michael Blocksome <blocksom at us.ibm.com>
Date: Tue Jun 11 12:05:55 2013 -0500
pamid bgq fix for spi includes
This will match the #include usage in the `hwloc` package.
Signed-off-by: Bob Cernohous <bobc at us.ibm.com>
diff --git a/src/mpid/pamid/include/mpidi_mutex.h b/src/mpid/pamid/include/mpidi_mutex.h
index 052834c..d757ecb 100644
--- a/src/mpid/pamid/include/mpidi_mutex.h
+++ b/src/mpid/pamid/include/mpidi_mutex.h
@@ -38,9 +38,9 @@
#define MUTEX_FAIL 0x8000000000000000UL
-#include "kernel/location.h"
-#include "kernel/memory.h"
-#include "l2/atomic.h"
+#include <spi/include/kernel/location.h>
+#include <spi/include/kernel/memory.h>
+#include <spi/include/l2/atomic.h>
#define MPIDI_MAX_MUTEXES 16
@@ -159,7 +159,7 @@ MPIDI_Mutex_release(unsigned m)
-#include <kernel/location.h>
+#include <spi/include/kernel/location.h>
#define MPIDI_MAX_MUTEXES 16
typedef OPA_int_t MPIDI_Mutex_t;
diff --git a/src/mpid/pamid/subconfigure.m4 b/src/mpid/pamid/subconfigure.m4
index 298ed9d..880040e 100644
--- a/src/mpid/pamid/subconfigure.m4
+++ b/src/mpid/pamid/subconfigure.m4
@@ -125,7 +125,6 @@ if test "${pamid_platform}" = "BGQ" ; then
if test -d ${bgq_driver}/spi/include ; then
PAC_APPEND_FLAG([-I${bgq_driver}], [CPPFLAGS])
- PAC_APPEND_FLAG([-I${bgq_driver}/spi/include], [CPPFLAGS])
PAC_APPEND_FLAG([-I${bgq_driver}/spi/include/kernel/cnk], [CPPFLAGS])
PAC_APPEND_FLAG([-I${bgq_driver}], [WRAPPER_CFLAGS])
http://git.mpich.org/mpich.git/commitdiff/cc5bafd7e2c5bc6fd6162d2c77f31d462066d785
commit cc5bafd7e2c5bc6fd6162d2c77f31d462066d785
Author: Michael Blocksome <blocksom at us.ibm.com>
Date: Tue Jun 11 10:38:12 2013 -0500
Check for the 'comm/sys' directory before adding to compiler flags
Signed-off-by: Bob Cernohous <bobc at us.ibm.com>
diff --git a/src/mpid/pamid/subconfigure.m4 b/src/mpid/pamid/subconfigure.m4
index 1b5171c..298ed9d 100644
--- a/src/mpid/pamid/subconfigure.m4
+++ b/src/mpid/pamid/subconfigure.m4
@@ -125,7 +125,6 @@ if test "${pamid_platform}" = "BGQ" ; then
if test -d ${bgq_driver}/spi/include ; then
PAC_APPEND_FLAG([-I${bgq_driver}], [CPPFLAGS])
- PAC_APPEND_FLAG([-I${bgq_driver}/comm/sys/include], [CPPFLAGS])
PAC_APPEND_FLAG([-I${bgq_driver}/spi/include], [CPPFLAGS])
PAC_APPEND_FLAG([-I${bgq_driver}/spi/include/kernel/cnk], [CPPFLAGS])
@@ -134,15 +133,21 @@ if test "${pamid_platform}" = "BGQ" ; then
PAC_APPEND_FLAG([-I${bgq_driver}], [WRAPPER_FCFLAGS])
PAC_APPEND_FLAG([-I${bgq_driver}], [WRAPPER_FFLAGS])
- PAC_APPEND_FLAG([-I${bgq_driver}/comm/sys/include], [WRAPPER_CFLAGS])
- PAC_APPEND_FLAG([-I${bgq_driver}/comm/sys/include], [WRAPPER_CXXFLAGS])
- PAC_APPEND_FLAG([-I${bgq_driver}/comm/sys/include], [WRAPPER_FCFLAGS])
- PAC_APPEND_FLAG([-I${bgq_driver}/comm/sys/include], [WRAPPER_FFLAGS])
+ if test -d {bgq_driver}/comm/include ; then
+ PAC_APPEND_FLAG([-I${bgq_driver}/comm/include], [CPPFLAGS])
- PAC_APPEND_FLAG([-I${bgq_driver}/spi/include], [WRAPPER_CFLAGS])
- PAC_APPEND_FLAG([-I${bgq_driver}/spi/include], [WRAPPER_CXXFLAGS])
- PAC_APPEND_FLAG([-I${bgq_driver}/spi/include], [WRAPPER_FCFLAGS])
- PAC_APPEND_FLAG([-I${bgq_driver}/spi/include], [WRAPPER_FFLAGS])
+ PAC_APPEND_FLAG([-I${bgq_driver}/comm/include], [WRAPPER_CFLAGS])
+ PAC_APPEND_FLAG([-I${bgq_driver}/comm/include], [WRAPPER_CXXFLAGS])
+ PAC_APPEND_FLAG([-I${bgq_driver}/comm/include], [WRAPPER_FCFLAGS])
+ PAC_APPEND_FLAG([-I${bgq_driver}/comm/include], [WRAPPER_FFLAGS])
+ else
+ PAC_APPEND_FLAG([-I${bgq_driver}/comm/sys/include], [CPPFLAGS])
+
+ PAC_APPEND_FLAG([-I${bgq_driver}/comm/sys/include], [WRAPPER_CFLAGS])
+ PAC_APPEND_FLAG([-I${bgq_driver}/comm/sys/include], [WRAPPER_CXXFLAGS])
+ PAC_APPEND_FLAG([-I${bgq_driver}/comm/sys/include], [WRAPPER_FCFLAGS])
+ PAC_APPEND_FLAG([-I${bgq_driver}/comm/sys/include], [WRAPPER_FFLAGS])
+ fi
PAC_APPEND_FLAG([-I${bgq_driver}/spi/include/kernel/cnk], [WRAPPER_CFLAGS])
PAC_APPEND_FLAG([-I${bgq_driver}/spi/include/kernel/cnk], [WRAPPER_CXXFLAGS])
@@ -152,10 +157,11 @@ if test "${pamid_platform}" = "BGQ" ; then
PAC_APPEND_FLAG([-L${bgq_driver}/spi/lib], [LDFLAGS])
PAC_APPEND_FLAG([-L${bgq_driver}/spi/lib], [WRAPPER_LDFLAGS])
- PAC_APPEND_FLAG([-L${bgq_driver}/comm/sys/lib], [WRAPPER_LDFLAGS])
-
- PAC_APPEND_FLAG([-L${bgq_driver}/spi/lib], [WRAPPER_LDFLAGS])
- PAC_APPEND_FLAG([-L${bgq_driver}/comm/sys/lib], [WRAPPER_LDFLAGS])
+ if test -d ${bgq_driver}/comm/sys/lib ; then
+ PAC_APPEND_FLAG([-L${bgq_driver}/comm/sys/lib], [WRAPPER_LDFLAGS])
+ else
+ PAC_APPEND_FLAG([-L${bgq_driver}/comm/lib], [WRAPPER_LDFLAGS])
+ fi
break
fi
-----------------------------------------------------------------------
Summary of changes:
src/mpid/pamid/include/mpidi_mutex.h | 8 ++++----
src/mpid/pamid/subconfigure.m4 | 33 +++++++++++++++++++--------------
2 files changed, 23 insertions(+), 18 deletions(-)
hooks/post-receive
--
MPICH primary repository
More information about the commits
mailing list