Enable MPI_SMP.
authorSameer Kumar <sameerk@us.ibm.com>
Mon, 15 Oct 2012 06:58:50 +0000 (01:58 -0500)
committerSameer Kumar <sameerk@us.ibm.com>
Mon, 15 Oct 2012 10:56:18 +0000 (05:56 -0500)
src/arch/mpi-bluegeneq/cc-xlc.sh
src/arch/mpi-bluegeneq/conv-mach-smp.h [new file with mode: 0755]
src/arch/mpi-bluegeneq/conv-mach-smp.sh [new file with mode: 0755]
src/arch/mpi-bluegeneq/conv-mach.sh

index d10916179b01fcf9b1c1449fa5c0eac56eb10a71..5809d3692483fbf9a0a0af3a5c6e55db095e4557 100644 (file)
@@ -18,13 +18,13 @@ then
 fi
 
 XLC_F=$XLF_TYPICAL_PRE
-CMK_CC="$XLC_PRE/${XLC_POST}xlc -qcpluscmt -qhalt=e $BGQ_INC"
-CMK_CXX="$XLC_PRE/${XLC_POST}xlC -qhalt=e $BGQ_INC"
+CMK_CC="$XLC_PRE/${XLC_POST}xlc_r -qcpluscmt -qhalt=e $BGQ_INC"
+CMK_CXX="$XLC_PRE/${XLC_POST}xlC_r -qhalt=e $BGQ_INC"
 CMK_LD="$CMK_CC"
 CMK_LDXX="$CMK_CXX"
-CMK_CF77="$XLC_F/${XLC_POST}xlf "
-CMK_CF90="$XLC_F/${XLC_POST}xlf90  -qsuffix=f=f90" 
-CMK_CF90_FIXED="$XLC_F/${XLC_POST}xlf90 " 
+CMK_CF77="$XLC_F/${XLC_POST}xlf_r "
+CMK_CF90="$XLC_F/${XLC_POST}xlf90_r  -qsuffix=f=f90" 
+CMK_CF90_FIXED="$XLC_F/${XLC_POST}xlf90_r " 
 CMK_C_OPTIMIZE='-O3 -Q'
 CMK_CXX_OPTIMIZE='-O3 -Q'
 CMK_AR='ar cq'
diff --git a/src/arch/mpi-bluegeneq/conv-mach-smp.h b/src/arch/mpi-bluegeneq/conv-mach-smp.h
new file mode 100755 (executable)
index 0000000..bd44965
--- /dev/null
@@ -0,0 +1,20 @@
+#define CMK_SMP                                            1
+
+#undef CMK_NODE_QUEUE_AVAILABLE
+#define CMK_NODE_QUEUE_AVAILABLE                           1
+
+#undef CMK_SHARED_VARS_UNAVAILABLE
+#undef CMK_SHARED_VARS_POSIX_THREADS_SMP
+#define CMK_SHARED_VARS_UNAVAILABLE                        0
+#define CMK_SHARED_VARS_POSIX_THREADS_SMP                  1
+
+/* Right now only comm thread (no multicore) and tls thread version with gcc works on Blue Gene*/
+#define CMK_MULTICORE                                      0
+
+#ifdef __GNUC__
+#define CMK_NOT_USE_TLS_THREAD                             0
+#else
+#define CMK_NOT_USE_TLS_THREAD                             0
+#endif
+
+#define CMK_PCQUEUE_LOCK                                   1
diff --git a/src/arch/mpi-bluegeneq/conv-mach-smp.sh b/src/arch/mpi-bluegeneq/conv-mach-smp.sh
new file mode 100755 (executable)
index 0000000..4a1f468
--- /dev/null
@@ -0,0 +1,3 @@
+
+#conv-mach-smp.sh:CMK_LD=/opt/ibmcmp/vacpp/bg/12.1/bin/bgxlc_r
+#conv-mach-smp.sh:CMK_LDXX=/opt/ibmcmp/vacpp/bg/12.1/bin/bgxlC_r 
index f45eef114770be579577eb84b0397e18c7b765d4..91fb4ff0cd4558b93e6517b1ce3300192615dea9 100644 (file)
@@ -13,7 +13,7 @@ then
 fi
 
 BGQ_BIN=$BGQ_FLOOR/gnu-linux/bin
-BGQ_INC="-I$BGQ_INSTALL/comm/gcc/include -I$BGQ_INSTALL/spi/include -I$BGQ_INSTALL -I$BGQ_INSTALL/spi/include/kernel/cnk/"
+BGQ_INC="-I$BGQ_INSTALL/comm/xl/include -I$BGQ_INSTALL/spi/include -I$BGQ_INSTALL -I$BGQ_INSTALL/spi/include/kernel/cnk/"
 
 BGQ_LIB="-L$BGQ_INSTALL/comm/xl/lib -lmpich -lopa -lmpl -ldl -L$BGQ_INSTALL/comm/sys-fast/lib -lpami -L$BGQ_INSTALL/spi/lib -lSPI -lSPI_cnk -lpthread -lrt"