Greetings! Am just updating the Debian xmpi package to the latest
beta (8) on the website. There were a few modifications I had to make
to the upstream source, all of which may not be correct/desirable.
Mostly, mpiCC ->mpic++, no LAM_HOST2COMP defined, and missing
lam_check_constants.m4. Please consider the following patches.
BTW, will this ever come out of beta?
Take care,
--- xmpi-2.2.3b8.orig/configure.in
+++ xmpi-2.2.3b8/configure.in
@@ -66,7 +66,7 @@
# check for specification of C++ compiler
# overrules default mpiCC with lam
-CXX=mpiCC
+CXX=mpic++
CC=mpicc
AC_ARG_WITH(cc,
@@ -84,7 +84,7 @@
AC_MSG_ERROR(the --with-cxx option requires the compiler name)
fi
- AC_MSG_WARN(*** You are not using the mpiCC compiler recommended)
+ AC_MSG_WARN(*** You are not using the mpic++ compiler recommended)
AC_MSG_WARN(*** for building the LAM libxmpi. Be sure to set)
AC_MSG_WARN(*** the approprate include paths to the needed files)
@@ -206,7 +206,7 @@
# Run this test to figure out which ones we should use
#
-LAM_CHECK_CONSTANTS
+#LAM_CHECK_CONSTANTS
# Check for programs.
# Abort if we cannot find one of them
--- xmpi-2.2.3b8.orig/src/libxmpi/ndi_resolve.cc
+++ xmpi-2.2.3b8/src/libxmpi/ndi_resolve.cc
@@ -79,14 +79,15 @@
al_free(newnodelist);
return (0);
}
- } else if (p->ndi_node == LAM_HOST2COMP) {
+ } // else if (p->ndi_node == LAM_HOST2COMP) {
- if (ndi_cast(newnodelist, 0, NT_WASTE | NT_CAST,
- &index)) {
- al_free(newnodelist);
- return (0);
- }
- } else {
+// if (ndi_cast(newnodelist, 0, NT_WASTE | NT_CAST,
+// &index)) {
+// al_free(newnodelist);
+// return (0);
+// }
+// }
+ else {
newnode.ndi_node = p->ndi_node;
newnode.ndi_flags = p->ndi_flags;
newnode.ndi_count = p->ndi_count;
--- xmpi-2.2.3b8.orig/src/libxmpi/nodeslist.cc
+++ xmpi-2.2.3b8/src/libxmpi/nodeslist.cc
@@ -218,10 +218,11 @@
if (node_desc->ndi_node == LOCAL) {
(*nodes)[1].selected = 1;
return 0;
- } else if (node_desc->ndi_node == LAM_HOST2COMP) {
- (*nodes)[0].selected = 1;
- return 0;
- } else
+ } // else if (node_desc->ndi_node == LAM_HOST2COMP) {
+// (*nodes)[0].selected = 1;
+// return 0;
+// }
+ else
(*nodes)[node_desc->ndi_node+2].selected = 1;
}
--- xmpi-2.2.3b8.orig/src/xmpi/xmpi_config.h.in
+++ xmpi-2.2.3b8/src/xmpi/xmpi_config.h.in
@@ -56,9 +56,6 @@
/* Define to 1 if you have the <unistd.h> header file. */
#undef HAVE_UNISTD_H
-/* What symbolic constant to use for HOST2COMP* */
-#undef LAM_HOST2COMP
-
/* Whether we need <sys/select.h> or not */
#undef NEED_SYS_SELECT
--- xmpi-2.2.3b8.orig/src/xmpi/xmpi.h
+++ xmpi-2.2.3b8/src/xmpi/xmpi.h
@@ -72,7 +72,7 @@
#define XMPI_RANKFONT "-*-helvetica-bold-r-normal--*-140-*-*-*-*-*-*"
#define XMPI_MSGFONT "-*-helvetica-medium-r-normal--*-120-*-*-*-*-*-*"
-#define XMPI_HELPCMD "netscape http://www.mpi.nd.edu/lam/software/xmpi/"
+#define XMPI_HELPCMD "sensible-browser http://www.mpi.nd.edu/lam/software/xmpi/"
#define XMPI_INFOLABEL "Boot"
/*
--- xmpi-2.2.3b8.orig/app-defaults/XMPI
+++ xmpi-2.2.3b8/app-defaults/XMPI
@@ -42,4 +42,4 @@
XMPI*popup_help.background: white
XMPI*popup_help.foreground: black
XMPI*infoLabel: Boot
-XMPI*helpCmd: netscape http://www.lam-mpi.org/software/xmpi/help.php
+XMPI*helpCmd: snesible-browser http://www.lam-mpi.org/software/xmpi/help.php
--
Camm Maguire camm_at_[hidden]
==========================================================================
"The earth is but one country, and mankind its citizens." -- Baha'u'llah
|
