Index: MPI-2-C++/config.guess =================================================================== RCS file: /MPIhome/MPI-2-C++/config.guess,v retrieving revision 1.1.1.2 retrieving revision 1.3 diff -r1.1.1.2 -r1.3 3c3 < # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000 --- > # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 5c5,7 < # --- > > timestamp='2001-02-24' > 33,37c35 < # don't specify an explicit system type (host/target name). < # < # Only a few systems have been added to this list; please add others < # (but try to keep the structure clean). < # --- > # don't specify an explicit build system type. 39,49c37,87 < # Use $HOST_CC if defined. $CC may point to a cross-compiler < if test x"$CC_FOR_BUILD" = x; then < if test x"$HOST_CC" != x; then < CC_FOR_BUILD="$HOST_CC" < else < if test x"$CC" != x; then < CC_FOR_BUILD="$CC" < else < CC_FOR_BUILD=cc < fi < fi --- > me=`echo "$0" | sed -e 's,.*/,,'` > > usage="\ > Usage: $0 [OPTION] > > Output the configuration name of the system \`$me' is run on. > > Operation modes: > -h, --help print this help, then exit > -t, --time-stamp print date of last modification, then exit > -v, --version print version number, then exit > > Report bugs and patches to ." > > version="\ > GNU config.guess ($timestamp) > > Originally written by Per Bothner. > Copyright (C) 1992, 93, 94, 95, 96, 97, 98, 99, 2000 > Free Software Foundation, Inc. > > This is free software; see the source for copying conditions. There is NO > warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." > > help=" > Try \`$me --help' for more information." > > # Parse command line > while test $# -gt 0 ; do > case $1 in > --time-stamp | --time* | -t ) > echo "$timestamp" ; exit 0 ;; > --version | -v ) > echo "$version" ; exit 0 ;; > --help | --h* | -h ) > echo "$usage"; exit 0 ;; > -- ) # Stop option processing > shift; break ;; > - ) # Use stdin as input. > break ;; > -* ) > echo "$me: invalid option $1$help" >&2 > exit 1 ;; > * ) > break ;; > esac > done > > if test $# != 0; then > echo "$me: too many arguments$help" >&2 > exit 1 52a91,114 > dummy=dummy-$$ > trap 'rm -f $dummy.c $dummy.o $dummy.rel $dummy; exit 1' 1 2 15 > > # CC_FOR_BUILD -- compiler used by this script. > # Historically, `CC_FOR_BUILD' used to be named `HOST_CC'. We still > # use `HOST_CC' if defined, but it is deprecated. > > case $CC_FOR_BUILD,$HOST_CC,$CC in > ,,) echo "int dummy(){}" > $dummy.c > for c in cc gcc c89 ; do > ($c $dummy.c -c -o $dummy.o) >/dev/null 2>&1 > if test $? = 0 ; then > CC_FOR_BUILD="$c"; break > fi > done > rm -f $dummy.c $dummy.o $dummy.rel > if test x"$CC_FOR_BUILD" = x ; then > CC_FOR_BUILD=no_compiler_found > fi > ;; > ,,*) CC_FOR_BUILD=$CC ;; > ,*,*) CC_FOR_BUILD=$HOST_CC ;; > esac > 61c123 < UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown --- > UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown 64,66d125 < dummy=dummy-$$ < trap 'rm -f $dummy.c $dummy.o $dummy; exit 1' 1 2 15 < 80c139 < amiga) machine=m68k-cbm ;; --- > amiga) machine=m68k-unknown ;; 90,99c149,166 < # The Operating System including object format. < if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \ < | grep __ELF__ >/dev/null < then < # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout). < # Return netbsd for either. FIX? < os=netbsd < else < os=netbsdelf < fi --- > # The Operating System including object format, if it has switched > # to ELF recently, or will in the future. > case "${UNAME_MACHINE}" in > i386|sparc|amiga|arm*|hp300|mvme68k|vax|atari|luna68k|mac68k|news68k|next68k|pc532|sun3*|x68k) > if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \ > | grep __ELF__ >/dev/null > then > # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout). > # Return netbsd for either. FIX? > os=netbsd > else > os=netbsdelf > fi > ;; > *) > os=netbsd > ;; > esac 140c207 < $CC_FOR_BUILD $dummy.s -o $dummy 2>/dev/null --- > $CC_FOR_BUILD $dummy.s -o $dummy 2>/dev/null 1>&2 176c243 < echo m68k-cbm-sysv4 --- > echo m68k-unknown-sysv4 208c275 < SR2?01:HI-UX/MPP:*:*) --- > SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*) 269c336 < # "atarist" or "atariste" at least should have a processor --- > # "atarist" or "atariste" at least should have a processor 363c430 < if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110] --- > if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ] 397a465,472 > ia64:AIX:*:*) > if [ -x /usr/bin/oslevel ] ; then > IBM_REV=`/usr/bin/oslevel` > else > IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE} > fi > echo ${UNAME_MACHINE}-ibm-aix${IBM_REV} > exit 0 ;; 420c495 < *:AIX:*:4) --- > *:AIX:*:[45]) 422c497 < if /usr/sbin/lsattr -EHl ${IBM_CPU_ID} | grep POWER >/dev/null 2>&1; then --- > if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then 430c505 < IBM_REV=4.${UNAME_RELEASE} --- > IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE} 455a531 > HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'` 459a536,552 > case "${HPUX_REV}" in > 11.[0-9][0-9]) > if [ -x /usr/bin/getconf ]; then > sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null` > sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null` > case "${sc_cpu_version}" in > 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0 > 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1 > 532) # CPU_PA_RISC2_0 > case "${sc_kernel_bits}" in > 32) HP_ARCH="hppa2.0n" ;; > 64) HP_ARCH="hppa2.0w" ;; > esac ;; > esac > fi ;; > esac > if [ "${HP_ARCH}" = "" ]; then 460a554,555 > > #define _HPUX_SOURCE 491a587 > if test -z "$HP_ARCH"; then HP_ARCH=hppa; fi 492a589 > fi ;; 494d590 < HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'` 496a593,596 > ia64:HP-UX:*:*) > HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'` > echo ia64-hp-hpux${HPUX_REV} > exit 0 ;; 587c687 < CRAY*T3E:*:*:*) --- > CRAY*T3D:*:*:*) 589a690,692 > CRAY*T3E:*:*:*) > echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' > exit 0 ;; 591c694 < echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' --- > echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' 596c699,700 < F300:UNIX_System_V:*:*) --- > F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*) > FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` 599c703 < echo "f300-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" --- > echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" 601,603d704 < F301:UNIX_System_V:*:*) < echo f301-fujitsu-uxpv`echo $UNAME_RELEASE | sed 's/ .*//'` < exit 0 ;; 607c708 < i?86:BSD/386:*:* | i?86:BSD/OS:*:*) --- > i?86:BSD/386:*:* | i?86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*) 617,622d717 < if test -x /usr/bin/objformat; then < if test "elf" = "`/usr/bin/objformat`"; then < echo ${UNAME_MACHINE}-unknown-freebsdelf`echo ${UNAME_RELEASE}|sed -e 's/[-_].*//'` < exit 0 < fi < fi 633a729,731 > i*:PW*:*) > echo ${UNAME_MACHINE}-pc-pw32 > exit 0 ;; 652,699c750,784 < *:Linux:*:*) < < # The BFD linker knows what the default object file format is, so < # first see if it will tell us. cd to the root directory to prevent < # problems with other programs or directories called `ld' in the path. < ld_help_string=`cd /; ld --help 2>&1` < ld_supported_emulations=`echo $ld_help_string \ < | sed -ne '/supported emulations:/!d < s/[ ][ ]*/ /g < s/.*supported emulations: *// < s/ .*// < p'` < case "$ld_supported_emulations" in < *ia64) < echo "${UNAME_MACHINE}-unknown-linux" < exit 0 < ;; < i?86linux) < echo "${UNAME_MACHINE}-pc-linux-gnuaout" < exit 0 < ;; < i?86coff) < echo "${UNAME_MACHINE}-pc-linux-gnucoff" < exit 0 < ;; < sparclinux) < echo "${UNAME_MACHINE}-unknown-linux-gnuaout" < exit 0 < ;; < armlinux) < echo "${UNAME_MACHINE}-unknown-linux-gnuaout" < exit 0 < ;; < elf32arm*) < echo "${UNAME_MACHINE}-unknown-linux-gnuoldld" < exit 0 < ;; < armelf_linux*) < echo "${UNAME_MACHINE}-unknown-linux-gnu" < exit 0 < ;; < m68klinux) < echo "${UNAME_MACHINE}-unknown-linux-gnuaout" < exit 0 < ;; < elf32ppc | elf32ppclinux) < # Determine Lib Version < cat >$dummy.c < i*86:Minix:*:*) > echo ${UNAME_MACHINE}-pc-minix > exit 0 ;; > arm*:Linux:*:*) > echo ${UNAME_MACHINE}-unknown-linux-gnu > exit 0 ;; > ia64:Linux:*:*) > echo ${UNAME_MACHINE}-unknown-linux > exit 0 ;; > m68*:Linux:*:*) > echo ${UNAME_MACHINE}-unknown-linux-gnuaout > exit 0 ;; > mips:Linux:*:*) > cat >$dummy.c < #ifdef __cplusplus > #include /* for printf() prototype */ > int main (int argc, char *argv[]) { > #else > int main (argc, argv) int argc; char *argv[]; { > #endif > #ifdef __MIPSEB__ > printf ("%s-unknown-linux-gnu\n", argv[1]); > #endif > #ifdef __MIPSEL__ > printf ("%sel-unknown-linux-gnu\n", argv[1]); > #endif > return 0; > } > EOF > $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && ./$dummy "${UNAME_MACHINE}" && rm $dummy.c $dummy && exit 0 > rm -f $dummy.c $dummy > ;; > ppc:Linux:*:*) > # Determine Lib Version > cat >$dummy.c < printf("unknown\n"); 717,718c802,848 < LIBC="" < $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null --- > LIBC="" > $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null > if test "$?" = 0 ; then > ./$dummy | grep 1\.99 > /dev/null > if test "$?" = 0 ; then LIBC="libc1" ; fi > fi > rm -f $dummy.c $dummy > echo powerpc-unknown-linux-gnu${LIBC} > exit 0 ;; > alpha:Linux:*:*) > cat <$dummy.s > .data > \$Lformat: > .byte 37,100,45,37,120,10,0 # "%d-%x\n" > .text > .globl main > .align 4 > .ent main > main: > .frame \$30,16,\$26,0 > ldgp \$29,0(\$27) > .prologue 1 > .long 0x47e03d80 # implver \$0 > lda \$2,-1 > .long 0x47e20c21 # amask \$2,\$1 > lda \$16,\$Lformat > mov \$0,\$17 > not \$1,\$18 > jsr \$26,printf > ldgp \$29,0(\$26) > mov 0,\$16 > jsr \$26,exit > .end main > EOF > LIBC="" > $CC_FOR_BUILD $dummy.s -o $dummy 2>/dev/null > if test "$?" = 0 ; then > case `./$dummy` in > 0-0) UNAME_MACHINE="alpha" ;; > 1-0) UNAME_MACHINE="alphaev5" ;; > 1-1) UNAME_MACHINE="alphaev56" ;; > 1-101) UNAME_MACHINE="alphapca56" ;; > 2-303) UNAME_MACHINE="alphaev6" ;; > 2-307) UNAME_MACHINE="alphaev67" ;; > esac > objdump --private-headers $dummy | \ > grep ld.so.1 > /dev/null 720,726c850,898 < ./$dummy | grep 1\.99 > /dev/null < if test "$?" = 0 ; then < LIBC="libc1" < fi < fi < rm -f $dummy.c $dummy < echo powerpc-unknown-linux-gnu${LIBC} --- > LIBC="libc1" > fi > fi > rm -f $dummy.s $dummy > echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} > exit 0 ;; > parisc:Linux:*:* | hppa:Linux:*:*) > # Look for CPU level > case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in > PA7*) echo hppa1.1-unknown-linux-gnu ;; > PA8*) echo hppa2.0-unknown-linux-gnu ;; > *) echo hppa-unknown-linux-gnu ;; > esac > exit 0 ;; > parisc64:Linux:*:* | hppa64:Linux:*:*) > echo hppa64-unknown-linux-gnu > exit 0 ;; > s390:Linux:*:* | s390x:Linux:*:*) > echo ${UNAME_MACHINE}-ibm-linux > exit 0 ;; > sh*:Linux:*:*) > echo ${UNAME_MACHINE}-unknown-linux-gnu > exit 0 ;; > sparc:Linux:*:*) > echo ${UNAME_MACHINE}-unknown-linux-gnu > exit 0 ;; > x86_64:Linux:*:*) > echo x86_64-unknown-linux-gnu > exit 0 ;; > i?86:Linux:*:*) > # The BFD linker knows what the default object file format is, so > # first see if it will tell us. cd to the root directory to prevent > # problems with other programs or directories called `ld' in the path. > ld_supported_emulations=`cd /; ld --help 2>&1 \ > | sed -ne '/supported emulations:/!d > s/[ ][ ]*/ /g > s/.*supported emulations: *// > s/ .*// > p'` > case "$ld_supported_emulations" in > i?86linux) > echo "${UNAME_MACHINE}-pc-linux-gnuaout" > exit 0 > ;; > elf_i?86) > TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu" > ;; > i?86coff) > echo "${UNAME_MACHINE}-pc-linux-gnucoff" 730,828c902,917 < < if test "${UNAME_MACHINE}" = "alpha" ; then < cat <$dummy.s < .data < \$Lformat: < .byte 37,100,45,37,120,10,0 # "%d-%x\n" < < .text < .globl main < .align 4 < .ent main < main: < .frame \$30,16,\$26,0 < ldgp \$29,0(\$27) < .prologue 1 < .long 0x47e03d80 # implver \$0 < lda \$2,-1 < .long 0x47e20c21 # amask \$2,\$1 < lda \$16,\$Lformat < mov \$0,\$17 < not \$1,\$18 < jsr \$26,printf < ldgp \$29,0(\$26) < mov 0,\$16 < jsr \$26,exit < .end main < EOF < LIBC="" < $CC_FOR_BUILD $dummy.s -o $dummy 2>/dev/null < if test "$?" = 0 ; then < case `./$dummy` in < 0-0) < UNAME_MACHINE="alpha" < ;; < 1-0) < UNAME_MACHINE="alphaev5" < ;; < 1-1) < UNAME_MACHINE="alphaev56" < ;; < 1-101) < UNAME_MACHINE="alphapca56" < ;; < 2-303) < UNAME_MACHINE="alphaev6" < ;; < 2-307) < UNAME_MACHINE="alphaev67" < ;; < esac < < objdump --private-headers $dummy | \ < grep ld.so.1 > /dev/null < if test "$?" = 0 ; then < LIBC="libc1" < fi < fi < rm -f $dummy.s $dummy < echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} ; exit 0 < elif test "${UNAME_MACHINE}" = "mips" ; then < cat >$dummy.c < /* for printf() prototype */ < int main (int argc, char *argv[]) { < #else < int main (argc, argv) int argc; char *argv[]; { < #endif < #ifdef __MIPSEB__ < printf ("%s-unknown-linux-gnu\n", argv[1]); < #endif < #ifdef __MIPSEL__ < printf ("%sel-unknown-linux-gnu\n", argv[1]); < #endif < return 0; < } < EOF < $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && ./$dummy "${UNAME_MACHINE}" && rm $dummy.c $dummy && exit 0 < rm -f $dummy.c $dummy < elif test "${UNAME_MACHINE}" = "s390"; then < echo s390-ibm-linux && exit 0 < else < # Either a pre-BFD a.out linker (linux-gnuoldld) < # or one that does not give us useful --help. < # GCC wants to distinguish between linux-gnuoldld and linux-gnuaout. < # If ld does not provide *any* "supported emulations:" < # that means it is gnuoldld. < echo "$ld_help_string" | grep >/dev/null 2>&1 "supported emulations:" < test $? != 0 && echo "${UNAME_MACHINE}-pc-linux-gnuoldld" && exit 0 < < case "${UNAME_MACHINE}" in < i?86) < VENDOR=pc; < ;; < *) < VENDOR=unknown; < ;; < esac < # Determine whether the default compiler is a.out or elf < cat >$dummy.c < # Either a pre-BFD a.out linker (linux-gnuoldld) > # or one that does not give us useful --help. > # GCC wants to distinguish between linux-gnuoldld and linux-gnuaout. > # If ld does not provide *any* "supported emulations:" > # that means it is gnuoldld. > test -z "$ld_supported_emulations" && echo "${UNAME_MACHINE}-pc-linux-gnuoldld" && exit 0 > case "${UNAME_MACHINE}" in > i?86) > VENDOR=pc; > ;; > *) > VENDOR=unknown; > ;; > esac > # Determine whether the default compiler is a.out or elf > cat >$dummy.c </dev/null && ./$dummy "${UNAME_MACHINE}" && rm $dummy.c $dummy && exit 0 < rm -f $dummy.c $dummy < fi ;; --- > $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null 1>&2 && ./$dummy "${UNAME_MACHINE}" && rm $dummy.c $dummy && exit 0 > rm -f $dummy.c $dummy > test x"${TENTATIVE}" != x && echo "${TENTATIVE}" && exit 0 > ;; 931c1021 < 3[34]??:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 4850:*:4.0:3.0) --- > 3[34]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 4850:*:4.0:3.0) 954c1044 < rs6000:LynxOS:2.*:* | PowerPC:LynxOS:2.*:*) --- > rs6000:LynxOS:2.*:*) 956a1047,1049 > PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:*) > echo powerpc-unknown-lynxos${UNAME_RELEASE} > exit 0 ;; 990c1083 < news*:NEWS-OS:*:6*) --- > news*:NEWS-OS:6*:*) 1021,1022c1114,1115 < Power*:Mac*OS:*:*) < echo powerpc-apple-macos${UNAME_RELEASE} --- > *:Darwin:*:*) > echo `uname -p`-apple-darwin${UNAME_RELEASE} 1024,1025c1117,1121 < *:Mac*OS:*:*) < echo ${UNAME_MACHINE}-apple-macos${UNAME_RELEASE} --- > *:procnto*:*:* | *:QNX:[0123456789]*:*) > if test "${UNAME_MACHINE}" = "x86pc"; then > UNAME_MACHINE=pc > fi > echo `uname -p`-${UNAME_MACHINE}-nto-qnx 1028c1124,1170 < echo i386-qnx-qnx${UNAME_VERSION} --- > echo i386-pc-qnx > exit 0 ;; > NSR-[KW]:NONSTOP_KERNEL:*:*) > echo nsr-tandem-nsk${UNAME_RELEASE} > exit 0 ;; > *:NonStop-UX:*:*) > echo mips-compaq-nonstopux > exit 0 ;; > BS2000:POSIX*:*:*) > echo bs2000-siemens-sysv > exit 0 ;; > DS/*:UNIX_System_V:*:*) > echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE} > exit 0 ;; > *:Plan9:*:*) > # "uname -m" is not consistent, so use $cputype instead. 386 > # is converted to i386 for consistency with other x86 > # operating systems. > if test "$cputype" = "386"; then > UNAME_MACHINE=i386 > else > UNAME_MACHINE="$cputype" > fi > echo ${UNAME_MACHINE}-unknown-plan9 > exit 0 ;; > i?86:OS/2:*:*) > # If we were able to find `uname', then EMX Unix compatibility > # is probably installed. > echo ${UNAME_MACHINE}-pc-os2-emx > exit 0 ;; > *:TOPS-10:*:*) > echo pdp10-unknown-tops10 > exit 0 ;; > *:TENEX:*:*) > echo pdp10-unknown-tenex > exit 0 ;; > KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*) > echo pdp10-dec-tops20 > exit 0 ;; > XKL-1:TOPS-20:*:* | TYPE5:TOPS-20:*:*) > echo pdp10-xkl-tops20 > exit 0 ;; > *:TOPS-20:*:*) > echo pdp10-unknown-tops20 > exit 0 ;; > *:ITS:*:*) > echo pdp10-unknown-its 1121,1125c1263,1280 < #if !defined (ultrix) < printf ("vax-dec-bsd\n"); exit (0); < #else < printf ("vax-dec-ultrix\n"); exit (0); < #endif --- > # if !defined (ultrix) > # include > # if defined (BSD) > # if BSD == 43 > printf ("vax-dec-bsd4.3\n"); exit (0); > # else > # if BSD == 199006 > printf ("vax-dec-bsd4.3reno\n"); exit (0); > # else > printf ("vax-dec-bsd\n"); exit (0); > # endif > # endif > # else > printf ("vax-dec-bsd\n"); exit (0); > # endif > # else > printf ("vax-dec-ultrix\n"); exit (0); > # endif 1169c1324,1359 < #echo '(Unable to guess system type)' 1>&2 --- > cat >&2 < $0: unable to guess system type > > This script, last modified $timestamp, has failed to recognize > the operating system you are using. It is advised that you > download the most up to date version of the config scripts from > > ftp://ftp.gnu.org/pub/gnu/config/ > > If the version you run ($0) is already up to date, please > send the following data and any information you think might be > pertinent to in order to provide the needed > information to handle your system. > > config.guess timestamp = $timestamp > > uname -m = `(uname -m) 2>/dev/null || echo unknown` > uname -r = `(uname -r) 2>/dev/null || echo unknown` > uname -s = `(uname -s) 2>/dev/null || echo unknown` > uname -v = `(uname -v) 2>/dev/null || echo unknown` > > /usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null` > /bin/uname -X = `(/bin/uname -X) 2>/dev/null` > > hostinfo = `(hostinfo) 2>/dev/null` > /bin/universe = `(/bin/universe) 2>/dev/null` > /usr/bin/arch -k = `(/usr/bin/arch -k) 2>/dev/null` > /bin/arch = `(/bin/arch) 2>/dev/null` > /usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null` > /usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null` > > UNAME_MACHINE = ${UNAME_MACHINE} > UNAME_RELEASE = ${UNAME_RELEASE} > UNAME_SYSTEM = ${UNAME_SYSTEM} > UNAME_VERSION = ${UNAME_VERSION} > EOF 1171a1362,1368 > > # Local variables: > # eval: (add-hook 'write-file-hooks 'time-stamp) > # time-stamp-start: "timestamp='" > # time-stamp-format: "%:y-%02m-%02d" > # time-stamp-end: "'" > # End: Index: MPI-2-C++/config.sub =================================================================== RCS file: /MPIhome/MPI-2-C++/config.sub,v retrieving revision 1.1.1.2 retrieving revision 1.2 diff -r1.1.1.2 -r1.2 2,3c2,3 < # Configuration validation subroutine script, version 1.1. < # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000 --- > # Configuration validation subroutine script. > # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 5c5,7 < # --- > > timestamp='2001-02-16' > 30d31 < # Written by Per Bothner . 53,60c54 < if [ x$1 = x ] < then < echo Configuration name missing. 1>&2 < echo "Usage: $0 CPU-MFR-OPSYS" 1>&2 < echo "or $0 ALIAS" 1>&2 < echo where ALIAS is a recognized configuration type. 1>&2 < exit 1 < fi --- > me=`echo "$0" | sed -e 's,.*/,,'` 62,69c56,113 < # First pass through any local machine types. < case $1 in < *local*) < echo $1 < exit 0 < ;; < *) < ;; --- > usage="\ > Usage: $0 [OPTION] CPU-MFR-OPSYS > $0 [OPTION] ALIAS > > Canonicalize a configuration name. > > Operation modes: > -h, --help print this help, then exit > -t, --time-stamp print date of last modification, then exit > -v, --version print version number, then exit > > Report bugs and patches to ." > > version="\ > GNU config.sub ($timestamp) > > Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 > Free Software Foundation, Inc. > > This is free software; see the source for copying conditions. There is NO > warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." > > help=" > Try \`$me --help' for more information." > > # Parse command line > while test $# -gt 0 ; do > case $1 in > --time-stamp | --time* | -t ) > echo "$timestamp" ; exit 0 ;; > --version | -v ) > echo "$version" ; exit 0 ;; > --help | --h* | -h ) > echo "$usage"; exit 0 ;; > -- ) # Stop option processing > shift; break ;; > - ) # Use stdin as input. > break ;; > -* ) > echo "$me: invalid option $1$help" > exit 1 ;; > > *local*) > # First pass through any local machine types. > echo $1 > exit 0;; > > * ) > break ;; > esac > done > > case $# in > 0) echo "$me: missing argument$help" >&2 > exit 1;; > 1) ;; > *) echo "$me: too many arguments$help" >&2 > exit 1;; 76c120 < linux-gnu*) --- > nto-qnx* | linux-gnu* | storm-chaos* | os2-emx*) 102c146 < -apple) --- > -apple | -axis) 174,175c218,220 < tahoe | i860 | ia64 | m32r | m68k | m68000 | m88k | ns32k | arc | arm \ < | arme[lb] | pyramid | mn10200 | mn10300 | tron | a29k \ --- > tahoe | i860 | ia64 | m32r | m68k | m68000 | m88k | ns32k | arc \ > | arm | arme[lb] | arm[bl]e | armv[2345] | armv[345][lb] | strongarm | xscale \ > | pyramid | mn10200 | mn10300 | tron | a29k \ 176a222 > | x86 | ppcbe | mipsbe | mipsle | shbe | shle \ 177a224 > | hppa64 \ 180,181c227,230 < | we32k | ns16k | clipper | i370 | sh | powerpc | powerpcle \ < | 1750a | dsp16xx | pdp11 | mips16 | mips64 | mipsel | mips64el \ --- > | we32k | ns16k | clipper | i370 | sh | sh[34] \ > | powerpc | powerpcle \ > | 1750a | dsp16xx | pdp10 | pdp11 \ > | mips16 | mips64 | mipsel | mips64el \ 186c235 < | thumb | d10v | fr30 | avr) --- > | thumb | d10v | d30v | fr30 | avr | openrisc) 188a238,242 > m6811 | m68hc11 | m6812 | m68hc12) > # Motorola 68HC11/12. > basic_machine=$basic_machine-unknown > os=-none > ;; 195c249 < i[34567]86) --- > i[234567]86 | x86_64) 205,206c259,261 < vax-* | tahoe-* | i[34567]86-* | i860-* | ia64-* | m32r-* | m68k-* | m68000-* \ < | m88k-* | sparc-* | ns32k-* | fx80-* | arc-* | arm-* | c[123]* \ --- > vax-* | tahoe-* | i[234567]86-* | i860-* | ia64-* | m32r-* | m68k-* | m68000-* \ > | m88k-* | sparc-* | ns32k-* | fx80-* | arc-* | c[123]* \ > | arm-* | armbe-* | armle-* | armv*-* | strongarm-* | xscale-* \ 210c265,267 < | hppa-* | hppa1.0-* | hppa1.1-* | hppa2.0-* | hppa2.0w-* | hppa2.0n-* \ --- > | x86-* | ppcbe-* | mipsbe-* | mipsle-* | shbe-* | shle-* \ > | hppa-* | hppa1.0-* | hppa1.1-* | hppa2.0-* | hppa2.0w-* \ > | hppa2.0n-* | hppa64-* \ 215c272 < | sparclite-* | pdp11-* | sh-* | powerpc-* | powerpcle-* \ --- > | sparclite-* | pdp10-* | pdp11-* | sh-* | powerpc-* | powerpcle-* \ 220c277,278 < | f301-* | armv*-* | s390-* | sv1-* | t3e-* \ --- > | f30[01]-* | f700-* | s390-* | s390x-* | sv1-* | t3e-* \ > | [cjt]90-* \ 222c280,281 < | thumb-* | v850-* | d30v-* | tic30-* | c30-* | fr30-* ) --- > | thumb-* | v850-* | d30v-* | tic30-* | c30-* | fr30-* \ > | bs2000-* | tic54x-* | c54x-* | x86_64-*) 259c318 < basic_machine=m68k-cbm --- > basic_machine=m68k-unknown 262c321 < basic_machine=m68k-cbm --- > basic_machine=m68k-unknown 266c325 < basic_machine=m68k-cbm --- > basic_machine=m68k-unknown 313,314c372,373 < [ctj]90-cray) < basic_machine=c90-cray --- > [cjt]90) > basic_machine=${basic_machine}-cray 319a379,381 > cris | cris-* | etrax*) > basic_machine=cris-axis > ;; 366a429,432 > go32) > basic_machine=i386-pc > os=-go32 > ;; 466,476d531 < i386-go32 | go32) < basic_machine=i386-unknown < os=-go32 < ;; < i386-mingw32 | mingw32) < basic_machine=i386-unknown < os=-mingw32 < ;; < i386-qnx | qnx) < basic_machine=i386-qnx < ;; 501a557,560 > mingw32) > basic_machine=i386-pc > os=-mingw32 > ;; 532c591 < basic_machine=i386-unknown --- > basic_machine=i386-pc 595a655,658 > nonstopux) > basic_machine=mips-compaq > os=-nonstopux > ;; 598a662,664 > nsr-tandem) > basic_machine=nsr-tandem > ;; 628c694 < pentium | p5 | k5 | k6 | nexen) --- > pentium | p5 | k5 | k6 | nexgen) 631c697 < pentiumpro | p6 | 6x86) --- > pentiumpro | p6 | 6x86 | athlon) 635c701 < basic_machine=i786-pc --- > basic_machine=i686-pc 637c703 < pentium-* | p5-* | k5-* | k6-* | nexen-*) --- > pentium-* | p5-* | k5-* | k6-* | nexgen-*) 640c706 < pentiumpro-* | p6-* | 6x86-*) --- > pentiumpro-* | p6-* | 6x86-* | athlon-*) 644c710 < basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'` --- > basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'` 649c715 < power) basic_machine=rs6000-ibm --- > power) basic_machine=power-ibm 663a730,733 > pw32) > basic_machine=i586-unknown > os=-pw32 > ;; 754a825,828 > tic54x | c54x*) > basic_machine=tic54x-unknown > os=-coff > ;; 849a924,927 > pdp10) > # there are many clones, so DEC is not a safe bet > basic_machine=pdp10-unknown > ;; 855a934,936 > sh3 | sh4) > basic_machine=sh-unknown > ;; 936c1017,1019 < | -interix* | -uwin* | -rhapsody* | -opened* | -openstep* | -oskit*) --- > | -interix* | -uwin* | -rhapsody* | -darwin* | -opened* \ > | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ > | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* | -os2*) 938a1022,1033 > -qnx*) > case $basic_machine in > x86-* | i[34567]86-*) > ;; > *) > os=-nto$os > ;; > esac > ;; > -nto*) > os=-nto-qnx > ;; 984a1080,1082 > -nsk*) > os=-nsk > ;; 998,1000d1095 < -qnx) < os=-qnx4 < ;; 1022c1117 < -*mint | -*MiNT) --- > -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*) 1025,1027d1119 < -neutrino* | -nto*) < os=-neutrino < ;; 1058a1151,1153 > pdp10-*) > os=-tops20 > ;; 1167c1262 < f301-fujitsu) --- > f30[01]-fujitsu | f700-fujitsu) 1245c1340 < -*mint | -*MiNT) --- > -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*) 1248,1250d1342 < -neutrino* | -nto*) < vendor=qnx < ;; 1256a1349,1356 > exit 0 > > # Local variables: > # eval: (add-hook 'write-file-hooks 'time-stamp) > # time-stamp-start: "timestamp='" > # time-stamp-format: "%:y-%02m-%02d" > # time-stamp-end: "'" > # End: Index: Makefile.in =================================================================== RCS file: /MPIhome/mpich/Makefile.in,v retrieving revision 1.149 retrieving revision 1.162 diff -r1.149 -r1.162 15a16 > CPP_DIR = @CPP_DIR@ 18a20 > FMPILIBNAME = f@MPILIBNAME@ 20a23 > ARCMD = @ARNAME@ 23a27,31 > ### Name of package and version (will be set with automake eventually) > PACKAGE = mpich > VERSION = 1.2.2 > ### End of name of package and version > 102c110 < @-if [ $(BUILDCPP) = 1 -a -d MPI-2-C++ ] ; then \ --- > @-if [ $(BUILDCPP) = 1 -a -d "${CPP_DIR}" ] ; then \ 106c114 < @-if [ -s f90modules/Makefile -a -n "@F90MODINC@" -a "@NO_F90@" = 0 ] ; then \ --- > @-if [ -s f90modules/Makefile -a "@NO_F90@" = 0 ] ; then \ 120c128,129 < $(MAKE) mpichsharelibs --- > @if [ "@SHAREDKIND@" != "ignore" ] ; then \ > $(MAKE) mpichsharelibs ; fi 123,124c132 < # Long term note: The ch_p4 steps should be part of an mpirun-setup or < # device-setup hook. --- > # Note that ch_p4 now invokes the device-dependent mpirun_setup script 126,130c134 < @if [ $(DEVICE) = "ch_p4" -a -s mpid/server/Makefile ] ; then \ < ( cd mpid/server ; $(MAKE) serv_p4 ; ) ; fi < @if [ $(DEVICE) = "ch_p4" ] ; then \ < cp util/tstmachines ${binbuild_dir}/tstmachines ; fi < @/bin/rm -f ${binbuild_dir}/mpirun --- > @rm -f ${binbuild_dir}/mpirun 133c137 < top_srcdir=${top_srcdir} ; \ --- > top_srcdir=${top_srcdir} ; srcdir=${srcdir} ; \ 134a139 > export MAKE ; export srcdir ; \ 138c143 < top_srcdir=${top_srcdir} ; \ --- > top_srcdir=${top_srcdir} ; srcdir=${srcdir} ; \ 139a145 > export MAKE ; export srcdir ; \ 144c150 < @/bin/rm -f ${binbuild_dir}/mpireconfig --- > @rm -f ${binbuild_dir}/mpireconfig 168a175,179 > # One complication is when there are multiple Fortran libraries (the > # alternate Fortran support). In that case, the routines are in > # another file, conventionally libmpich-${compilername}.a > # The test on the filenames below simply prevents error messages > # when using these tests. 173c184 < libf${MPILIBNAME}.a ; do \ --- > lib${FMPILIBNAME}.a ; do \ 178,180c189,201 < if [ $(NOF77) = 0 -a -s farg.o -a -s initf.o ] ; then \ < ${AR} x lib${MPILIBNAME}.a farg.o initf.o ; \ < ${AR} lib${MPILIBNAME}farg.a farg.o initf.o ; \ --- > if [ $(NOF77) = 0 ] ; then \ > if [ "@FLIBNAME@" != "@MPILIBNAME@" ] ; then \ > ${top_srcdir}/util/makesharedlib -exceptobjs="farg.o farg90.o initf.o" -lib=lib@FLIBNAME@.a -kind=@SHAREDKIND@ ; \ > ${ARCMD} x lib@FLIBNAME@.a farg.o initf.o 2>/dev/null ; \ > ${AR} lib@FLIBNAME@farg.a farg.o initf.o ; \ > rm -f farg.o initf.o ; \ > else \ > ${ARCMD} x lib${MPILIBNAME}.a farg.o initf.o 2>/dev/null ; \ > if [ -s farg.o -a -s initf.o ] ; then \ > ${AR} lib${MPILIBNAME}farg.a farg.o initf.o ; \ > rm -f farg.o initf.o ; \ > fi ;\ > fi ; \ 204a226,230 > # > # testing-boot is the same as testing except that mpichboot and mpichstop > # are executed around the test > testing-boot: > (cd examples/test ; $(MAKE) testing-boot ) 245c271 < -(cd src/infoexport ; $(MAKE) default_all ) --- > -@(cd src/infoexport ; $(MAKE) default_all ) 257,258c283,284 < /bin/rm -f $(libbuild_dir)/lib*.a < /bin/rm -f $(libbuild_dir)/shared/lib*.so* --- > rm -f $(libbuild_dir)/lib*.a > rm -f $(libbuild_dir)/shared/lib*.so* 321c347 < /bin/rm -f ${includebuild_dir}/mpi2c++/mpi2c++_config.h ; \ --- > rm -f ${includebuild_dir}/mpi2c++/mpi2c++_config.h ; \ 324,325c350,351 < @(cd MPI-2-C++ ; MAKE="$(MAKE)" ; export MAKE ; \ < /bin/rm -f config.cache ; \ --- > @(cd ${CPP_DIR} ; MAKE="$(MAKE)" ; export MAKE ; \ > rm -f config.cache ; \ 327a354 > CC="@CC@" ; export CC ; \ 329c356 < if ${top_srcdir}/MPI-2-C++/configure --with-mpich=.. \ --- > if ${top_srcdir}/${CPP_DIR}/configure --with-mpich=.. \ 334a362 > --with-mpichlibname=${MPILIBNAME} \ 338,341c366,369 < @if [ -f "MPI-2-C++/src/libmpi++.a" ] ; then \ < cp -p MPI-2-C++/src/libmpi++.a $(libbuild_dir)/libmpich++.a ; \ < elif [ -f "MPI-2-C++/src/libpmpi++.a" ] ; then \ < cp -p MPI-2-C++/src/libpmpi++.a $(libbuild_dir)/libpmpich++.a ; fi --- > @if [ -f "${CPP_DIR}/src/libmpi++.a" ] ; then \ > cp -p ${CPP_DIR}/src/libmpi++.a $(libbuild_dir)/lib${MPILIBNAME}++.a ; \ > elif [ -f "${CPP_DIR}/src/libpmpi++.a" ] ; then \ > cp -p ${CPP_DIR}/src/libpmpi++.a $(libbuild_dir)/libp${MPILIBNAME}++.a ; fi 344c372 < @for file in ${srcdir}/MPI-2-C++/src/mpi2c++/*.h ; do \ --- > @for file in ${srcdir}/${CPP_DIR}/src/mpi2c++/*.h ; do \ 346c374 < @cp MPI-2-C++/src/mpi2c++/mpi2c++_config.h ${includebuild_dir}/mpi2c++ --- > @cp ${CPP_DIR}/src/mpi2c++/mpi2c++_config.h ${includebuild_dir}/mpi2c++ 421,422c449,454 < /bin/rm -f ${binbuild_dir}/$$bfile ; \ < cp ${srcdir}/$$file $(binbuild_dir)/$$bfile ; \ --- > rm -f ${binbuild_dir}/$$bfile ; \ > if test -f $$file ; then \ > cp $$file $(binbuild_dir)/$$bfile ; \ > else \ > cp ${srcdir}/$$file $(binbuild_dir)/$$bfile ; \ > fi ; \ 427c459 < /bin/rm -f ${binbuild_dir}/$$bfile ; \ --- > rm -f ${binbuild_dir}/$$bfile ; \ 468,469c500,501 < if [ ! -d mpid/server ] ; then mkdir mpid/server ; fi < ( cd mpid/server ; /bin/rm -f config.cache ; \ --- > @if [ ! -d mpid/server ] ; then mkdir mpid/server ; fi > @( cd mpid/server ; rm -f config.cache ; \ 473c505 < /bin/rm -f ${binbuild_dir}/chp4_servs --- > @rm -f ${binbuild_dir}/chp4_servs 507,508c539,540 < @-if [ -d MPI-2-C++ -a -s MPI-2-C++/Makefile -a "@buildcpp@" = 1 ] ; then \ < (cd MPI-2-C++ ; $(MAKE) clean ) ; fi --- > @-if [ -d "${CPP_DIR}" -a -s ${CPP_DIR}/Makefile -a "@buildcpp@" = 1 ] ; then \ > (cd ${CPP_DIR} ; $(MAKE) clean ) ; fi 510c542,545 < (cd mpe ; $(MAKE) MAKE="$(MAKE)" clean ) ; fi --- > ( if [ -x $(binbuild_dir)/../sbin/mpeuninstall ] ; then \ > $(binbuild_dir)/../sbin/mpeuninstall > /dev/null ; fi ) ; \ > ( cd mpe ; $(MAKE) MAKE="$(MAKE)" clean ) ; \ > fi 529c564 < -/bin/rm -f *~ *.ln bin/mpi* bin/upshot bin/jumpshot \ --- > -rm -f *~ *.ln bin/mpi* bin/upshot bin/jumpshot \ 535c570 < (cd util ; /bin/rm -f chkmachine chkserv Makefile ) ; \ --- > (cd util ; rm -f chkmachine chkserv Makefile ) ; \ 537c572 < /bin/rm -f machines.IRIX* machines.sun* machines.solaris* \ --- > rm -f machines.IRIX* machines.sun* machines.solaris* \ 541c576 < -/bin/rm -f doc/port doc/portbuild doc/portperf doc/porttest --- > -rm -f doc/port doc/portbuild doc/portperf doc/porttest 545c580 < /bin/rm -f jumpshot/confdefs.h jumpshot/config.log \ --- > rm -f jumpshot/confdefs.h jumpshot/config.log \ 551,553c586,588 < -/bin/rm -f lib/*.[oa] lib/*.so.* lib/*.so lib/shared/* < -/bin/rm -rf include/f90choice include/f90base < -/bin/rm -f include/mpidefs.h include/mpif.h --- > -rm -f lib/*.[oa] lib/*.so.* lib/*.so lib/shared/* > -rm -rf include/f90choice include/f90base > -rm -f include/mpidefs.h include/mpif.h 555c590 < -/bin/rm -f ID --- > -rm -f ID 567,568c602,603 < if [ -d MPI-2-C++ -a -s MPI-2-C++/Makefile -a "@buildcpp@" = 1 ] ; then \ < (cd MPI-2-C++ ; $(MAKE) distclean ) ; fi --- > if [ -d "${CPP_DIR}" -a -s ${CPP_DIR}/Makefile -a "@buildcpp@" = 1 ] ; then \ > (cd ${CPP_DIR} ; $(MAKE) distclean ) ; fi 572c607 < (cd $$dir ; /bin/rm -f Makefile) ;\ --- > (cd $$dir ; rm -f Makefile) ;\ 578c613 < /bin/rm -f examples/test/config.status ; fi --- > rm -f examples/test/config.status ; fi 580c615 < /bin/rm -f src/env/mpehname.c src/env/farg.f ; fi --- > rm -f src/env/mpehname.c src/env/farg.f ; fi 583c618 < /bin/rm -f Makefile config.log config.status mpichconf.h --- > rm -f Makefile config.log config.status mpichconf.h 671c706 < (/bin/rm $(PREFIX)/examples/*) --- > (rm $(PREFIX)/examples/*) 695c730 < done --- > done) Index: configure =================================================================== RCS file: /MPIhome/mpich/configure,v retrieving revision 1.255 retrieving revision 1.279 diff -r1.255 -r1.279 29a30 > [--disable-gencat] 33a35 > [--enable-traceback] [--disable-traceback] 143a146,148 > --enable-traceback - Enable printing of a call stack when MPI and the > user's program is built with certain compilers > (currently only some versions of gcc are supported). 379a385 > f95nag=0 447a454,455 > # Traceback > try_traceback=no 497a506,510 > # Code from autoconf 2 to get any option after an = > case "$arg" in > -*=*) ac_optarg=`echo "$ac_option" | sed 's/[-_a-zA-Z0-9]*=//'` ;; > *) ac_optarg= ;; > esac 632a646,647 > COPTIONS="$COPTIONS -O -Wall -Wstrict-prototypes -Wmissing-prototypes -DGCC_WALL" > export COPTIONS 633a649 > enable_strict="yes" 645a662,664 > -disable-gencat | --disable-gencat) > ignore_gencat="yes" > ;; 711c730,740 < -enable-g | --enable-g ) --- > -enable-traceback | --enable-traceback) > try_traceback=yes > needs_gcc=yes > enable_args="$enable_args --enable-traceback" > ;; > -disable-traceback | --disable-traceback) > try_traceback=no > enable_args="$enable_args --disable-traceback" > ;; > > -enable-g | --enable-g | --enable-g=* | -enable-g=* ) 714,720c743,756 < MEMDEBUG=1 < PTRDEBUG=1 < TRDEBUG=1 < NODEVDEBUG=0 < DEVDEBUGCFLAGS="" < DLAST="-dlast" < enable_args="$enable_args --enable-g" --- > if test "$ac_optarg" = "all" ; then > MEMDEBUG=1 > PTRDEBUG=1 > TRDEBUG=1 > NODEVDEBUG=0 > DEVDEBUGCFLAGS="" > DLAST="-dlast" > fi > enable_args="$enable_args $arg" > if test -z "$ac_optarg" ; then > enable_g="yes" > else > enable_g="$ac_optarg" > fi 848c884 < #f90nag=1 --- > f95nag=1 893c929 < enable_args="$enable_args --enable-c++" --- > # enable_args="$enable_args --enable-c++" 895a932,941 > --enable-altcxx | -enable-altcxx) > # This is for testing an alternate c++ implementation. > # We use cxx instead of c++ to simplify (the eventual) use of > # autoconf v 2, which does not allow enable names with + in them. > CPP_DIR="cxx" > ;; > > --disable-altcxx | -disable-altcxx) > ;; > 1055,1056c1101,1103 < -noromio | --noromio | --without-romio | --with-romio=no ) < ROMIO=0 --- > -noromio | --noromio | --without-romio | --with-romio=no ) > ROMIO=0 > with_args="$with_args --without-romio --without-mpiio" 1399a1447,1453 > if test -n "$arch_ppc_vxworks" ; then > # VXWORKS (Thanks to Gary Cliff ) > # 2/27/01 > echo PPC > arch_IRIX=1 > ARCH=IRIX > fi 1602a1657 > ARCMD="ar" 2281c2336 < CPP_DIR="MPI-2-C++" --- > CPP_DIR="${CPP_DIR:-MPI-2-C++}" 4028c4083 < cat > conftest.c < cat > conftest.c < conftest.c < cat > conftest.c < *) > for p in ar > do > # Extract the first word of "$p", so it can be a program name with args. > set dummy $p; ac_word=$2 > if test -z "$ac_echo_n" ; then > ac_echo_n=yes > if (echo "testing\c"; echo 1,2,3) | grep c >/dev/null; then > # Stardent Vistra SVR4 grep lacks -e, says ghazi@caip.rutgers.edu. > if (echo -n testing; echo 1,2,3) | sed s/-n/xn/ | grep xn >/dev/null; then > ac_n= ac_c=' > ' ac_t=' ' > else > ac_n=-n ac_c= ac_t= > fi > else > ac_n= ac_c='\c' ac_t= > fi > ac_echo_test=`echo foo 1>&1` > if test -z "$ac_echo_test" ; then > print_error "Your sh shell does not handle the output redirection" > print_error "1>&1 correctly. Configure will work around this problem," > print_error "but you should report the problem to your vendor." > fi > > fi > if test -z "$ac_echo_test" -a 1 = 1 ; then > echo $ac_n "checking for $ac_word""... $ac_c" > else > echo $ac_n "checking for $ac_word""... $ac_c" 1>&1 > fi > ac_prog_where="" > if test -n "$ARNAME"; then > ac_pg_ARNAME="$ARNAME" # Let the user override the test. > else > ac_first_char=`expr "$p" : "\(.\)"` > if test "$ac_first_char" = "/" -a -x "$p" ; then > ac_pg_ARNAME="$p" > ac_prog_where=$p > else > IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" > for ac_dir in $PATH; do > test -z "$ac_dir" && ac_dir=. > if test -f $ac_dir/$ac_word; then > ac_pg_ARNAME="$p" > ac_prog_where=$ac_dir/$ac_word > break > fi > done > IFS="$ac_save_ifs" > fi > fi;ARNAME="$ac_pg_ARNAME" > if test -n "$ac_prog_where" ; then > if test -z "$ac_echo_test" -a 1 = 1 ; then > echo "$ac_t""found $ac_prog_where ($ARNAME)" > else > echo "$ac_t""found $ac_prog_where ($ARNAME)" 1>&1 > fi > > else > if test -z "$ac_echo_test" -a 1 = 1 ; then > echo "$ac_t""no" > else > echo "$ac_t""no" 1>&1 > fi > fi > > test -n "$ARNAME" && break > done > if test -z "$ARNAME" ; then > # We have to set this outside of the loop lest the first failure in > # PROGRAM_CHECK set the value (which then terminates the effect of the > # loop, since autoconf macros only set values that are null, they > # don't override them > ARNAME="" > fi > 4878a5011,5013 > if test -z "$ARNAME" ; then > ARNAME="ar" > fi 4880c5015 < AR="ar cr$ARLOCAL" ; ARNAME="ar" ; ARARGS="cr$ARLOCAL" --- > AR="$ARNAME cr$ARLOCAL" ; ARARGS="cr$ARLOCAL" 4882a5018 > 5446a5583 > # +Z for HPUX 5799a5937,6100 > if test -z "$CC_SHARED_OPT" -a "$ARCH" = "hpux" ; then > > if test -z "$ac_echo_n" ; then > ac_echo_n=yes > if (echo "testing\c"; echo 1,2,3) | grep c >/dev/null; then > # Stardent Vistra SVR4 grep lacks -e, says ghazi@caip.rutgers.edu. > if (echo -n testing; echo 1,2,3) | sed s/-n/xn/ | grep xn >/dev/null; then > ac_n= ac_c=' > ' ac_t=' ' > else > ac_n=-n ac_c= ac_t= > fi > else > ac_n= ac_c='\c' ac_t= > fi > ac_echo_test=`echo foo 1>&1` > if test -z "$ac_echo_test" ; then > print_error "Your sh shell does not handle the output redirection" > print_error "1>&1 correctly. Configure will work around this problem," > print_error "but you should report the problem to your vendor." > fi > > fi > if test -z "$ac_echo_test" -a 1 = 1 ; then > echo $ac_n "checking that C compiler accepts option -KPIC""... $ac_c" > else > echo $ac_n "checking that C compiler accepts option -KPIC""... $ac_c" 1>&1 > fi > CFLAGSSAV="$CFLAGS" > CFLAGS="-KPIC $CFLAGS" > rm -f conftest.out > echo 'int try(void);int try(void){return 0;}' > conftest2.c > echo 'int main(void);int main(void){return 0;}' > conftest.c > if ${CC-cc} $CFLAGSSAV -o conftest conftest.c >conftest.bas 2>&1 ; then > if ${CC-cc} $CFLAGS -o conftest conftest.c >conftest.out 2>&1 ; then > if diff -b conftest.out conftest.bas >/dev/null 2>&1 ; then > if test -z "$ac_echo_test" -a 1 = 1 ; then > echo "$ac_t""yes" > else > echo "$ac_t""yes" 1>&1 > fi > if test -z "$ac_echo_n" ; then > ac_echo_n=yes > if (echo "testing\c"; echo 1,2,3) | grep c >/dev/null; then > # Stardent Vistra SVR4 grep lacks -e, says ghazi@caip.rutgers.edu. > if (echo -n testing; echo 1,2,3) | sed s/-n/xn/ | grep xn >/dev/null; then > ac_n= ac_c=' > ' ac_t=' ' > else > ac_n=-n ac_c= ac_t= > fi > else > ac_n= ac_c='\c' ac_t= > fi > ac_echo_test=`echo foo 1>&1` > if test -z "$ac_echo_test" ; then > print_error "Your sh shell does not handle the output redirection" > print_error "1>&1 correctly. Configure will work around this problem," > print_error "but you should report the problem to your vendor." > fi > > fi > if test -z "$ac_echo_test" -a 1 = 1 ; then > echo $ac_n "checking that routines compiled with -KPIC can be linked with ones compiled without -KPIC""... $ac_c" > else > echo $ac_n "checking that routines compiled with -KPIC can be linked with ones compiled without -KPIC""... $ac_c" 1>&1 > fi > /bin/rm -f conftest.out > /bin/rm -f conftest.bas > if ${CC-cc} -c $CFLAGSSAV conftest2.c >conftest2.out 2>&1 ; then > if ${CC-cc} $CFLAGS -o conftest conftest2.o conftest.c >conftest.bas 2>&1 ; then > if ${CC-cc} $CFLAGS -o conftest conftest2.o conftest.c >conftest.out 2>&1 ; then > if diff -b conftest.out conftest.bas >/dev/null 2>&1 ; then > if test -z "$ac_echo_test" -a 1 = 1 ; then > echo "$ac_t""yes" > else > echo "$ac_t""yes" 1>&1 > fi > CC_SHARED_OPT=+Z > elif test -s conftest.out ; then > cat conftest.out >> config.log > if test -z "$ac_echo_test" -a 1 = 1 ; then > echo "$ac_t""no" > else > echo "$ac_t""no" 1>&1 > fi > print_error "Will not add -KPIC to CFLAGS" > CFLAGS="$CFLAGSSAV" > > else > if test -z "$ac_echo_test" -a 1 = 1 ; then > echo "$ac_t""no" > else > echo "$ac_t""no" 1>&1 > fi > print_error "Will not add -KPIC to CFLAGS" > CFLAGS="$CFLAGSSAV" > > fi > else > if test -s conftest.out ; then > cat conftest.out >> config.log > fi > if test -z "$ac_echo_test" -a 1 = 1 ; then > echo "$ac_t""no" > else > echo "$ac_t""no" 1>&1 > fi > print_error "Will not add -KPIC to CFLAGS" > CFLAGS="$CFLAGSSAV" > > fi > else > # Could not link with the option! > if test -z "$ac_echo_test" -a 1 = 1 ; then > echo "$ac_t""no" > else > echo "$ac_t""no" 1>&1 > fi > fi > else > if test -s conftest2.out ; then > cat conftest.out >> config.log > fi > if test -z "$ac_echo_test" -a 1 = 1 ; then > echo "$ac_t""no" > else > echo "$ac_t""no" 1>&1 > fi > print_error "Will not add -KPIC to CFLAGS" > CFLAGS="$CFLAGSSAV" > > fi > else > cat conftest.out >> config.log > if test -z "$ac_echo_test" -a 1 = 1 ; then > echo "$ac_t""no" > else > echo "$ac_t""no" 1>&1 > fi > > CFLAGS="$CFLAGSSAV" > fi > else > if test -z "$ac_echo_test" -a 1 = 1 ; then > echo "$ac_t""no" > else > echo "$ac_t""no" 1>&1 > fi > > if test -s conftest.out ; then cat conftest.out >> config.log ; fi > CFLAGS="$CFLAGSSAV" > fi > else > # Could not compile without the option! > if test -z "$ac_echo_test" -a 1 = 1 ; then > echo "$ac_t""no" > else > echo "$ac_t""no" 1>&1 > fi > fi > rm -f conftest* > > fi 6516a6818 > # Should set MPIBOOT and MPIUNBOOT if provided 7606c7908 < cat > conftest.c < cat > conftest.c < conftest.c < cat > conftest.c < # clock_gettime is the POSIX gettimeofday > for func in clock_gettime clock_getres > do > trfunc=HAVE_`echo $func | tr '[a-z]' '[A-Z]'` 7690c7993 < echo $ac_n "checking for how many arguments gettimeofday takes""... $ac_c" --- > echo $ac_n "checking for ${func}""... $ac_c" 7692c7995,8087 < echo $ac_n "checking for how many arguments gettimeofday takes""... $ac_c" 1>&1 --- > echo $ac_n "checking for ${func}""... $ac_c" 1>&1 > fi > if test ! -f confdefs.h ; then > if test -z "$ac_echo_test" -a 1 = 1 ; then > echo "$ac_t"""!! SHELL ERROR !!"" > else > echo "$ac_t"""!! SHELL ERROR !!"" 1>&1 > fi > echo "The file confdefs.h created by configure has been removed" > echo "This may be a problem with your shell; some versions of LINUX" > echo "have this problem. See the Installation guide for more" > echo "information." > exit 1 > fi > cat > conftest.c < #include "confdefs.h" > #include > int main() { exit(0); } > int t() { > /* The GNU C library defines this for functions which it implements > to always fail with ENOSYS. Some functions are actually named > something starting with __ and the normal name is an alias. */ > #if defined (__stub_${func}) || defined (__stub___${func}) > choke me > #else > /* Override any gcc2 internal prototype to avoid an error. */ > extern char ${func}(); ${func}(); > #endif > } > EOF > if eval $compile; then > if test -z "$ac_echo_test" -a 1 = 1 ; then > echo "$ac_t""yes" > else > echo "$ac_t""yes" 1>&1 > fi > > { > test -n "$verbose" && \ > echo " defining ${trfunc}" > echo "#define" ${trfunc} 1 >> confdefs.h > DEFS="$DEFS -D${trfunc}=1" > SEDDEFS="${SEDDEFS}\${SEDdA}${trfunc}\${SEDdB}${trfunc}\${SEDdC}1\${SEDdD} > \${SEDuA}${trfunc}\${SEDuB}${trfunc}\${SEDuC}1\${SEDuD} > \${SEDeA}${trfunc}\${SEDeB}${trfunc}\${SEDeC}1\${SEDeD} > " > } > > > else if test -z "$ac_echo_test" -a 1 = 1 ; then > echo "$ac_t""no" > else > echo "$ac_t""no" 1>&1 > fi > cat conftest.c >> config.log > if test -s conftest.out ; then cat conftest.out >> config.log > else > ${CC-cc} $CFLAGS conftest.c -o conftest $LIBS >> config.log 2>&1 > fi > > fi > rm -f conftest* > done > > # > # Some devices use gettimeofday. If this is one of them, check to see > # what form it is > > if test -z "$ac_echo_n" ; then > ac_echo_n=yes > if (echo "testing\c"; echo 1,2,3) | grep c >/dev/null; then > # Stardent Vistra SVR4 grep lacks -e, says ghazi@caip.rutgers.edu. > if (echo -n testing; echo 1,2,3) | sed s/-n/xn/ | grep xn >/dev/null; then > ac_n= ac_c=' > ' ac_t=' ' > else > ac_n=-n ac_c= ac_t= > fi > else > ac_n= ac_c='\c' ac_t= > fi > ac_echo_test=`echo foo 1>&1` > if test -z "$ac_echo_test" ; then > print_error "Your sh shell does not handle the output redirection" > print_error "1>&1 correctly. Configure will work around this problem," > print_error "but you should report the problem to your vendor." > fi > > fi > if test -z "$ac_echo_test" -a 1 = 1 ; then > echo $ac_n "checking for how many arguments gettimeofday takes""... $ac_c" > else > echo $ac_n "checking for how many arguments gettimeofday takes""... $ac_c" 1>&1 8323a8719 > # PARTIAL FIX: use only for DEVICE_KIND == network. 8325c8721 < if test -z "$rshcommand" ; then --- > if test $DEVICE_KIND = network -a -z "$rshcommand" ; then 8402c8798 < # should check that it works; allow ssh as another fallback --- > # should check that it works 8486,8487c8882 < perlversion=`$PERL -v | grep 'This is perl' | \ < sed -e 's/^.*version *\([0-9]\).*$/\1/'` --- > perlversion=`$PERL -e 'print substr($],0,1)."\n";' conftest.c < > > if test "$cross_compiling" = 1 -a -z "$TESTCC" ; then > > Pac_CV_NAME=0 > else > if test -n "$TESTCC" ; then > CCsav="$CC" > CC="$TESTCC" > fi > cat > conftest.c </dev/null; then < : < else < pac_r=1 --- > if test -n "$compile" ; then > eval $compile > else > eval $ac_compile > eval $ac_link > fi > if test ! -s conftest ; then > echo "Could not build executable program:" > echo "${CC-cc} $CFLAGS conftest.c -o conftest $LIBS" > ${CC-cc} $CFLAGS conftest.c -o conftest $LIBS > pac_r=1 > > else > /bin/rm -f conftestout > if test -s conftest && (./conftest; exit) 2>conftestout; then > : > else > pac_r=1 > > if test -s conftestout ; then cat conftestout >> config.log ; fi > echo "Test program was" >> config.log > cat conftest.c >> config.log > > fi > fi > if test -n "$TESTCC" ; then > CC="$CCsav" > fi > rm -fr conftest* 8564c8993 < rm -fr conftest* --- > 10034a10464,10466 > elif test "$ignore_gencat" = "yes" ; then > # Ignore message catalog > : 10557a10990,10993 > # This approach fails for compilers that generate noise. What we need to > # do is to run a program that makes use of stdarg and see if it works > # correctly. We can fall back on this approach when cross-compiling > # 11114,11116c11550,11551 < # Look for headers that might have memset().... < # (string.h might also, but it is also needed by MPE) < for ac_hdr in memory.h --- > # strdup is used in MPI_Info_xxx > for func in strdup 11118c11553 < ac_safe=`echo "$ac_hdr" | tr '[a-z]./' '[A-Z]__'` --- > trfunc=HAVE_`echo $func | tr '[a-z]' '[A-Z]'` 11141c11576 < echo $ac_n "checking for $ac_hdr""... $ac_c" --- > echo $ac_n "checking for ${func}""... $ac_c" 11143c11578 < echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&1 --- > echo $ac_n "checking for ${func}""... $ac_c" 1>&1 11159,11160c11594 < < #include <$ac_hdr> --- > #include 11162c11596,11606 < int t() { main(); } --- > int t() { > /* The GNU C library defines this for functions which it implements > to always fail with ENOSYS. Some functions are actually named > something starting with __ and the normal name is an alias. */ > #if defined (__stub_${func}) || defined (__stub___${func}) > choke me > #else > /* Override any gcc2 internal prototype to avoid an error. */ > extern char ${func}(); ${func}(); > #endif > } 11165,11179d11608 < < < eval "ac_cv_header_$ac_safe=yes" < < else < cat conftest.c >> config.log < if test -s conftest.out ; then cat conftest.out >> config.log < else < ${CC-cc} $CFLAGS conftest.c -o conftest $LIBS >> config.log 2>&1 < fi < eval "ac_cv_header_$ac_safe=no" < < fi < rm -f conftest* < if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then 11185d11613 < ac_tr_hdr=HAVE_`echo $ac_hdr | tr '[a-z]./' '[A-Z]__'` 11187c11615 < { --- > { 11189,11194c11617,11622 < echo " defining $ac_tr_hdr" < echo "#define" $ac_tr_hdr 1 >> confdefs.h < DEFS="$DEFS -D$ac_tr_hdr=1" < SEDDEFS="${SEDDEFS}\${SEDdA}$ac_tr_hdr\${SEDdB}$ac_tr_hdr\${SEDdC}1\${SEDdD} < \${SEDuA}$ac_tr_hdr\${SEDuB}$ac_tr_hdr\${SEDuC}1\${SEDuD} < \${SEDeA}$ac_tr_hdr\${SEDeB}$ac_tr_hdr\${SEDeC}1\${SEDeD} --- > echo " defining ${trfunc}" > echo "#define" ${trfunc} 1 >> confdefs.h > DEFS="$DEFS -D${trfunc}=1" > SEDDEFS="${SEDDEFS}\${SEDdA}${trfunc}\${SEDdB}${trfunc}\${SEDdC}1\${SEDdD} > \${SEDuA}${trfunc}\${SEDuB}${trfunc}\${SEDuC}1\${SEDuD} > \${SEDeA}${trfunc}\${SEDeB}${trfunc}\${SEDeC}1\${SEDeD} 11197,11199c11625,11627 < < else < if test -z "$ac_echo_test" -a 1 = 1 ; then --- > > > else if test -z "$ac_echo_test" -a 1 = 1 ; then 11203a11632,11637 > cat conftest.c >> config.log > if test -s conftest.out ; then cat conftest.out >> config.log > else > ${CC-cc} $CFLAGS conftest.c -o conftest $LIBS >> config.log 2>&1 > fi > 11204a11639 > rm -f conftest* 11208,11246c11643,11647 < # Turn off F77 < # One problem with this is that some part of the ar will fail. Lets hope < # it isn't fatal. < if test $NOF77 = 1 ; then < F77="echo no Fortran compiler" < FLINKER="$F77" < enable_args="$enable_args --disable-f77" < fi < # This simplifies some of the Makefiles in the examples and tests < if test "$NO_F90" = 1 ; then < F90="echo no Fortran 90 compiler" < F90LINKER="$F90" < do_f90modules="no" < enable_args="$enable_args --disable-f90 --disable-f90modules" < fi < # < # < # Check for erroneous C compilers < broken=0 < do_test=1 < if test "$cross_compiling" = 1 ; then < if test "$CC" = mpcc ; then < TESTCC=xlc < elif test "$CC" = mpCC ; then < TESTCC=xlC < else < do_test=0 < fi < else < # If not cross compiling, testcc is just the compiler < TESTCC="$CC" < fi < # < # Should eventually use a file like $file.run to see if the program should < # be run or just compiled. And eventually, this should be run EARLY, < # before checking for things like functions and include files. < # < < --- > # Look for headers that might have memset().... > # (string.h might also, but it is also needed by MPE) > for ac_hdr in memory.h > do > ac_safe=`echo "$ac_hdr" | tr '[a-z]./' '[A-Z]__'` 11269c11670 < echo $ac_n "checking that the compiler $CC runs""... $ac_c" --- > echo $ac_n "checking for $ac_hdr""... $ac_c" 11271c11672 < echo $ac_n "checking that the compiler $CC runs""... $ac_c" 1>&1 --- > echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&1 11287a11689 > #include <$ac_hdr> 11289c11691,12003 < int t() { return 0; } --- > int t() { main(); } > EOF > if eval $compile; then > > > eval "ac_cv_header_$ac_safe=yes" > > else > cat conftest.c >> config.log > if test -s conftest.out ; then cat conftest.out >> config.log > else > ${CC-cc} $CFLAGS conftest.c -o conftest $LIBS >> config.log 2>&1 > fi > eval "ac_cv_header_$ac_safe=no" > > fi > rm -f conftest* > if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then > if test -z "$ac_echo_test" -a 1 = 1 ; then > echo "$ac_t""yes" > else > echo "$ac_t""yes" 1>&1 > fi > ac_tr_hdr=HAVE_`echo $ac_hdr | tr '[a-z]./' '[A-Z]__'` > > { > test -n "$verbose" && \ > echo " defining $ac_tr_hdr" > echo "#define" $ac_tr_hdr 1 >> confdefs.h > DEFS="$DEFS -D$ac_tr_hdr=1" > SEDDEFS="${SEDDEFS}\${SEDdA}$ac_tr_hdr\${SEDdB}$ac_tr_hdr\${SEDdC}1\${SEDdD} > \${SEDuA}$ac_tr_hdr\${SEDuB}$ac_tr_hdr\${SEDuC}1\${SEDuD} > \${SEDeA}$ac_tr_hdr\${SEDeB}$ac_tr_hdr\${SEDeC}1\${SEDeD} > " > } > > else > if test -z "$ac_echo_test" -a 1 = 1 ; then > echo "$ac_t""no" > else > echo "$ac_t""no" 1>&1 > fi > fi > done > > # > # Check for header files needed to obtain list of networking interfaces > # > for ac_hdr in sys/ioctl.h > do > ac_safe=`echo "$ac_hdr" | tr '[a-z]./' '[A-Z]__'` > if test -z "$ac_echo_n" ; then > ac_echo_n=yes > if (echo "testing\c"; echo 1,2,3) | grep c >/dev/null; then > # Stardent Vistra SVR4 grep lacks -e, says ghazi@caip.rutgers.edu. > if (echo -n testing; echo 1,2,3) | sed s/-n/xn/ | grep xn >/dev/null; then > ac_n= ac_c=' > ' ac_t=' ' > else > ac_n=-n ac_c= ac_t= > fi > else > ac_n= ac_c='\c' ac_t= > fi > ac_echo_test=`echo foo 1>&1` > if test -z "$ac_echo_test" ; then > print_error "Your sh shell does not handle the output redirection" > print_error "1>&1 correctly. Configure will work around this problem," > print_error "but you should report the problem to your vendor." > fi > > fi > if test -z "$ac_echo_test" -a 1 = 1 ; then > echo $ac_n "checking for $ac_hdr""... $ac_c" > else > echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&1 > fi > if test ! -f confdefs.h ; then > if test -z "$ac_echo_test" -a 1 = 1 ; then > echo "$ac_t"""!! SHELL ERROR !!"" > else > echo "$ac_t"""!! SHELL ERROR !!"" 1>&1 > fi > echo "The file confdefs.h created by configure has been removed" > echo "This may be a problem with your shell; some versions of LINUX" > echo "have this problem. See the Installation guide for more" > echo "information." > exit 1 > fi > cat > conftest.c < #include "confdefs.h" > > #include <$ac_hdr> > int main() { exit(0); } > int t() { main(); } > EOF > if eval $compile; then > > > eval "ac_cv_header_$ac_safe=yes" > > else > cat conftest.c >> config.log > if test -s conftest.out ; then cat conftest.out >> config.log > else > ${CC-cc} $CFLAGS conftest.c -o conftest $LIBS >> config.log 2>&1 > fi > eval "ac_cv_header_$ac_safe=no" > > fi > rm -f conftest* > if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then > if test -z "$ac_echo_test" -a 1 = 1 ; then > echo "$ac_t""yes" > else > echo "$ac_t""yes" 1>&1 > fi > ac_tr_hdr=HAVE_`echo $ac_hdr | tr '[a-z]./' '[A-Z]__'` > > { > test -n "$verbose" && \ > echo " defining $ac_tr_hdr" > echo "#define" $ac_tr_hdr 1 >> confdefs.h > DEFS="$DEFS -D$ac_tr_hdr=1" > SEDDEFS="${SEDDEFS}\${SEDdA}$ac_tr_hdr\${SEDdB}$ac_tr_hdr\${SEDdC}1\${SEDdD} > \${SEDuA}$ac_tr_hdr\${SEDuB}$ac_tr_hdr\${SEDuC}1\${SEDuD} > \${SEDeA}$ac_tr_hdr\${SEDeB}$ac_tr_hdr\${SEDeC}1\${SEDeD} > " > } > > else > if test -z "$ac_echo_test" -a 1 = 1 ; then > echo "$ac_t""no" > else > echo "$ac_t""no" 1>&1 > fi > fi > done > > for ac_hdr in sys/sockio.h > do > ac_safe=`echo "$ac_hdr" | tr '[a-z]./' '[A-Z]__'` > if test -z "$ac_echo_n" ; then > ac_echo_n=yes > if (echo "testing\c"; echo 1,2,3) | grep c >/dev/null; then > # Stardent Vistra SVR4 grep lacks -e, says ghazi@caip.rutgers.edu. > if (echo -n testing; echo 1,2,3) | sed s/-n/xn/ | grep xn >/dev/null; then > ac_n= ac_c=' > ' ac_t=' ' > else > ac_n=-n ac_c= ac_t= > fi > else > ac_n= ac_c='\c' ac_t= > fi > ac_echo_test=`echo foo 1>&1` > if test -z "$ac_echo_test" ; then > print_error "Your sh shell does not handle the output redirection" > print_error "1>&1 correctly. Configure will work around this problem," > print_error "but you should report the problem to your vendor." > fi > > fi > if test -z "$ac_echo_test" -a 1 = 1 ; then > echo $ac_n "checking for $ac_hdr""... $ac_c" > else > echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&1 > fi > if test ! -f confdefs.h ; then > if test -z "$ac_echo_test" -a 1 = 1 ; then > echo "$ac_t"""!! SHELL ERROR !!"" > else > echo "$ac_t"""!! SHELL ERROR !!"" 1>&1 > fi > echo "The file confdefs.h created by configure has been removed" > echo "This may be a problem with your shell; some versions of LINUX" > echo "have this problem. See the Installation guide for more" > echo "information." > exit 1 > fi > cat > conftest.c < #include "confdefs.h" > > #include <$ac_hdr> > int main() { exit(0); } > int t() { main(); } > EOF > if eval $compile; then > > > eval "ac_cv_header_$ac_safe=yes" > > else > cat conftest.c >> config.log > if test -s conftest.out ; then cat conftest.out >> config.log > else > ${CC-cc} $CFLAGS conftest.c -o conftest $LIBS >> config.log 2>&1 > fi > eval "ac_cv_header_$ac_safe=no" > > fi > rm -f conftest* > if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then > if test -z "$ac_echo_test" -a 1 = 1 ; then > echo "$ac_t""yes" > else > echo "$ac_t""yes" 1>&1 > fi > ac_tr_hdr=HAVE_`echo $ac_hdr | tr '[a-z]./' '[A-Z]__'` > > { > test -n "$verbose" && \ > echo " defining $ac_tr_hdr" > echo "#define" $ac_tr_hdr 1 >> confdefs.h > DEFS="$DEFS -D$ac_tr_hdr=1" > SEDDEFS="${SEDDEFS}\${SEDdA}$ac_tr_hdr\${SEDdB}$ac_tr_hdr\${SEDdC}1\${SEDdD} > \${SEDuA}$ac_tr_hdr\${SEDuB}$ac_tr_hdr\${SEDuC}1\${SEDuD} > \${SEDeA}$ac_tr_hdr\${SEDeB}$ac_tr_hdr\${SEDeC}1\${SEDeD} > " > } > > else > if test -z "$ac_echo_test" -a 1 = 1 ; then > echo "$ac_t""no" > else > echo "$ac_t""no" 1>&1 > fi > fi > done > > # > # Turn off F77 > # One problem with this is that some part of the ar will fail. Lets hope > # it isn't fatal. > if test $NOF77 = 1 ; then > F77="echo no Fortran compiler" > FLINKER="$F77" > enable_args="$enable_args --disable-f77" > fi > # This simplifies some of the Makefiles in the examples and tests > if test "$NO_F90" = 1 ; then > F90="echo no Fortran 90 compiler" > F90LINKER="$F90" > do_f90modules="no" > enable_args="$enable_args --disable-f90 --disable-f90modules" > fi > # > # > # Check for erroneous C compilers > broken=0 > do_test=1 > if test "$cross_compiling" = 1 ; then > if test "$CC" = mpcc ; then > TESTCC=xlc > elif test "$CC" = mpCC ; then > TESTCC=xlC > else > do_test=0 > fi > else > # If not cross compiling, testcc is just the compiler > TESTCC="$CC" > fi > # > # Should eventually use a file like $file.run to see if the program should > # be run or just compiled. And eventually, this should be run EARLY, > # before checking for things like functions and include files. > # > > > if test -z "$ac_echo_n" ; then > ac_echo_n=yes > if (echo "testing\c"; echo 1,2,3) | grep c >/dev/null; then > # Stardent Vistra SVR4 grep lacks -e, says ghazi@caip.rutgers.edu. > if (echo -n testing; echo 1,2,3) | sed s/-n/xn/ | grep xn >/dev/null; then > ac_n= ac_c=' > ' ac_t=' ' > else > ac_n=-n ac_c= ac_t= > fi > else > ac_n= ac_c='\c' ac_t= > fi > ac_echo_test=`echo foo 1>&1` > if test -z "$ac_echo_test" ; then > print_error "Your sh shell does not handle the output redirection" > print_error "1>&1 correctly. Configure will work around this problem," > print_error "but you should report the problem to your vendor." > fi > > fi > if test -z "$ac_echo_test" -a 1 = 1 ; then > echo $ac_n "checking that the compiler $CC runs""... $ac_c" > else > echo $ac_n "checking that the compiler $CC runs""... $ac_c" 1>&1 > fi > if test ! -f confdefs.h ; then > if test -z "$ac_echo_test" -a 1 = 1 ; then > echo "$ac_t"""!! SHELL ERROR !!"" > else > echo "$ac_t"""!! SHELL ERROR !!"" 1>&1 > fi > echo "The file confdefs.h created by configure has been removed" > echo "This may be a problem with your shell; some versions of LINUX" > echo "have this problem. See the Installation guide for more" > echo "information." > exit 1 > fi > cat > conftest.c < #include "confdefs.h" > > int main() { exit(0); } > int t() { return 0; } 12612,12614c13326,13330 < if test -n "$cross_compiling" < then < has_long_long=${CROSS_HAS_LONG_LONG:-0}; --- > > > if test "$cross_compiling" = 1 -a -z "$TESTCC" ; then > has_long_long=${CROSS_HAS_LONG_LONG:-0}; > Pac_CV_NAME=0 12616c13332,13336 < cat > conftest.c < if test -n "$TESTCC" ; then > CCsav="$CC" > CC="$TESTCC" > fi > cat > conftest.c </dev/null; then < has_long_long=1 --- > if test -n "$compile" ; then > eval $compile > else > eval $ac_compile > eval $ac_link > fi > if test ! -s conftest ; then > echo "Could not build executable program:" > echo "${CC-cc} $CFLAGS conftest.c -o conftest $LIBS" > ${CC-cc} $CFLAGS conftest.c -o conftest $LIBS > has_long_long=0 12627,12629c13355,13372 < else < has_long_long=0 < fi --- > else > /bin/rm -f conftestout > if test -s conftest && (./conftest; exit) 2>conftestout; then > has_long_long=1 > > else > has_long_long=0 > > if test -s conftestout ; then cat conftestout >> config.log ; fi > echo "Test program was" >> config.log > cat conftest.c >> config.log > > fi > fi > if test -n "$TESTCC" ; then > CC="$CCsav" > fi > rm -fr conftest* 12631c13374 < rm -fr conftest* --- > 12801,12803c13544,13547 < if test -n "$cross_compiling" < then < if test -n "$CROSS_HAS_LONG_DOUBLE" ; then --- > > > if test "$cross_compiling" = 1 -a -z "$TESTCC" ; then > if test -n "$CROSS_HAS_LONG_DOUBLE" ; then 12829a13574 > Pac_CV_NAME=0 12831c13576,13580 < cat > conftest.c < if test -n "$TESTCC" ; then > CCsav="$CC" > CC="$TESTCC" > fi > cat > conftest.c </dev/null; then < --- > if test -n "$compile" ; then > eval $compile > else > eval $ac_compile > eval $ac_link > fi > if test ! -s conftest ; then > echo "Could not build executable program:" > echo "${CC-cc} $CFLAGS conftest.c -o conftest $LIBS" > ${CC-cc} $CFLAGS conftest.c -o conftest $LIBS > if test -z "$ac_echo_test" -a 1 = 1 ; then > echo "$ac_t""no" > else > echo "$ac_t""no" 1>&1 > fi > > else > /bin/rm -f conftestout > if test -s conftest && (./conftest; exit) 2>conftestout; then > 12856,12857c13622,13623 < else < if test -z "$ac_echo_test" -a 1 = 1 ; then --- > else > if test -z "$ac_echo_test" -a 1 = 1 ; then 12861a13628,13638 > > if test -s conftestout ; then cat conftestout >> config.log ; fi > echo "Test program was" >> config.log > cat conftest.c >> config.log > > fi > fi > if test -n "$TESTCC" ; then > CC="$CCsav" > fi > rm -fr conftest* 12863,12864c13640 < fi < rm -fr conftest* --- > 12911,12915c13687,13697 < if test -n "$TESTCC" ; then < CCsav="$CC" < CC="$TESTCC" < fi < cat > conftest.c < > > if test "$cross_compiling" = 1 -a -z "$TESTCC" ; then > > Pac_CV_NAME=0 > else > if test -n "$TESTCC" ; then > CCsav="$CC" > CC="$TESTCC" > fi > cat > conftest.c </dev/null; then < ac_cv_sizeof_double=`cat cftestval` --- > if test -n "$compile" ; then > eval $compile > else > eval $ac_compile > eval $ac_link > fi > if test ! -s conftest ; then > echo "Could not build executable program:" > echo "${CC-cc} $CFLAGS conftest.c -o conftest $LIBS" > ${CC-cc} $CFLAGS conftest.c -o conftest $LIBS > ac_cv_sizeof_double=0 12930,12931c13720,13737 < else < ac_cv_sizeof_double=0 --- > else > /bin/rm -f conftestout > if test -s conftest && (./conftest; exit) 2>conftestout; then > ac_cv_sizeof_double=`cat cftestval` > > else > ac_cv_sizeof_double=0 > > if test -s conftestout ; then cat conftestout >> config.log ; fi > echo "Test program was" >> config.log > cat conftest.c >> config.log > > fi > fi > if test -n "$TESTCC" ; then > CC="$CCsav" > fi > rm -fr conftest* 12933c13739 < rm -fr conftest* --- > 12935,12937d13740 < if test -n "$TESTCC" ; then < CC="$CCsav" < fi 12992,12996c13795,13805 < if test -n "$TESTCC" ; then < CCsav="$CC" < CC="$TESTCC" < fi < cat > conftest.c < > > if test "$cross_compiling" = 1 -a -z "$TESTCC" ; then > > Pac_CV_NAME=0 > else > if test -n "$TESTCC" ; then > CCsav="$CC" > CC="$TESTCC" > fi > cat > conftest.c </dev/null; then < ac_cv_sizeof_long_double=`cat cftestval` --- > if test -n "$compile" ; then > eval $compile > else > eval $ac_compile > eval $ac_link > fi > if test ! -s conftest ; then > echo "Could not build executable program:" > echo "${CC-cc} $CFLAGS conftest.c -o conftest $LIBS" > ${CC-cc} $CFLAGS conftest.c -o conftest $LIBS > ac_cv_sizeof_long_double=0 13011,13012c13828,13845 < else < ac_cv_sizeof_long_double=0 --- > else > /bin/rm -f conftestout > if test -s conftest && (./conftest; exit) 2>conftestout; then > ac_cv_sizeof_long_double=`cat cftestval` > > else > ac_cv_sizeof_long_double=0 > > if test -s conftestout ; then cat conftestout >> config.log ; fi > echo "Test program was" >> config.log > cat conftest.c >> config.log > > fi > fi > if test -n "$TESTCC" ; then > CC="$CCsav" > fi > rm -fr conftest* 13014c13847 < rm -fr conftest* --- > 13016,13018d13848 < if test -n "$TESTCC" ; then < CC="$CCsav" < fi 13201a14032,14101 > # > # Check for traceback > if test "$try_traceback" = "yes" ; then > if test "$ac_cv_prog_gcc" = "yes" ; then > # Try the program to see if it actually works > if test -z "$ac_echo_n" ; then > ac_echo_n=yes > if (echo "testing\c"; echo 1,2,3) | grep c >/dev/null; then > # Stardent Vistra SVR4 grep lacks -e, says ghazi@caip.rutgers.edu. > if (echo -n testing; echo 1,2,3) | sed s/-n/xn/ | grep xn >/dev/null; then > ac_n= ac_c=' > ' ac_t=' ' > else > ac_n=-n ac_c= ac_t= > fi > else > ac_n= ac_c='\c' ac_t= > fi > ac_echo_test=`echo foo 1>&1` > if test -z "$ac_echo_test" ; then > print_error "Your sh shell does not handle the output redirection" > print_error "1>&1 correctly. Configure will work around this problem," > print_error "but you should report the problem to your vendor." > fi > > fi > if test -z "$ac_echo_test" -a 1 = 1 ; then > echo $ac_n "checking whether backtrace works""... $ac_c" > else > echo $ac_n "checking whether backtrace works""... $ac_c" 1>&1 > fi > bktrace_works=no > > if $TESTCC -o conftest -DTEST_BACKTRACE $top_srcdir_val/src/util/backtrace.c ; then > if ./conftest >conftest.out 2>&1 ; then > #cat conftest.out > bktrace_works=yes > fi > fi > rm -f conftest* > if test "$bktrace_works" = "yes" ; then > BACKTRACE="backtrace.o" > > { > test -n "$verbose" && \ > echo " defining HAVE_PRINT_BACKTRACE" > echo "#define" HAVE_PRINT_BACKTRACE 1 >> confdefs.h > DEFS="$DEFS -DHAVE_PRINT_BACKTRACE=1" > SEDDEFS="${SEDDEFS}\${SEDdA}HAVE_PRINT_BACKTRACE\${SEDdB}HAVE_PRINT_BACKTRACE\${SEDdC}1\${SEDdD} > \${SEDuA}HAVE_PRINT_BACKTRACE\${SEDuB}HAVE_PRINT_BACKTRACE\${SEDuC}1\${SEDuD} > \${SEDeA}HAVE_PRINT_BACKTRACE\${SEDeB}HAVE_PRINT_BACKTRACE\${SEDeC}1\${SEDeD} > " > } > > if test -z "$ac_echo_test" -a 1 = 1 ; then > echo "$ac_t""yes" > else > echo "$ac_t""yes" 1>&1 > fi > else > if test -z "$ac_echo_test" -a 1 = 1 ; then > echo "$ac_t""no" > else > echo "$ac_t""no" 1>&1 > fi > fi > > fi > fi > # 13500c14400,14403 < flibname="mpich" --- > flibname=$MPILIBNAME > fi > if test -z "$fwrapname" ; then > fwrapname=f$MPILIBNAME 13514a14418 > export CFLAGS ;\ 13515a14420 > export FFLAGS ;\ 13529a14435 > export sharedlib_dir ;\ 13535a14442,14443 > export f90nag ;\ > export f95nag ;\ 13540c14448 < ${top_srcdir}/src/fortran/configure --with-mpichbuilding \ --- > ${top_srcdir}/src/fortran/configure --with-mpichbuilding --with-mpich \ 13541a14450 > --with-fwrapname=$fwrapname \ 13570a14480 > -e "s%^sharedlibdir=.*%sharedlibdir=$sharedlibbuild_dir%g" \ 13574a14485 > -e "s%^sharedlibdir=.*%sharedlibdir=$sharedlibbuild_dir%g" \ 13586a14498,14499 > F77_IN_C_LIBS="`${MAKE} -f src/fortran/Makefile f77in_clibs`" > 13592a14506,14509 > OFFSET_KIND=`grep 'MPI_OFFSET_KIND=' $includebuild_dir/mpif.h | \ > sed -e 's/.*=\(0-9*\)).*/\1/'` > FORT_INT8=`grep 'MPI_INTEGER8=' $includebuild_dir/mpif.h | \ > sed -e 's/.*=\(0-9*\)).*/\1/'` 13601a14519,14521 > # If we find that we can't build ROMIO, set the appropriate > # --with args so that subdirectory configures won't assume that > # ROMIO is present 13684a14605 > with_args="$with_args --without-romio --without-mpiio" 13687a14609 > with_args="$with_args --without-romio --without-mpiio" 13716a14639,14642 > export CROSS_SIZEOF_INT; \ > export CROSS_SIZEOF_VOID_P; \ > export int_len ; export void_star_len ; export OFFSET_KIND ; \ > export long_long_len ; \ 13798c14724 < --with-f2cmpilibs=-lfmpich \ --- > --with-f2cmpilibs=-lf$MPILIBNAME \ 13800,13801c14726,14727 < --prefix=${prefix} $enable_args \ < $MPE_ARGS ) --- > --prefix=${prefix} $enable_args $with_args \ > $MPE_ARGS ) 13871c14797,14798 < /bin/rm -f mpichconf.h ${top_srcdir}/include/mpichconf.h --- > # We remove the version in include in case this is a vpath build > /bin/rm -f mpichconf.h ${top_srcdir}/include/mpichconf.h include/mpichconf.h 13951a14879 > ARNAME='$ARNAME' 13967a14896 > BACKTRACE='$BACKTRACE' 13969a14899 > F77_IN_C_LIBS='$F77_IN_C_LIBS' 14121a15052 > s%@ARNAME@%$ARNAME%g 14130,14131c15061,15062 < s%@MPI_STATUS_SIZE@%$MPI_STATUS_SIZE%g < s%@HAS_WEAK_SYMBOLS@%$HAS_WEAK_SYMBOLS%g" | sed -e " --- > s%@MPI_STATUS_SIZE@%$MPI_STATUS_SIZE%g" | sed -e " > s%@HAS_WEAK_SYMBOLS@%$HAS_WEAK_SYMBOLS%g 14137a15069 > s%@BACKTRACE@%$BACKTRACE%g 14139a15072 > s%@F77_IN_C_LIBS@%$F77_IN_C_LIBS%g 14170c15103 < s%@DEVCFLAGS@%$DEVCFLAGS%g --- > s%@DEVCFLAGS@%$DEVCFLAGS%g" | sed -e " 14173c15106 < s%@DEV_DEFS@%$DEV_DEFS%g" | sed -e " --- > s%@DEV_DEFS@%$DEV_DEFS%g 14212c15145 < s%@OPTFLAGS@%$OPTFLAGS%g --- > s%@OPTFLAGS@%$OPTFLAGS%g" | sed -e " 14215c15148 < s%@P4_ARCH@%$P4_ARCH%g" | sed -e " --- > s%@P4_ARCH@%$P4_ARCH%g 14348a15282 > # FIXME: mv util/chkserv util/chkmachine and util/tstmachines elsewhere. 14435a15370 > export MPIBOOT ; export MPIUNBOOT ; \ 14438a15374 > --enable-boot \ 14460c15396,15397 < --with-mpichbuilding --with-mpich=$binbuild_dir $otherargs ) --- > --with-mpichbuilding --with-mpich=$binbuild_dir \ > -prefix=$prefix $otherargs ) 14531c15468 < print_error "http://www.mcs.anl.gov/mpi/mpich/index.html" --- > print_error "http://www.mcs.anl.gov/mpi/mpich" Index: configure.in =================================================================== RCS file: /MPIhome/mpich/configure.in,v retrieving revision 1.271 retrieving revision 1.291 diff -r1.271 -r1.291 38a39 > [--disable-gencat] 42a44 > [--enable-traceback] [--disable-traceback] 152a155,157 > --enable-traceback - Enable printing of a call stack when MPI and the > user's program is built with certain compilers > (currently only some versions of gcc are supported). 388a394 > f95nag=0 456a463,464 > # Traceback > try_traceback=no 506a515,519 > # Code from autoconf 2 to get any option after an = > case "$arg" in > -*=*) ac_optarg=`echo "$ac_option" | sed 's/[-_a-zA-Z0-9]*=//'` ;; > *) ac_optarg= ;; > esac 641a655,656 > COPTIONS="$COPTIONS -O -Wall -Wstrict-prototypes -Wmissing-prototypes -DGCC_WALL" > export COPTIONS 642a658 > enable_strict="yes" 654a671,673 > -disable-gencat | --disable-gencat) > ignore_gencat="yes" > ;; 720c739,749 < -enable-g | --enable-g ) --- > -enable-traceback | --enable-traceback) > try_traceback=yes > needs_gcc=yes > enable_args="$enable_args --enable-traceback" > ;; > -disable-traceback | --disable-traceback) > try_traceback=no > enable_args="$enable_args --disable-traceback" > ;; > > -enable-g | --enable-g | --enable-g=* | -enable-g=* ) 723,729c752,765 < MEMDEBUG=1 < PTRDEBUG=1 < TRDEBUG=1 < NODEVDEBUG=0 < DEVDEBUGCFLAGS="" < DLAST="-dlast" < enable_args="$enable_args --enable-g" --- > if test "$ac_optarg" = "all" ; then > MEMDEBUG=1 > PTRDEBUG=1 > TRDEBUG=1 > NODEVDEBUG=0 > DEVDEBUGCFLAGS="" > DLAST="-dlast" > fi > enable_args="$enable_args $arg" > if test -z "$ac_optarg" ; then > enable_g="yes" > else > enable_g="$ac_optarg" > fi 857c893 < #f90nag=1 --- > f95nag=1 902c938 < enable_args="$enable_args --enable-c++" --- > # enable_args="$enable_args --enable-c++" 904a941,950 > --enable-altcxx | -enable-altcxx) > # This is for testing an alternate c++ implementation. > # We use cxx instead of c++ to simplify (the eventual) use of > # autoconf v 2, which does not allow enable names with + in them. > CPP_DIR="cxx" > ;; > > --disable-altcxx | -disable-altcxx) > ;; > 1064,1065c1110,1112 < -noromio | --noromio | --without-romio | --with-romio=no ) < ROMIO=0 --- > -noromio | --noromio | --without-romio | --with-romio=no ) > ROMIO=0 > with_args="$with_args --without-romio --without-mpiio" 1186a1234,1240 > if test -n "$arch_ppc_vxworks" ; then > # VXWORKS (Thanks to Gary Cliff ) > # 2/27/01 > echo PPC > arch_IRIX=1 > ARCH=IRIX > fi 1298a1353 > ARCMD="ar" 1490c1545 < CPP_DIR="MPI-2-C++" --- > CPP_DIR="${CPP_DIR:-MPI-2-C++}" 1690a1746 > AC_SUBST(ARNAME) 1751a1808 > # +Z for HPUX 1782a1840,1842 > if test -z "$CC_SHARED_OPT" -a "$ARCH" = "hpux" ; then > PAC_CHECK_COMPILER_OPTION(-KPIC,CC_SHARED_OPT=+Z) > fi 1903a1964 > # Should set MPIBOOT and MPIUNBOOT if provided 2314a2376,2378 > # clock_gettime is the POSIX gettimeofday > AC_HAVE_FUNCS(clock_gettime clock_getres) > # 2385a2450 > # PARTIAL FIX: use only for DEVICE_KIND == network. 2387c2452 < if test -z "$rshcommand" ; then --- > if test $DEVICE_KIND = network -a -z "$rshcommand" ; then 2389c2454 < # should check that it works; allow ssh as another fallback --- > # should check that it works 2397,2399c2462,2466 < changequote(,) < perlversion=`$PERL -v | grep 'This is perl' | \ < sed -e 's/^.*version *\([0-9]\).*$/\1/'` --- > changequote(<<,>>) > dnl perlversion=`$PERL -v | grep 'This is perl' | \ > dnl sed -e 's/^.*version *\([0-9]\).*$/\1/'` > dnl This might not work in previous versions of perl, but that is ok! > perlversion=`$PERL -e 'print <>($],0,1)."\n";' elif test "$ignore_gencat" = "yes" ; then > # Ignore message catalog > : 2714a2785,2787 > # strdup is used in MPI_Info_xxx > AC_HAVE_FUNCS(strdup) > # 2718a2792,2796 > # Check for header files needed to obtain list of networking interfaces > # > PAC_CHECK_HEADERS(sys/ioctl.h) > PAC_CHECK_HEADERS(sys/sockio.h) > # 2929a3008,3033 > # > # Check for traceback > if test "$try_traceback" = "yes" ; then > if test "$ac_cv_prog_gcc" = "yes" ; then > # Try the program to see if it actually works > AC_MSG_CHECKING([whether backtrace works]) > bktrace_works=no > > if $TESTCC -o conftest -DTEST_BACKTRACE $top_srcdir_val/src/util/backtrace.c ; then > if ./conftest >conftest.out 2>&1 ; then > #cat conftest.out > bktrace_works=yes > fi > fi > rm -f conftest* > if test "$bktrace_works" = "yes" ; then > BACKTRACE="backtrace.o" > AC_DEFINE(HAVE_PRINT_BACKTRACE) > AC_MSG_RESULT(yes) > else > AC_MSG_RESULT(no) > fi > AC_SUBST(BACKTRACE) > fi > fi > # 3058c3162,3165 < flibname="mpich" --- > flibname=$MPILIBNAME > fi > if test -z "$fwrapname" ; then > fwrapname=f$MPILIBNAME 3072a3180 > export CFLAGS ;\ 3073a3182 > export FFLAGS ;\ 3087a3197 > export sharedlib_dir ;\ 3093a3204,3205 > export f90nag ;\ > export f95nag ;\ 3098c3210 < [${top_srcdir}/src/fortran/configure --with-mpichbuilding \ --- > [${top_srcdir}/src/fortran/configure --with-mpichbuilding --with-mpich \ 3099a3212 > --with-fwrapname=$fwrapname \ 3117a3231 > -e "s%^sharedlibdir=.*%sharedlibdir=$sharedlibbuild_dir%g" \ 3121a3236 > -e "s%^sharedlibdir=.*%sharedlibdir=$sharedlibbuild_dir%g" \ 3133a3249,3250 > F77_IN_C_LIBS="`${MAKE} -f src/fortran/Makefile f77in_clibs`" > AC_SUBST(F77_IN_C_LIBS) 3139a3257,3260 > OFFSET_KIND=`grep 'MPI_OFFSET_KIND=' $includebuild_dir/mpif.h | \ > sed -e 's/.*=\([0-9]*\)).*/\1/'` > FORT_INT8=`grep 'MPI_INTEGER8=' $includebuild_dir/mpif.h | \ > sed -e 's/.*=\([0-9]*\)).*/\1/'` 3148a3270,3272 > # If we find that we can't build ROMIO, set the appropriate > # --with args so that subdirectory configures won't assume that > # ROMIO is present 3154a3279 > with_args="$with_args --without-romio --without-mpiio" 3157a3283 > with_args="$with_args --without-romio --without-mpiio" 3186a3313,3316 > export CROSS_SIZEOF_INT; \ > export CROSS_SIZEOF_VOID_P; \ > export int_len ; export void_star_len ; export OFFSET_KIND ; \ > export long_long_len ; \ 3268c3398 < --with-f2cmpilibs=-lfmpich \ --- > --with-f2cmpilibs=-lf$MPILIBNAME \ 3270,3271c3400,3401 < --prefix=${prefix} $enable_args \ < $MPE_ARGS ) --- > --prefix=${prefix} $enable_args $with_args \ > $MPE_ARGS ) 3405c3535,3536 < /bin/rm -f mpichconf.h ${top_srcdir}/include/mpichconf.h --- > # We remove the version in include in case this is a vpath build > /bin/rm -f mpichconf.h ${top_srcdir}/include/mpichconf.h include/mpichconf.h 3426a3558 > # FIXME: mv util/chkserv util/chkmachine and util/tstmachines elsewhere. 3484a3617 > export MPIBOOT ; export MPIUNBOOT ; \ 3487a3621 > --enable-boot \ 3509c3643,3644 < --with-mpichbuilding --with-mpich=$binbuild_dir $otherargs ) --- > --with-mpichbuilding --with-mpich=$binbuild_dir \ > -prefix=$prefix $otherargs ) 3584c3719 < print_error "http://www.mcs.anl.gov/mpi/mpich/index.html" --- > print_error "http://www.mcs.anl.gov/mpi/mpich" Index: include/mpiimpl.h =================================================================== RCS file: /MPIhome/mpich/include/mpiimpl.h,v retrieving revision 1.21 retrieving revision 1.23 diff -r1.21 -r1.23 2c2 < * $Id: mpiimpl.h,v 1.21 2000/07/05 20:21:18 gropp Exp $ --- > * $Id: mpiimpl.h,v 1.23 2001/03/06 20:50:50 toonen Exp $ 302,307d301 < int MPIR_BsendAlloc ( int, MPI_Request, void ** ) ; < void MPIR_BsendCopyData ( MPIR_SHANDLE *, struct MPIR_COMMUNICATOR *, < void *, int, < struct MPIR_DATATYPE *, void **, int * ); < void MPIR_BsendPersistent ( MPI_Request, int ) ; < void MPIR_BsendFreeReq ( MPIR_SHANDLE * ) ; 333a328,332 > > #ifdef HAVE_PRINT_BACKTRACE > void MPIR_Print_backtrace( char *, int, char *, ... ); > void MPIR_Save_executable_name( const char * ); > #endif Index: mpe/README =================================================================== RCS file: /MPIhome/mpich/mpe/README,v retrieving revision 1.16 retrieving revision 1.20 diff -r1.16 -r1.20 1c1 < MPE (Multi-Processing Environment) --- > MPE (Multi-Processing Environment) 4c4 < Version 1.2.1, August, 2000 --- > Version 1.2.1.1, September, 2000 6,7c6,7 < Mathematics and Computer Science Division < Argonne National Laboratory --- > Mathematics and Computer Science Division > Argonne National Laboratory 273c273 < for IBM MPI, e.g. quad.mcs.anl.gov, do --- > For IBM MPI, e.g. quad.mcs.anl.gov, do 282c282 < for HP-UX's MPI implementation, --- > For HP-UX's MPI implementation, 302c302 < for prebuilt version of MPICH-1.1.2 or MPICH-1.2.0, e.g. donner, do --- > For prebuilt version of MPICH-1.1.2 or MPICH-1.2.0, e.g. donner, do 321c321 < for LAM, do --- > For LAM, do 323,324c323,324 < setenv MPI_CC ${LAM_INSTALL_DIR}/bin/hcc < setenv MPI_f77 ${LAM_INSTALL_DIR}/bin/hf77 --- > setenv MPI_CC ${LAM_INSTALL_DIR}/bin/mpicc > setenv MPI_f77 ${LAM_INSTALL_DIR}/bin/mpif77 330,331c330,341 < Currently, the support for using MPE with LAM for fortran MPI program is < not working yet. But it is being worked on now. --- > Using MPE with LAM for fortran MPI program is not working until recently. > Configure options listed above enable MPE's internal Fortran to C MPI library. > To use LAM's Fortran to C MPI library in LAM 6.3.3 or later, liblamf77mpi.a, > do > > setenv MPI_CC ${LAM_INSTALL_DIR}/bin/mpicc > setenv MPI_f77 ${LAM_INSTALL_DIR}/bin/mpif77 > ${MPE_SRC_DIR}/configure --with-mpilibs="-L${LAM_INSTALL_DIR}/lib -lpmpi" \ > --with-f2cmpilibs=-llamf77mpi \ > --with-java=/sandbox/jdk117_v3 > make > make install PREFIX=${MPE_INSTALL_DIR} 540a551,624 > > > > > > VII. Using MPE in MPICH > ----------------------- > > MPE has been seamlessly integrated into MPICH distribution, so user may > find it easier to use MPE when using it with MPICH. Here are the differences > of using MPE with MPICH and with other MPI implementations. > > > > VII. a) Compilation and Linkage > ------------------------------- > MPICH provides scripts to help users to compile and link C/C++ and > F77/F90 programs. They are mpicc for C programs, mpiCC for C++ programs, > mpif77 for F77 and mpif90 for F90 programs. In addition, these 4 scripts > allows special options to be used to link with MPE profiling libraries. > These options are : > > -mpitrace - to compile and link with tracing library. > -mpianim - to compile and link with animation libraries. > -mpilog - to compile and link with logging libraries. > > For instance, the following command creates executable, {\tt fpilog}, which > generates logfile when it is executed. > > mpif77 -mpilog -o fpilog fpilog.f > > For other MPI implementations, user needs to compile and link their application > with MPE profiling libraries explicitly as shown in the example makefile. > > > > VII. b) Inheritance of Environmental Variables > ---------------------------------------------- > MPE relies on certain environmental variables (e.g. TMPDIR). These > variables determine how MPE behaves. It is important to make sure that > all the MPI processes receive the intended value of environmental variables. > The complication of this issue comes from the fact that MPICH contains many > different devices for different platforms, some of these devices have a > different way of passing of environmental variables to other processes. > The often used devices, like ch_p4 and ch_shmem, do not require special > attention to pass the value of the environmental variable to spawned > processes. The spawned process inherits the value from the launching > process when the environmental variable in the launching process has been > set. But this is NOT true for all the devices, for instance, the > ch_p4mpd device requires a special option of mpirun to be used to set > the environmental variables to all processes. > > mpirun -np N cpilog -MPDENV- MPE_LOG_FORMAT=SLOG > > In this example, the option -MPDENV- is needed to make sure > that all processes have their environmental variable, MPE_LOG_FORMAT, > set to SLOG. > > For other MPI implementations, how environmental variables are passed > remains unchanged. User needs to get familar with the environment and > set the environmental variables accordingly. > > > > VII. c) Viewing Logfiles > ------------------------ > MPE's install directory structure is the same as MPICH's. So all MPE's > utility programs will be located in MPICH's bin/ directory. > To view a logfile, say fpilog.slog, do > > logviewer fpilog.slog > > The command will select and invoke Jumpshot-3 to display the content > of SLOG file if Jumpshot-3 has been built and installed successfully. Index: mpe/slog_api/CFLAGS.txt =================================================================== RCS file: /MPIhome/mpich/mpe/slog_api/CFLAGS.txt,v retrieving revision 1.3 retrieving revision 1.4 diff -r1.3 -r1.4 9a10 > # -DGCC296_VA_ARG_FIX Index: mpe/slog_api/acconfig.h =================================================================== RCS file: /MPIhome/mpich/mpe/slog_api/acconfig.h,v retrieving revision 1.1 retrieving revision 1.2 diff -r1.1 -r1.2 27a28,30 > > /* GCC296_VA_ARG_FIX : Turn on the workaround for the va_arg bug in gcc-2.96 */ > #undef GCC296_VA_ARG_FIX Index: mpe/slog_api/configure =================================================================== RCS file: /MPIhome/mpich/mpe/slog_api/configure,v retrieving revision 1.20 retrieving revision 1.21 diff -r1.20 -r1.21 1942c1942,1996 < # --- > > # Try to workaround the va_arg bug found gcc-2.96 > echo $ac_n "checking if the C compiler treats stdarg consistently""... $ac_c" 1>&1 > echo "configure:1946: checking if the C compiler treats stdarg consistently" >&2 > cat > conftest.$ac_ext < #line 1948 "configure" > #include "confdefs.h" > > #include > > typedef unsigned int uint32; > typedef unsigned short uint16; > typedef unsigned char uint8; > > void test_fn( const uint32 ui32, ... ) > { > va_list ap; > uint16 ui16; > uint8 ui8; > > va_start( ap, ui32 ); > ui16 = va_arg( ap, uint16 ); > ui8 = va_arg( ap, uint8 ); > va_end( ap ); > } > int main() { > > uint32 ui32; > uint16 ui16; > uint8 ui8; > > test_fn( ui32, ui16, ui8 ); > > ; return 0; } > EOF > if { (eval echo configure:1978: \"$ac_compile\") 1>&2; (eval $ac_compile) 2>&2; }; then > rm -rf conftest* > prompt_va_arg_to_int=no > else > echo "configure: failed program was:" >&2 > cat conftest.$ac_ext >&2 > rm -rf conftest* > prompt_va_arg_to_int=yes > fi > rm -f conftest* > if test "$prompt_va_arg_to_int" = "yes" ; then > echo "$ac_t""no" 1>&1 > cat >> confdefs.h <<\EOF > #define GCC296_VA_ARG_FIX 1 > EOF > > else > echo "$ac_t""yes" 1>&1 > fi > 1946c2000 < echo "configure:1947: checking for malloc in -lefence" >&2 --- > echo "configure:2001: checking for malloc in -lefence" >&2 1954c2008 < #line 1955 "configure" --- > #line 2009 "configure" 1965c2019 < if { (eval echo configure:1966: \"$ac_link\") 1>&2; (eval $ac_link) 2>&2; } && test -s conftest${ac_exeext}; then --- > if { (eval echo configure:2020: \"$ac_link\") 1>&2; (eval $ac_link) 2>&2; } && test -s conftest${ac_exeext}; then 2006c2060 < echo "configure:2007: checking for working alloca.h" >&2 --- > echo "configure:2061: checking for working alloca.h" >&2 2011c2065 < #line 2012 "configure" --- > #line 2066 "configure" 2018c2072 < if { (eval echo configure:2019: \"$ac_link\") 1>&2; (eval $ac_link) 2>&2; } && test -s conftest${ac_exeext}; then --- > if { (eval echo configure:2073: \"$ac_link\") 1>&2; (eval $ac_link) 2>&2; } && test -s conftest${ac_exeext}; then 2039c2093 < echo "configure:2040: checking for alloca" >&2 --- > echo "configure:2094: checking for alloca" >&2 2044c2098 < #line 2045 "configure" --- > #line 2099 "configure" 2072c2126 < if { (eval echo configure:2073: \"$ac_link\") 1>&2; (eval $ac_link) 2>&2; } && test -s conftest${ac_exeext}; then --- > if { (eval echo configure:2127: \"$ac_link\") 1>&2; (eval $ac_link) 2>&2; } && test -s conftest${ac_exeext}; then 2104c2158 < echo "configure:2105: checking whether alloca needs Cray hooks" >&2 --- > echo "configure:2159: checking whether alloca needs Cray hooks" >&2 2109c2163 < #line 2110 "configure" --- > #line 2164 "configure" 2134c2188 < echo "configure:2135: checking for $ac_func" >&2 --- > echo "configure:2189: checking for $ac_func" >&2 2136c2190 < #line 2137 "configure" --- > #line 2191 "configure" 2157c2211 < if { (eval echo configure:2158: \"$ac_link\") 1>&2; (eval $ac_link) 2>&2; } && test -s conftest${ac_exeext}; then --- > if { (eval echo configure:2212: \"$ac_link\") 1>&2; (eval $ac_link) 2>&2; } && test -s conftest${ac_exeext}; then 2182c2236 < echo "configure:2183: checking stack direction for C alloca" >&2 --- > echo "configure:2237: checking stack direction for C alloca" >&2 2190c2244 < #line 2191 "configure" --- > #line 2245 "configure" 2209c2263 < if { (eval echo configure:2210: \"$ac_link\") 1>&2; (eval $ac_link) 2>&2; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null --- > if { (eval echo configure:2264: \"$ac_link\") 1>&2; (eval $ac_link) 2>&2; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null Index: mpe/slog_api/configure.in =================================================================== RCS file: /MPIhome/mpich/mpe/slog_api/configure.in,v retrieving revision 1.22 retrieving revision 1.23 diff -r1.22 -r1.23 189c189,223 < # --- > > # Try to workaround the va_arg bug found gcc-2.96 > AC_MSG_CHECKING([if the C compiler treats stdarg consistently]) > AC_TRY_COMPILE( [ > #include > > typedef unsigned int uint32; > typedef unsigned short uint16; > typedef unsigned char uint8; > > void test_fn( const uint32 ui32, ... ) > { > va_list ap; > uint16 ui16; > uint8 ui8; > > va_start( ap, ui32 ); > ui16 = va_arg( ap, uint16 ); > ui8 = va_arg( ap, uint8 ); > va_end( ap ); > } ], > [ > uint32 ui32; > uint16 ui16; > uint8 ui8; > > test_fn( ui32, ui16, ui8 ); > ], prompt_va_arg_to_int=no, prompt_va_arg_to_int=yes ) > if test "$prompt_va_arg_to_int" = "yes" ; then > AC_MSG_RESULT(no) > AC_DEFINE(GCC296_VA_ARG_FIX) > else > AC_MSG_RESULT(yes) > fi > Index: mpe/slog_api/slog_config.h.in =================================================================== RCS file: /MPIhome/mpich/mpe/slog_api/slog_config.h.in,v retrieving revision 1.4 retrieving revision 1.5 diff -r1.4 -r1.5 53a54,56 > /* GCC296_VA_ARG_FIX : Turn on the workaround for the va_arg bug in gcc-2.96 */ > #undef GCC296_VA_ARG_FIX > Index: mpe/slog_api/src/slog_irec_write.c =================================================================== RCS file: /MPIhome/mpich/mpe/slog_api/src/slog_irec_write.c,v retrieving revision 1.7 retrieving revision 1.8 diff -r1.7 -r1.8 1170a1171,1175 > #if defined( GCC296_VA_ARG_FIX ) > dest_node_id = va_arg( ap, SLOG_uint32 ); > dest_cpu_id = va_arg( ap, SLOG_uint32 ); > dest_thread_id = va_arg( ap, SLOG_uint32 ); > #else 1173a1179 > #endif Index: mpe/src/Makefile.in =================================================================== RCS file: /MPIhome/mpich/mpe/src/Makefile.in,v retrieving revision 1.9 retrieving revision 1.11 diff -r1.9 -r1.11 124c124 < ( cd ${top_srcdir}/../../src/env ; $(MAKE) mpe_debug_objs ) ; \ --- > ( cd ../../src/env ; $(MAKE) mpe_debug_objs ) ; \ Index: mpe/src/mpe_proff.c =================================================================== RCS file: /MPIhome/mpich/mpe/src/mpe_proff.c,v retrieving revision 1.14 retrieving revision 1.16 diff -r1.14 -r1.16 124c124 < #ifndef HAVE_MPI_XXXX_F2C --- > #ifndef HAVE_MPI_COMM_F2C 126a127,128 > #endif > #ifndef HAVE_MPI_TYPE_F2C 128a131,132 > #endif > #ifndef HAVE_MPI_GROUP_F2C 130a135,136 > #endif > #ifndef HAVE_MPI_REQUEST_F2C 132a139,140 > #endif > #ifndef HAVE_MPI_OP_F2C 134a143,144 > #endif > #ifndef HAVE_MPI_ERRHANDLER_F2C 138c148 < #ifndef HAVE_MPI_STATUS_C2F --- > #ifndef HAVE_MPI_STATUS_F2C 356c366 < * Define prototypes to keep the compiler happy --- > * Define prototypes next to the fortran2c wrapper to keep the compiler happy 358,493d367 < void mpi_init_ ( int * ); < void mpi_bsend_init_ ( void *, MPI_Fint *, MPI_Fint *, MPI_Fint *, < MPI_Fint *, MPI_Fint *, MPI_Fint *, < MPI_Fint * ); < void mpi_bsend_ ( void *, MPI_Fint *, MPI_Fint *, MPI_Fint *, < MPI_Fint *, MPI_Fint *, MPI_Fint * ); < void mpi_buffer_attach_ (void *, int *, int *); < void mpi_buffer_detach_ (void *, int *, int *); < void mpi_cancel_ (MPI_Fint *, MPI_Fint *); < void mpi_request_free_ ( MPI_Fint *, MPI_Fint * ); < void mpi_recv_init_ ( void *, MPI_Fint *, MPI_Fint *, MPI_Fint *, < MPI_Fint *, MPI_Fint *, MPI_Fint *, < MPI_Fint * ); < void mpi_send_init_ ( void *, MPI_Fint *, MPI_Fint *, MPI_Fint *, < MPI_Fint *, MPI_Fint *, MPI_Fint *, < MPI_Fint * ); < void mpi_get_count_ (MPI_Status *, MPI_Datatype *, int *, int *); < void mpi_get_elements_ (MPI_Status *, MPI_Datatype *, int *, int *); < void mpi_ibsend_ ( void *, MPI_Fint *, MPI_Fint *, MPI_Fint *, < MPI_Fint *, MPI_Fint *, MPI_Fint *, < MPI_Fint * ); < void mpi_iprobe_ (int *, int *, MPI_Comm *, int *, MPI_Status *, < int *); < void mpi_irecv_ ( void *, MPI_Fint *, MPI_Fint *, MPI_Fint *, < MPI_Fint *, MPI_Fint *, MPI_Fint *, < MPI_Fint * ); < void mpi_irsend_ ( void *, MPI_Fint *, MPI_Fint *, MPI_Fint *, < MPI_Fint *, MPI_Fint *, MPI_Fint *, < MPI_Fint * ); < void mpi_isend_ ( void *, MPI_Fint *, MPI_Fint *, MPI_Fint *, < MPI_Fint *, MPI_Fint *, MPI_Fint *, < MPI_Fint * ); < void mpi_issend_ ( void *, MPI_Fint *, MPI_Fint *, MPI_Fint *, < MPI_Fint *, MPI_Fint *, MPI_Fint *, < MPI_Fint * ); < void mpi_pack_size_ (int *, MPI_Datatype *, MPI_Comm *, int *, < int *); < void mpi_pack_ (void *, int *, MPI_Datatype *, void *, int *, int *, < MPI_Comm *, int *); < void mpi_probe_ (int *, int *, MPI_Comm *, MPI_Status *, int *); < void mpi_recv_ ( void *, int *, MPI_Datatype *, int *, int *, < MPI_Comm *, MPI_Status *, int * ); < void mpi_rsend_init_ ( void *, MPI_Fint *, MPI_Fint *, MPI_Fint *, < MPI_Fint *, MPI_Fint *, MPI_Fint *, < MPI_Fint * ); < void mpi_rsend_ (void *, int *, MPI_Datatype *, int *, int *, < MPI_Comm *, int *); < void mpi_send_ ( void *, int *, MPI_Datatype *, int *, int *, < MPI_Comm *, int * ); < void mpi_sendrecv_ ( void *, int *, MPI_Datatype *, int *, int *, < void *, int *, MPI_Datatype *, int *, int *, < MPI_Comm *, MPI_Status *, int * ); < void mpi_sendrecv_replace_ (void *, int *, MPI_Datatype *, int *, < int *, int *, int *, MPI_Comm *, < MPI_Status *, int *); < void mpi_ssend_init_ ( void *, MPI_Fint *, MPI_Fint *, MPI_Fint *, < MPI_Fint *, MPI_Fint *, MPI_Fint *, < MPI_Fint * ); < void mpi_ssend_ ( void *, int *, MPI_Datatype *, int *, int *, < MPI_Comm *, int * ); < void mpi_startall_ ( MPI_Fint *, MPI_Fint [], MPI_Fint * ); < void mpi_start_ ( MPI_Fint *, MPI_Fint * ); < void mpi_testall_ ( MPI_Fint *, MPI_Fint [], MPI_Fint *, < MPI_Fint [][MPI_STATUS_SIZE], < MPI_Fint * ); < void mpi_testany_ ( MPI_Fint *, MPI_Fint [], MPI_Fint *, < MPI_Fint *, MPI_Fint *, MPI_Fint * ); < void mpi_test_cancelled_ ( MPI_Fint *, MPI_Fint *, MPI_Fint * ); < void mpi_test_ ( MPI_Fint *, MPI_Fint *, MPI_Fint *, MPI_Fint * ); < void mpi_testsome_ ( MPI_Fint *, MPI_Fint [], MPI_Fint *, < MPI_Fint [], MPI_Fint [][MPI_STATUS_SIZE], < MPI_Fint * ); < void mpi_type_commit_ ( MPI_Fint *, MPI_Fint * ); < void mpi_type_contiguous_ ( MPI_Fint *, MPI_Fint *, MPI_Fint *, < MPI_Fint * ); < void mpi_type_extent_ ( MPI_Fint *, MPI_Fint *, MPI_Fint * ); < void mpi_type_free_ ( MPI_Fint *, MPI_Fint * ); < void mpi_type_hindexed_ ( MPI_Fint *, MPI_Fint [], MPI_Fint [], < MPI_Fint *, MPI_Fint *, MPI_Fint * ); < void mpi_type_hvector_ ( MPI_Fint *, MPI_Fint *, MPI_Fint *, < MPI_Fint *, MPI_Fint *, MPI_Fint * ); < void mpi_type_indexed_ ( MPI_Fint *, MPI_Fint [], MPI_Fint [], < MPI_Fint *, MPI_Fint *, MPI_Fint * ); < void mpi_type_lb_ ( MPI_Fint *, MPI_Fint *, MPI_Fint * ); < void mpi_type_size_ ( MPI_Fint *, MPI_Fint *, MPI_Fint * ); < void mpi_type_struct_ ( MPI_Fint *, MPI_Fint [], MPI_Fint [], < MPI_Fint [], MPI_Fint *, MPI_Fint * ); < void mpi_type_ub_ ( MPI_Fint *, MPI_Fint *, MPI_Fint * ); < void mpi_type_vector_ ( MPI_Fint *, MPI_Fint *, MPI_Fint *, < MPI_Fint *, MPI_Fint *, MPI_Fint * ); < void mpi_unpack_ (void *, int *, int *, void *, int *, < MPI_Datatype *, MPI_Comm *, int *); < void mpi_waitall_ ( MPI_Fint *, MPI_Fint [], < MPI_Fint [][MPI_STATUS_SIZE], MPI_Fint *); < void mpi_waitany_ ( MPI_Fint *, MPI_Fint [], MPI_Fint *, < MPI_Fint *, MPI_Fint * ); < void mpi_wait_ ( MPI_Fint *, MPI_Fint *, MPI_Fint * ); < void mpi_waitsome_ ( MPI_Fint *, MPI_Fint [], MPI_Fint *, < MPI_Fint [], MPI_Fint [][MPI_STATUS_SIZE], < MPI_Fint * ); < void mpi_allgather_ (void *, int *, MPI_Datatype *, void *, int *, < MPI_Datatype *, MPI_Comm *, int *); < void mpi_allgatherv_ (void *, int *, MPI_Datatype *, void *, int *, < int *, MPI_Datatype *, MPI_Comm *, int *); < void mpi_allreduce_ ( void *, void *, int *, MPI_Datatype *, < MPI_Op *, MPI_Comm *, int * ); < void mpi_alltoall_ (void *, int *, MPI_Datatype *, void *, int *, < MPI_Datatype *, MPI_Comm *, int *); < void mpi_alltoallv_ (void *, int *, int *, MPI_Datatype *, void *, < int *, int *, MPI_Datatype *, MPI_Comm *, < int *); < void mpi_barrier_ ( MPI_Comm *, int * ); < void mpi_bcast_ ( void *, int *, MPI_Datatype *, int *, < MPI_Comm *, int * ); < void mpi_gather_ (void *, int *, MPI_Datatype *, void *, int *, < MPI_Datatype *, int *, MPI_Comm *, int *); < void mpi_gatherv_ (void *, int *, MPI_Datatype *, void *, int *, < int *, MPI_Datatype *, int *, MPI_Comm *, int *); < #ifdef FORTRAN_SPECIAL_FUNCTION_PTR < void mpi_op_create_( MPI_User_function **, MPI_Fint *, MPI_Fint *, MPI_Fint * ); < #else < void mpi_op_create_( MPI_User_function *, MPI_Fint *, MPI_Fint *, MPI_Fint * ); < #endif < void mpi_op_free_ ( MPI_Fint *, MPI_Fint * ); < void mpi_reduce_scatter_ (void *, void *, int *, MPI_Datatype *, < MPI_Op *, MPI_Comm *, int *); < void mpi_reduce_ ( void *, void *, int *, MPI_Datatype *, MPI_Op *, < int *, MPI_Comm *, int * ); < void mpi_scan_ (void *, void *, int *, MPI_Datatype *, MPI_Op *, < MPI_Comm *, int *); < void mpi_scatter_ (void *, int *, MPI_Datatype *, void *, int *, < MPI_Datatype *, int *, MPI_Comm *, int *); < void mpi_scatterv_ (void *, int *, int *, MPI_Datatype *, void *, < int *, MPI_Datatype *, int *, MPI_Comm *, < int *); < void mpi_finalize_ ( int * ); 524a399 > void mpi_init_ ( int * ); 569a445,447 > void mpi_bsend_init_ ( void *, MPI_Fint *, MPI_Fint *, MPI_Fint *, > MPI_Fint *, MPI_Fint *, MPI_Fint *, > MPI_Fint * ); 571,572c449,450 < MPI_Fint *dest, MPI_Fint *tag, MPI_Fint *comm, < MPI_Fint *request, MPI_Fint *__ierr ) --- > MPI_Fint *dest, MPI_Fint *tag, MPI_Fint *comm, > MPI_Fint *request, MPI_Fint *__ierr ) 582a461,462 > void mpi_bsend_ ( void *, MPI_Fint *, MPI_Fint *, MPI_Fint *, > MPI_Fint *, MPI_Fint *, MPI_Fint * ); 591,594c471,472 < void mpi_buffer_attach_( buffer, size, __ierr ) < void *buffer; < int *size; < int *__ierr; --- > void mpi_buffer_attach_ ( void *, MPI_Fint *, MPI_Fint * ); > void mpi_buffer_attach_( void *buffer, MPI_Fint *size, MPI_Fint *__ierr ) 596c474 < *__ierr = MPI_Buffer_attach(buffer, *size); --- > *__ierr = MPI_Buffer_attach(buffer,(int)*size); 599,602c477,478 < void mpi_buffer_detach_( buffer, size, __ierr ) < void *buffer; < int *size; < int *__ierr; --- > void mpi_buffer_detach_ ( void **, MPI_Fint *, MPI_Fint * ); > void mpi_buffer_detach_( void **buffer, MPI_Fint *size, MPI_Fint *__ierr ) 604c480,484 < *__ierr = MPI_Buffer_detach(buffer,size); --- > void *tmp = (void *)buffer; > int lsize; > > *__ierr = MPI_Buffer_detach(&tmp,&lsize); > *size = (MPI_Fint)lsize; 606a487 > void mpi_cancel_ (MPI_Fint *, MPI_Fint *); 614a496 > void mpi_request_free_ ( MPI_Fint *, MPI_Fint * ); 621a504,506 > void mpi_recv_init_ ( void *, MPI_Fint *, MPI_Fint *, MPI_Fint *, > MPI_Fint *, MPI_Fint *, MPI_Fint *, > MPI_Fint * ); 623,624c508,509 < MPI_Fint *source, MPI_Fint *tag, MPI_Fint *comm, < MPI_Fint *request, MPI_Fint *__ierr ) --- > MPI_Fint *source, MPI_Fint *tag, MPI_Fint *comm, > MPI_Fint *request, MPI_Fint *__ierr ) 632a518,520 > void mpi_send_init_ ( void *, MPI_Fint *, MPI_Fint *, MPI_Fint *, > MPI_Fint *, MPI_Fint *, MPI_Fint *, > MPI_Fint * ); 634,635c522,523 < MPI_Fint *dest, MPI_Fint *tag, MPI_Fint *comm, < MPI_Fint *request, MPI_Fint *__ierr ) --- > MPI_Fint *dest, MPI_Fint *tag, MPI_Fint *comm, > MPI_Fint *request, MPI_Fint *__ierr ) 644,657c532,534 < void mpi_get_count_( status, datatype, count, __ierr ) < MPI_Status *status; < MPI_Datatype *datatype; < int *count; < int *__ierr; < { < *__ierr = MPI_Get_count(status, *datatype, count); < } < < void mpi_get_elements_ ( status, datatype, elements, __ierr ) < MPI_Status *status; < MPI_Datatype *datatype; < int *elements; < int *__ierr; --- > void mpi_get_count_ ( MPI_Fint *, MPI_Fint *, MPI_Fint *, MPI_Fint * ); > void mpi_get_count_( MPI_Fint *status, MPI_Fint *datatype, MPI_Fint *count, > MPI_Fint *__ierr ) 659c536,542 < *__ierr = MPI_Get_elements(status, *datatype, elements); --- > int lcount; > MPI_Status c_status; > > MPI_Status_f2c(status, &c_status); > *__ierr = MPI_Get_count(&c_status, MPI_Type_f2c(*datatype), > &lcount); > *count = (MPI_Fint)lcount; 661a545,560 > void mpi_get_elements_ ( MPI_Fint *, MPI_Fint *, MPI_Fint *, MPI_Fint * ); > void mpi_get_elements_ ( MPI_Fint *status, MPI_Fint *datatype, > MPI_Fint *elements, MPI_Fint *__ierr ) > { > int lelements; > MPI_Status c_status; > > MPI_Status_f2c(status, &c_status); > *__ierr = MPI_Get_elements(&c_status,MPI_Type_f2c(*datatype), > &lelements); > *elements = (MPI_Fint)lelements; > } > > void mpi_ibsend_ ( void *, MPI_Fint *, MPI_Fint *, MPI_Fint *, > MPI_Fint *, MPI_Fint *, MPI_Fint *, > MPI_Fint * ); 663,664c562,563 < MPI_Fint *dest, MPI_Fint *tag, MPI_Fint *comm, < MPI_Fint *request, MPI_Fint *__ierr ) --- > MPI_Fint *dest, MPI_Fint *tag, MPI_Fint *comm, > MPI_Fint *request, MPI_Fint *__ierr ) 673,679c572,575 < void mpi_iprobe_( source, tag, comm, flag, status, __ierr ) < int *source; < int *tag; < MPI_Comm *comm; < int *flag; < MPI_Status *status; < int *__ierr; --- > void mpi_iprobe_ ( MPI_Fint *, MPI_Fint *, MPI_Fint *, > MPI_Fint *, MPI_Fint *, MPI_Fint * ); > void mpi_iprobe_( MPI_Fint *source, MPI_Fint *tag, MPI_Fint *comm, > MPI_Fint *flag, MPI_Fint *status, MPI_Fint *__ierr ) 681c577,583 < *__ierr = MPI_Iprobe(*source, *tag, *comm, flag, status); --- > int lflag; > MPI_Status c_status; > > *__ierr = MPI_Iprobe((int)*source,(int)*tag,MPI_Comm_f2c(*comm), > &lflag,&c_status); > *flag = MPIR_TO_FLOG(lflag); > MPI_Status_c2f(&c_status, status); 683a586,588 > void mpi_irecv_ ( void *, MPI_Fint *, MPI_Fint *, MPI_Fint *, > MPI_Fint *, MPI_Fint *, MPI_Fint *, > MPI_Fint * ); 685,686c590,591 < MPI_Fint *source, MPI_Fint *tag, MPI_Fint *comm, < MPI_Fint *request, MPI_Fint *__ierr ) --- > MPI_Fint *source, MPI_Fint *tag, MPI_Fint *comm, > MPI_Fint *request, MPI_Fint *__ierr ) 694a600,602 > void mpi_irsend_ ( void *, MPI_Fint *, MPI_Fint *, MPI_Fint *, > MPI_Fint *, MPI_Fint *, MPI_Fint *, > MPI_Fint * ); 696,697c604,605 < MPI_Fint *dest, MPI_Fint *tag, MPI_Fint *comm, < MPI_Fint *request, MPI_Fint *__ierr ) --- > MPI_Fint *dest, MPI_Fint *tag, MPI_Fint *comm, > MPI_Fint *request, MPI_Fint *__ierr ) 705a614,616 > void mpi_isend_ ( void *, MPI_Fint *, MPI_Fint *, MPI_Fint *, > MPI_Fint *, MPI_Fint *, MPI_Fint *, > MPI_Fint * ); 707,708c618,619 < MPI_Fint *dest, MPI_Fint *tag, MPI_Fint *comm, < MPI_Fint *request, MPI_Fint *__ierr ) --- > MPI_Fint *dest, MPI_Fint *tag, MPI_Fint *comm, > MPI_Fint *request, MPI_Fint *__ierr ) 717a629,631 > void mpi_issend_ ( void *, MPI_Fint *, MPI_Fint *, MPI_Fint *, > MPI_Fint *, MPI_Fint *, MPI_Fint *, > MPI_Fint * ); 719,720c633,634 < MPI_Fint *dest, MPI_Fint *tag, MPI_Fint *comm, < MPI_Fint *request, MPI_Fint *__ierr ) --- > MPI_Fint *dest, MPI_Fint *tag, MPI_Fint *comm, > MPI_Fint *request, MPI_Fint *__ierr ) 730,773c644,674 < void mpi_pack_size_ ( incount, datatype, comm, size, __ierr ) < int *incount; < MPI_Datatype *datatype; < MPI_Comm *comm; < int *size; < int *__ierr; < { < *__ierr = MPI_Pack_size(*incount, *datatype, *comm, size); < } < < void mpi_pack_ ( inbuf, incount, type, outbuf, outcount, position, comm, < __ierr ) < void *inbuf; < int *incount; < MPI_Datatype *type; < void *outbuf; < int *outcount; < int *position; < MPI_Comm *comm; < int *__ierr; < { < *__ierr = MPI_Pack(inbuf, *incount, *type, outbuf, *outcount, position, < *comm); < } < < void mpi_probe_( source, tag, comm, status, __ierr ) < int *source; < int *tag; < MPI_Comm *comm; < MPI_Status *status; < int *__ierr; < { < *__ierr = MPI_Probe(*source, *tag, *comm, status); < } < < void mpi_recv_( buf, count, datatype, source, tag, comm, status, __ierr ) < void *buf; < int *count; < MPI_Datatype *datatype; < int *source; < int *tag; < MPI_Comm *comm; < MPI_Status *status; < int *__ierr; --- > void mpi_pack_size_ ( MPI_Fint *, MPI_Fint *, MPI_Fint *, > MPI_Fint *, MPI_Fint * ); > void mpi_pack_size_ ( MPI_Fint *incount, MPI_Fint *datatype, MPI_Fint *comm, > MPI_Fint *size, MPI_Fint *__ierr ) > { > int lsize; > > *__ierr = MPI_Pack_size((int)*incount, MPI_Type_f2c(*datatype), > MPI_Comm_f2c(*comm), &lsize); > *size = (MPI_Fint)lsize; > } > > void mpi_pack_ ( void *, MPI_Fint *, MPI_Fint *, void *, > MPI_Fint *, MPI_Fint *, MPI_Fint *, MPI_Fint * ); > void mpi_pack_ ( void *inbuf, MPI_Fint *incount, MPI_Fint *type, > void *outbuf, MPI_Fint *outcount, MPI_Fint *position, > MPI_Fint *comm, MPI_Fint *__ierr ) > { > int lposition; > > lposition = (int)*position; > *__ierr = MPI_Pack(MPIR_F_PTR(inbuf), (int)*incount, MPI_Type_f2c(*type), > outbuf, (int)*outcount, &lposition, > MPI_Comm_f2c(*comm)); > *position = (MPI_Fint)lposition; > } > > void mpi_probe_ ( MPI_Fint *, MPI_Fint *, MPI_Fint *, > MPI_Fint *, MPI_Fint * ); > void mpi_probe_( MPI_Fint *source, MPI_Fint *tag, MPI_Fint *comm, > MPI_Fint *status, MPI_Fint *__ierr ) 775c676,680 < *__ierr = MPI_Recv(buf, *count, *datatype, *source, *tag, *comm, status); --- > MPI_Status c_status; > > *__ierr = MPI_Probe((int)*source, (int)*tag, MPI_Comm_f2c(*comm), > &c_status); > MPI_Status_c2f(&c_status, status); 777a683,700 > void mpi_recv_ ( void *, MPI_Fint *, MPI_Fint *, MPI_Fint *, > MPI_Fint *, MPI_Fint *, MPI_Fint *, > MPI_Fint * ); > void mpi_recv_( void *buf, MPI_Fint *count, MPI_Fint *datatype, > MPI_Fint *source, MPI_Fint *tag, MPI_Fint *comm, > MPI_Fint *status, MPI_Fint *__ierr ) > { > MPI_Status c_status; > > *__ierr = MPI_Recv(MPIR_F_PTR(buf), (int)*count,MPI_Type_f2c(*datatype), > (int)*source, (int)*tag, > MPI_Comm_f2c(*comm), &c_status); > MPI_Status_c2f(&c_status, status); > } > > void mpi_rsend_init_ ( void *, MPI_Fint *, MPI_Fint *, MPI_Fint *, > MPI_Fint *, MPI_Fint *, MPI_Fint *, > MPI_Fint * ); 779,780c702,703 < MPI_Fint *dest, MPI_Fint *tag, MPI_Fint *comm, < MPI_Fint *request, MPI_Fint *__ierr ) --- > MPI_Fint *dest, MPI_Fint *tag, MPI_Fint *comm, > MPI_Fint *request, MPI_Fint *__ierr ) 790,847c713,741 < void mpi_rsend_( buf, count, datatype, dest, tag, comm, __ierr ) < void *buf; < int *count; < MPI_Datatype *datatype; < int *dest; < int *tag; < MPI_Comm *comm; < int *__ierr; < { < *__ierr = MPI_Rsend(buf, *count, *datatype, *dest, *tag, *comm); < } < < void mpi_send_( buf, count, datatype, dest, tag, comm, __ierr ) < void *buf; < int *count; < MPI_Datatype *datatype; < int *dest; < int *tag; < MPI_Comm *comm; < int *__ierr; < { < *__ierr = MPI_Send(buf, *count, *datatype, *dest, *tag, *comm); < } < < void mpi_sendrecv_( sendbuf, sendcount, sendtype, dest, sendtag, < recvbuf, recvcount, recvtype, source, recvtag, < comm, status, __ierr ) < void *sendbuf; < int *sendcount; < MPI_Datatype *sendtype; < int *dest; < int *sendtag; < void *recvbuf; < int *recvcount; < MPI_Datatype *recvtype; < int *source; < int *recvtag; < MPI_Comm *comm; < MPI_Status *status; < int *__ierr; < { < *__ierr = MPI_Sendrecv(sendbuf, *sendcount, *sendtype, < *dest,*sendtag,recvbuf,*recvcount, < *recvtype,*source,*recvtag,*comm,status); < } < < void mpi_sendrecv_replace_( buf, count, datatype, dest, sendtag, source, < recvtag, comm, status, __ierr ) < void *buf; < int *count; < MPI_Datatype *datatype; < int *dest; < int *sendtag; < int *source; < int *recvtag; < MPI_Comm *comm; < MPI_Status *status; < int *__ierr; --- > void mpi_rsend_ ( void *, MPI_Fint *, MPI_Fint *, MPI_Fint *, > MPI_Fint *, MPI_Fint *, MPI_Fint * ); > void mpi_rsend_( void *buf, MPI_Fint *count, MPI_Fint *datatype, > MPI_Fint *dest, MPI_Fint *tag, MPI_Fint *comm, > MPI_Fint *__ierr ) > { > *__ierr = MPI_Rsend(MPIR_F_PTR(buf), (int)*count,MPI_Type_f2c(*datatype), > (int)*dest, (int)*tag, MPI_Comm_f2c(*comm)); > } > > void mpi_send_ ( void *, MPI_Fint *, MPI_Fint *, MPI_Fint *, > MPI_Fint *, MPI_Fint*, MPI_Fint * ); > > void mpi_send_( void *buf, MPI_Fint *count, MPI_Fint *datatype, > MPI_Fint *dest, MPI_Fint *tag, MPI_Fint *comm, > MPI_Fint *__ierr ) > { > *__ierr = MPI_Send(MPIR_F_PTR(buf), (int)*count, MPI_Type_f2c(*datatype), > (int)*dest, (int)*tag, MPI_Comm_f2c(*comm)); > } > > void mpi_sendrecv_ ( void *, MPI_Fint *, MPI_Fint *, MPI_Fint *, MPI_Fint *, > void *, MPI_Fint *, MPI_Fint *, MPI_Fint *, MPI_Fint *, > MPI_Fint *, MPI_Fint *, MPI_Fint * ); > void mpi_sendrecv_( void *sendbuf, MPI_Fint *sendcount, MPI_Fint *sendtype, > MPI_Fint *dest, MPI_Fint *sendtag, > void *recvbuf, MPI_Fint *recvcount, MPI_Fint *recvtype, > MPI_Fint *source, MPI_Fint *recvtag, > MPI_Fint *comm, MPI_Fint *status, MPI_Fint *__ierr ) 849,850c743,751 < *__ierr = MPI_Sendrecv_replace(buf, *count, *datatype, *dest, *sendtag, < *source, *recvtag, *comm, status ); --- > MPI_Status c_status; > > *__ierr = MPI_Sendrecv(MPIR_F_PTR(sendbuf), (int)*sendcount, > MPI_Type_f2c(*sendtype), (int)*dest, > (int)*sendtag, MPIR_F_PTR(recvbuf), > (int)*recvcount, MPI_Type_f2c(*recvtype), > (int)*source, (int)*recvtag, > MPI_Comm_f2c(*comm), &c_status); > MPI_Status_c2f(&c_status, status); 852a754,774 > void mpi_sendrecv_replace_ ( void *, MPI_Fint *, MPI_Fint *, > MPI_Fint *, MPI_Fint *, MPI_Fint *, > MPI_Fint *, MPI_Fint *, MPI_Fint *, > MPI_Fint * ); > void mpi_sendrecv_replace_( void *buf, MPI_Fint *count, MPI_Fint *datatype, > MPI_Fint *dest, MPI_Fint *sendtag, > MPI_Fint *source, MPI_Fint *recvtag, > MPI_Fint *comm, MPI_Fint *status, MPI_Fint *__ierr ) > { > MPI_Status c_status; > > *__ierr = MPI_Sendrecv_replace(MPIR_F_PTR(buf), (int)*count, > MPI_Type_f2c(*datatype), (int)*dest, > (int)*sendtag, (int)*source, (int)*recvtag, > MPI_Comm_f2c(*comm), &c_status ); > MPI_Status_c2f(&c_status, status); > } > > void mpi_ssend_init_ ( void *, MPI_Fint *, MPI_Fint *, MPI_Fint *, > MPI_Fint *, MPI_Fint *, MPI_Fint *, > MPI_Fint * ); 854,855c776,777 < MPI_Fint *dest, MPI_Fint *tag, MPI_Fint *comm, < MPI_Fint *request, MPI_Fint *__ierr ) --- > MPI_Fint *dest, MPI_Fint *tag, MPI_Fint *comm, > MPI_Fint *request, MPI_Fint *__ierr ) 864,873c786,794 < void mpi_ssend_( buf, count, datatype, dest, tag, comm, __ierr ) < void *buf; < int *count; < MPI_Datatype *datatype; < int *dest; < int *tag; < MPI_Comm *comm; < int *__ierr; < { < *__ierr = MPI_Ssend(buf, *count, *datatype, *dest, *tag, *comm); --- > void mpi_ssend_ ( void *, MPI_Fint *, MPI_Fint *, MPI_Fint *, > MPI_Fint *, MPI_Fint *, MPI_Fint * ); > void mpi_ssend_( void *buf, MPI_Fint *count, MPI_Fint *datatype, > MPI_Fint *dest, MPI_Fint *tag, MPI_Fint *comm, > MPI_Fint *__ierr ) > { > *__ierr = MPI_Ssend(MPIR_F_PTR(buf), (int)*count, > MPI_Type_f2c(*datatype), (int)*dest, (int)*tag, > MPI_Comm_f2c(*comm)); 875a797 > void mpi_startall_ ( MPI_Fint *, MPI_Fint [], MPI_Fint * ); 877c799 < MPI_Fint *__ierr ) --- > MPI_Fint *__ierr ) 908a831 > void mpi_start_ ( MPI_Fint *, MPI_Fint * ); 915a839,840 > void mpi_testall_ ( MPI_Fint *, MPI_Fint [], MPI_Fint *, > MPI_Fint [][MPI_STATUS_SIZE], MPI_Fint * ); 918,919c843,844 < MPI_Fint array_of_statuses[][MPI_STATUS_SIZE], < MPI_Fint *__ierr ) --- > MPI_Fint array_of_statuses[][MPI_STATUS_SIZE], > MPI_Fint *__ierr ) 970a896,897 > void mpi_testany_ ( MPI_Fint *, MPI_Fint [], MPI_Fint *, > MPI_Fint *, MPI_Fint *, MPI_Fint * ); 973c900 < MPI_Fint *__ierr ) --- > MPI_Fint *__ierr ) 1015a943 > void mpi_test_cancelled_ ( MPI_Fint *, MPI_Fint *, MPI_Fint * ); 1025a954 > void mpi_test_ ( MPI_Fint *, MPI_Fint *, MPI_Fint *, MPI_Fint * ); 1027c956 < MPI_Fint *__ierr ) --- > MPI_Fint *__ierr ) 1040a970,972 > void mpi_testsome_ ( MPI_Fint *, MPI_Fint [], MPI_Fint *, > MPI_Fint [], MPI_Fint [][MPI_STATUS_SIZE], > MPI_Fint * ); 1044c976 < MPI_Fint *__ierr ) --- > MPI_Fint *__ierr ) 1118a1051 > void mpi_type_commit_ ( MPI_Fint *, MPI_Fint * ); 1125a1059 > void mpi_type_contiguous_ ( MPI_Fint *, MPI_Fint *, MPI_Fint *, MPI_Fint * ); 1127c1061 < MPI_Fint *newtype, MPI_Fint *__ierr ) --- > MPI_Fint *newtype, MPI_Fint *__ierr ) 1135a1070 > void mpi_type_extent_ ( MPI_Fint *, MPI_Fint *, MPI_Fint * ); 1143a1079 > void mpi_type_free_ ( MPI_Fint *, MPI_Fint * ); 1150a1087,1088 > void mpi_type_hindexed_ ( MPI_Fint *, MPI_Fint [], MPI_Fint [], > MPI_Fint *, MPI_Fint *, MPI_Fint * ); 1153c1091 < MPI_Fint *newtype, MPI_Fint *__ierr ) --- > MPI_Fint *newtype, MPI_Fint *__ierr ) 1203a1142,1143 > void mpi_type_hvector_ ( MPI_Fint *, MPI_Fint *, MPI_Fint *, > MPI_Fint *, MPI_Fint *, MPI_Fint * ); 1205,1206c1145,1146 < MPI_Fint *old_type, MPI_Fint *newtype, < MPI_Fint *__ierr ) --- > MPI_Fint *old_type, MPI_Fint *newtype, > MPI_Fint *__ierr ) 1216a1157,1158 > void mpi_type_indexed_ ( MPI_Fint *, MPI_Fint [], MPI_Fint [], > MPI_Fint *, MPI_Fint *, MPI_Fint * ); 1219c1161 < MPI_Fint *newtype, MPI_Fint *__ierr ) --- > MPI_Fint *newtype, MPI_Fint *__ierr ) 1257a1200 > void mpi_type_lb_ ( MPI_Fint *, MPI_Fint *, MPI_Fint * ); 1259c1202 < MPI_Fint *__ierr ) --- > MPI_Fint *__ierr ) 1267a1211 > void mpi_type_size_ ( MPI_Fint *, MPI_Fint *, MPI_Fint * ); 1276a1221,1222 > void mpi_type_struct_ ( MPI_Fint *, MPI_Fint [], MPI_Fint [], > MPI_Fint [], MPI_Fint *, MPI_Fint * ); 1279c1225 < MPI_Fint *newtype, MPI_Fint *__ierr ) --- > MPI_Fint *newtype, MPI_Fint *__ierr ) 1342a1289 > void mpi_type_ub_ ( MPI_Fint *, MPI_Fint *, MPI_Fint * ); 1344c1291 < MPI_Fint *__ierr ) --- > MPI_Fint *__ierr ) 1352a1300,1301 > void mpi_type_vector_ ( MPI_Fint *, MPI_Fint *, MPI_Fint *, > MPI_Fint *, MPI_Fint *, MPI_Fint * ); 1354c1303 < MPI_Fint *old_type, MPI_Fint *newtype, MPI_Fint *__ierr ) --- > MPI_Fint *old_type, MPI_Fint *newtype, MPI_Fint *__ierr ) 1364,1376c1313,1326 < void mpi_unpack_ ( inbuf, insize, position, outbuf, outcount, type, comm, < __ierr ) < void *inbuf; < int *insize; < int *position; < void *outbuf; < int *outcount; < MPI_Datatype *type; < MPI_Comm *comm; < int *__ierr; < { < *__ierr = MPI_Unpack(inbuf, *insize, position, outbuf, *outcount, *type, < *comm); --- > void mpi_unpack_ ( void *, MPI_Fint *, MPI_Fint *, void *, > MPI_Fint *, MPI_Fint *, MPI_Fint *, > MPI_Fint * ); > void mpi_unpack_ ( void *inbuf, MPI_Fint *insize, MPI_Fint *position, > void *outbuf, MPI_Fint *outcount, MPI_Fint *type, > MPI_Fint *comm, MPI_Fint *__ierr ) > { > int l_position; > l_position = (int)*position; > > *__ierr = MPI_Unpack(inbuf, (int)*insize, &l_position, > MPIR_F_PTR(outbuf), (int)*outcount, > MPI_Type_f2c(*type), MPI_Comm_f2c(*comm) ); > *position = (MPI_Fint)l_position; 1378a1329,1330 > void mpi_waitall_ ( MPI_Fint *, MPI_Fint [], > MPI_Fint [][MPI_STATUS_SIZE], MPI_Fint *); 1381c1333 < MPI_Fint *__ierr ) --- > MPI_Fint *__ierr ) 1425a1378,1379 > void mpi_waitany_ ( MPI_Fint *, MPI_Fint [], MPI_Fint *, > MPI_Fint *, MPI_Fint * ); 1470a1425 > void mpi_wait_ ( MPI_Fint *, MPI_Fint *, MPI_Fint * ); 1482a1438,1440 > void mpi_waitsome_ ( MPI_Fint *, MPI_Fint [], MPI_Fint *, > MPI_Fint [], MPI_Fint [][MPI_STATUS_SIZE], > MPI_Fint * ); 1486c1444 < MPI_Fint *__ierr ) --- > MPI_Fint *__ierr ) 1564,1692c1522,1576 < void mpi_allgather_ ( sendbuf, sendcount, sendtype, recvbuf, recvcount, < recvtype, comm, __ierr ) < void *sendbuf; < int *sendcount; < MPI_Datatype *sendtype; < void *recvbuf; < int *recvcount; < MPI_Datatype *recvtype; < MPI_Comm *comm; < int *__ierr; < { < *__ierr = MPI_Allgather(sendbuf, *sendcount, *sendtype, recvbuf, < *recvcount, *recvtype, *comm); < } < < < void mpi_allgatherv_ ( sendbuf, sendcount, sendtype, recvbuf, recvcounts, < displs, recvtype, comm, __ierr ) < void *sendbuf; < int *sendcount; < MPI_Datatype *sendtype; < void *recvbuf; < int *recvcounts; < int *displs; < MPI_Datatype *recvtype; < MPI_Comm *comm; < int *__ierr; < { < *__ierr = MPI_Allgatherv(sendbuf, *sendcount, *sendtype, recvbuf, < recvcounts, displs, *recvtype, *comm); < } < < < void mpi_allreduce_ ( sendbuf, recvbuf, count, datatype, op, comm, __ierr ) < void *sendbuf; < void *recvbuf; < int *count; < MPI_Datatype *datatype; < MPI_Op *op; < MPI_Comm *comm; < int *__ierr; < { < *__ierr = MPI_Allreduce(sendbuf, recvbuf, *count, *datatype, *op, *comm); < } < < < void mpi_alltoall_( sendbuf, sendcount, sendtype, recvbuf, recvcnt, recvtype, < comm, __ierr ) < void *sendbuf; < int *sendcount; < MPI_Datatype *sendtype; < void *recvbuf; < int *recvcnt; < MPI_Datatype *recvtype; < MPI_Comm *comm; < int *__ierr; < { < *__ierr = MPI_Alltoall(sendbuf, *sendcount, *sendtype, recvbuf, *recvcnt, < *recvtype, *comm); < } < < < void mpi_alltoallv_ ( sendbuf, sendcnts, sdispls, sendtype, recvbuf, recvcnts, < rdispls, recvtype, comm, __ierr ) < void *sendbuf; < int *sendcnts; < int *sdispls; < MPI_Datatype *sendtype; < void *recvbuf; < int *recvcnts; < int *rdispls; < MPI_Datatype *recvtype; < MPI_Comm *comm; < int *__ierr; < { < *__ierr = MPI_Alltoallv(sendbuf, sendcnts, sdispls, *sendtype, recvbuf, < recvcnts, rdispls, *recvtype, *comm); < } < < void mpi_barrier_ ( comm, __ierr ) < MPI_Comm *comm; < int *__ierr; < { < *__ierr = MPI_Barrier(*comm); < } < < void mpi_bcast_ ( buffer, count, datatype, root, comm, __ierr ) < void *buffer; < int *count; < MPI_Datatype *datatype; < int *root; < MPI_Comm *comm; < int *__ierr; < { < *__ierr = MPI_Bcast(buffer, *count, *datatype, *root, *comm); < } < < void mpi_gather_ ( sendbuf, sendcnt, sendtype, recvbuf, recvcount, recvtype, < root, comm, __ierr ) < void *sendbuf; < int *sendcnt; < MPI_Datatype *sendtype; < void *recvbuf; < int *recvcount; < MPI_Datatype *recvtype; < int *root; < MPI_Comm *comm; < int *__ierr; < { < *__ierr = MPI_Gather(sendbuf, *sendcnt, *sendtype, recvbuf, *recvcount, < *recvtype, *root, *comm); < } < < < void mpi_gatherv_ ( sendbuf, sendcnt, sendtype, recvbuf, recvcnts, displs, < recvtype, root, comm, __ierr ) < void *sendbuf; < int *sendcnt; < MPI_Datatype *sendtype; < void *recvbuf; < int *recvcnts; < int *displs; < MPI_Datatype *recvtype; < int *root; < MPI_Comm *comm; < int *__ierr; < { < *__ierr = MPI_Gatherv(sendbuf, *sendcnt, *sendtype, recvbuf, recvcnts, < displs, *recvtype, *root, *comm); --- > void mpi_allgather_ ( void *, MPI_Fint *, MPI_Fint *, void *, > MPI_Fint *, MPI_Fint *, MPI_Fint *, > MPI_Fint * ); > void mpi_allgather_ ( void *sendbuf, MPI_Fint *sendcount, MPI_Fint *sendtype, > void *recvbuf, MPI_Fint *recvcount, MPI_Fint *recvtype, > MPI_Fint *comm, MPI_Fint *__ierr ) > { > *__ierr = MPI_Allgather(MPIR_F_PTR(sendbuf), (int)*sendcount, > MPI_Type_f2c(*sendtype), > MPIR_F_PTR(recvbuf), > (int)*recvcount, > MPI_Type_f2c(*recvtype), > MPI_Comm_f2c(*comm)); > } > > void mpi_allgatherv_ ( void *, MPI_Fint *, MPI_Fint *, > void *, MPI_Fint *, MPI_Fint *, > MPI_Fint *, MPI_Fint *, MPI_Fint * ); > void mpi_allgatherv_ ( void *sendbuf, MPI_Fint *sendcount, MPI_Fint *sendtype, > void *recvbuf, MPI_Fint *recvcounts, MPI_Fint *displs, > MPI_Fint *recvtype, MPI_Fint *comm, MPI_Fint *__ierr ) > { > if (sizeof(MPI_Fint) == sizeof(int)) > *__ierr = MPI_Allgatherv(MPIR_F_PTR(sendbuf), *sendcount, > MPI_Type_f2c(*sendtype), > MPIR_F_PTR(recvbuf), recvcounts, > displs, MPI_Type_f2c(*recvtype), > MPI_Comm_f2c(*comm)); > else { > int size; > int *l_recvcounts; > int *l_displs; > int i; > > MPI_Comm_size(MPI_Comm_f2c(*comm), &size); > > MPIR_FALLOC(l_recvcounts,(int*)MALLOC(sizeof(int)* size), > MPIR_COMM_WORLD, MPI_ERR_EXHAUSTED, > "MPI_Allgatherv"); > MPIR_FALLOC(l_displs,(int*)MALLOC(sizeof(int)* size), > MPIR_COMM_WORLD, MPI_ERR_EXHAUSTED, > "MPI_Allgatherv"); > for (i=0; i l_recvcounts[i] = (int)recvcounts[i]; > l_displs[i] = (int)displs[i]; > } > > *__ierr = MPI_Allgatherv(MPIR_F_PTR(sendbuf), (int)*sendcount, > MPI_Type_f2c(*sendtype), > MPIR_F_PTR(recvbuf), l_recvcounts, > l_displs, MPI_Type_f2c(*recvtype), > MPI_Comm_f2c(*comm)); > FREE( l_recvcounts ); > FREE( l_displs ); > } 1694a1579,1739 > void mpi_allreduce_ ( void *, void *, MPI_Fint *, MPI_Fint *, > MPI_Fint *, MPI_Fint *, MPI_Fint * ); > void mpi_allreduce_ ( void *sendbuf, void *recvbuf, MPI_Fint *count, > MPI_Fint *datatype, MPI_Fint *op, MPI_Fint *comm, > MPI_Fint *__ierr ) > { > *__ierr = MPI_Allreduce(MPIR_F_PTR(sendbuf),MPIR_F_PTR(recvbuf), > (int)*count, MPI_Type_f2c(*datatype), > MPI_Op_f2c(*op), MPI_Comm_f2c(*comm) ); > } > > > void mpi_alltoall_ ( void *, MPI_Fint *, MPI_Fint *, void *, > MPI_Fint *, MPI_Fint *, MPI_Fint *, > MPI_Fint * ); > void mpi_alltoall_( void *sendbuf, MPI_Fint *sendcount, MPI_Fint *sendtype, > void *recvbuf, MPI_Fint *recvcnt, MPI_Fint *recvtype, > MPI_Fint *comm, MPI_Fint *__ierr ) > { > *__ierr = MPI_Alltoall(MPIR_F_PTR(sendbuf), (int)*sendcount, > MPI_Type_f2c(*sendtype), MPIR_F_PTR(recvbuf), > (int)*recvcnt, MPI_Type_f2c(*recvtype), > MPI_Comm_f2c(*comm) ); > } > > void mpi_alltoallv_ ( void *, MPI_Fint *, MPI_Fint *, MPI_Fint *, > void *, MPI_Fint *, MPI_Fint *, MPI_Fint *, > MPI_Fint *, MPI_Fint * ); > void mpi_alltoallv_ ( void *sendbuf, MPI_Fint *sendcnts, > MPI_Fint *sdispls, MPI_Fint *sendtype, > void *recvbuf, MPI_Fint *recvcnts, > MPI_Fint *rdispls, MPI_Fint *recvtype, > MPI_Fint *comm, MPI_Fint *__ierr ) > { > if (sizeof(MPI_Fint) == sizeof(int)) > *__ierr = MPI_Alltoallv(MPIR_F_PTR(sendbuf), sendcnts, > sdispls, MPI_Type_f2c(*sendtype), > MPIR_F_PTR(recvbuf), recvcnts, > rdispls, MPI_Type_f2c(*recvtype), > MPI_Comm_f2c(*comm) ); > else { > > int *l_sendcnts; > int *l_sdispls; > int *l_recvcnts; > int *l_rdispls; > int size; > int i; > > MPI_Comm_size(MPI_Comm_f2c(*comm), &size); > > MPIR_FALLOC(l_sendcnts,(int*)MALLOC(sizeof(int)* size), > MPIR_COMM_WORLD, MPI_ERR_EXHAUSTED, > "MPI_Alltoallv"); > MPIR_FALLOC(l_sdispls,(int*)MALLOC(sizeof(int)* size), > MPIR_COMM_WORLD, MPI_ERR_EXHAUSTED, > "MPI_Alltoallv"); > MPIR_FALLOC(l_recvcnts,(int*)MALLOC(sizeof(int)* size), > MPIR_COMM_WORLD, MPI_ERR_EXHAUSTED, > "MPI_Alltoallv"); > MPIR_FALLOC(l_rdispls,(int*)MALLOC(sizeof(int)* size), > MPIR_COMM_WORLD, MPI_ERR_EXHAUSTED, > "MPI_Alltoallv"); > > for (i=0; i l_sendcnts[i] = (int)sendcnts[i]; > l_sdispls[i] = (int)sdispls[i]; > l_recvcnts[i] = (int)recvcnts[i]; > l_rdispls[i] = (int)rdispls[i]; > } > *__ierr = MPI_Alltoallv(MPIR_F_PTR(sendbuf), l_sendcnts, > l_sdispls, MPI_Type_f2c(*sendtype), > MPIR_F_PTR(recvbuf), l_recvcnts, > l_rdispls, MPI_Type_f2c(*recvtype), > MPI_Comm_f2c(*comm) ); > FREE( l_sendcnts); > FREE( l_sdispls ); > FREE( l_recvcnts); > FREE( l_rdispls ); > } > } > > void mpi_barrier_ ( MPI_Fint *, MPI_Fint * ); > void mpi_barrier_ ( MPI_Fint *comm, MPI_Fint *__ierr ) > { > *__ierr = MPI_Barrier( MPI_Comm_f2c(*comm) ); > } > > void mpi_bcast_ ( void *, MPI_Fint *, MPI_Fint *, MPI_Fint *, > MPI_Fint *, MPI_Fint * ); > void mpi_bcast_ ( void *buffer, MPI_Fint *count, MPI_Fint *datatype, > MPI_Fint *root, MPI_Fint *comm, MPI_Fint *__ierr ) > { > *__ierr = MPI_Bcast(MPIR_F_PTR(buffer), (int)*count, > MPI_Type_f2c(*datatype), (int)*root, > MPI_Comm_f2c(*comm)); > } > > void mpi_gather_ ( void *, MPI_Fint *, MPI_Fint *, > void *, MPI_Fint *, MPI_Fint *, > MPI_Fint *, MPI_Fint *, MPI_Fint * ); > void mpi_gather_ ( void *sendbuf, MPI_Fint *sendcnt, MPI_Fint *sendtype, > void *recvbuf, MPI_Fint *recvcount, MPI_Fint *recvtype, > MPI_Fint *root, MPI_Fint *comm, MPI_Fint *__ierr ) > { > *__ierr = MPI_Gather(MPIR_F_PTR(sendbuf), (int)*sendcnt, > MPI_Type_f2c(*sendtype), MPIR_F_PTR(recvbuf), > (int)*recvcount, MPI_Type_f2c(*recvtype), > (int)*root, MPI_Comm_f2c(*comm)); > } > > void mpi_gatherv_ ( void *, MPI_Fint *, MPI_Fint *, > void *, MPI_Fint *, MPI_Fint *, > MPI_Fint *, MPI_Fint *, MPI_Fint *, MPI_Fint * ); > void mpi_gatherv_ ( void *sendbuf, MPI_Fint *sendcnt, MPI_Fint *sendtype, > void *recvbuf, MPI_Fint *recvcnts, MPI_Fint *displs, > MPI_Fint *recvtype, MPI_Fint *root, MPI_Fint *comm, > MPI_Fint *__ierr ) > { > > if (sizeof(MPI_Fint) == sizeof(int)) > *__ierr = MPI_Gatherv(MPIR_F_PTR(sendbuf), *sendcnt, > MPI_Type_f2c(*sendtype), MPIR_F_PTR(recvbuf), > recvcnts, displs, > MPI_Type_f2c(*recvtype), *root, > MPI_Comm_f2c(*comm)); > else { > int size; > int *l_recvcnts; > int *l_displs; > int i; > > MPI_Comm_size(MPI_Comm_f2c(*comm), &size); > > MPIR_FALLOC(l_recvcnts,(int*)MALLOC(sizeof(int)* size), > MPIR_COMM_WORLD, MPI_ERR_EXHAUSTED, > "MPI_Gatherv"); > MPIR_FALLOC(l_displs,(int*)MALLOC(sizeof(int)* size), > MPIR_COMM_WORLD, MPI_ERR_EXHAUSTED, > "MPI_Gatherv"); > for (i=0; i l_recvcnts[i] = (int)recvcnts[i]; > l_displs[i] = (int)displs[i]; > } > *__ierr = MPI_Gatherv(MPIR_F_PTR(sendbuf), (int)*sendcnt, > MPI_Type_f2c(*sendtype), MPIR_F_PTR(recvbuf), > l_recvcnts, l_displs, > MPI_Type_f2c(*recvtype), (int)*root, > MPI_Comm_f2c(*comm)); > FREE( l_recvcnts ); > FREE( l_displs ); > } > > } > > #ifdef FORTRAN_SPECIAL_FUNCTION_PTR > void mpi_op_create_( MPI_User_function **, MPI_Fint *, MPI_Fint *, MPI_Fint * ); > #else > void mpi_op_create_( MPI_User_function *, MPI_Fint *, MPI_Fint *, MPI_Fint * ); > #endif > 1719a1765 > void mpi_op_free_ ( MPI_Fint *, MPI_Fint * ); 1726,1794c1772,1776 < void mpi_reduce_scatter_ ( sendbuf, recvbuf, recvcnts, datatype, op, comm, < __ierr ) < void *sendbuf; < void *recvbuf; < int *recvcnts; < MPI_Datatype *datatype; < MPI_Op *op; < MPI_Comm *comm; < int *__ierr; < { < *__ierr = MPI_Reduce_scatter(sendbuf, recvbuf, recvcnts, *datatype, *op, < *comm); < } < < void mpi_reduce_ ( sendbuf, recvbuf, count, datatype, op, root, comm, __ierr ) < void *sendbuf; < void *recvbuf; < int *count; < MPI_Datatype *datatype; < MPI_Op *op; < int *root; < MPI_Comm *comm; < int *__ierr; < { < *__ierr = MPI_Reduce(sendbuf, recvbuf, *count, *datatype, *op, *root, < *comm); < } < < < void mpi_scan_ ( sendbuf, recvbuf, count, datatype, op, comm, __ierr ) < void *sendbuf; < void *recvbuf; < int *count; < MPI_Datatype *datatype; < MPI_Op *op; < MPI_Comm *comm; < int *__ierr; < { < *__ierr = MPI_Scan(sendbuf, recvbuf, *count, *datatype, *op, *comm); < } < < void mpi_scatter_ ( sendbuf, sendcnt, sendtype, recvbuf, recvcnt, recvtype, < root, comm, __ierr ) < void *sendbuf; < int *sendcnt; < MPI_Datatype *sendtype; < void *recvbuf; < int *recvcnt; < MPI_Datatype *recvtype; < int *root; < MPI_Comm *comm; < int *__ierr; < { < *__ierr = MPI_Scatter(sendbuf, *sendcnt, *sendtype, recvbuf, *recvcnt, < *recvtype, *root, *comm); < } < < void mpi_scatterv_ ( sendbuf, sendcnts, displs, sendtype, recvbuf, recvcnt, < recvtype, root, comm, __ierr ) < void *sendbuf; < int *sendcnts; < int *displs; < MPI_Datatype *sendtype; < void *recvbuf; < int *recvcnt; < MPI_Datatype *recvtype; < int *root; < MPI_Comm *comm; < int *__ierr; --- > void mpi_reduce_scatter_ ( void *, void *, MPI_Fint *, MPI_Fint *, > MPI_Fint *, MPI_Fint *, MPI_Fint * ); > void mpi_reduce_scatter_ ( void *sendbuf, void *recvbuf, > MPI_Fint *recvcnts, MPI_Fint *datatype, > MPI_Fint *op, MPI_Fint *comm, MPI_Fint *__ierr ) 1796,1797c1778,1881 < *__ierr = MPI_Scatterv(sendbuf, sendcnts, displs, *sendtype, recvbuf, < *recvcnt, *recvtype, *root, *comm); --- > > if (sizeof(MPI_Fint) == sizeof(int)) > *__ierr = MPI_Reduce_scatter(MPIR_F_PTR(sendbuf), > MPIR_F_PTR(recvbuf), recvcnts, > MPI_Type_f2c(*datatype), MPI_Op_f2c(*op), > MPI_Comm_f2c(*comm)); > else { > int size; > int *l_recvcnts; > int i; > > MPI_Comm_size(MPI_Comm_f2c(*comm), &size); > > MPIR_FALLOC(l_recvcnts,(int*)MALLOC(sizeof(int)* size), > MPIR_COMM_WORLD, MPI_ERR_EXHAUSTED, > "MPI_Reduce_scatter"); > for (i=0; i l_recvcnts[i] = (int)recvcnts[i]; > > *__ierr = MPI_Reduce_scatter(MPIR_F_PTR(sendbuf), > MPIR_F_PTR(recvbuf), l_recvcnts, > MPI_Type_f2c(*datatype), MPI_Op_f2c(*op), > MPI_Comm_f2c(*comm)); > FREE( l_recvcnts); > } > > } > > void mpi_reduce_ ( void *, void *, MPI_Fint *, MPI_Fint *, > MPI_Fint *, MPI_Fint *, MPI_Fint *, MPI_Fint * ); > void mpi_reduce_ ( void *sendbuf, void *recvbuf, MPI_Fint *count, > MPI_Fint *datatype, MPI_Fint *op, MPI_Fint *root, > MPI_Fint *comm, MPI_Fint *__ierr ) > { > *__ierr = MPI_Reduce(MPIR_F_PTR(sendbuf), MPIR_F_PTR(recvbuf), > (int)*count, MPI_Type_f2c(*datatype), > MPI_Op_f2c(*op), (int)*root, > MPI_Comm_f2c(*comm)); > } > > void mpi_scan_ ( void *, void *, MPI_Fint *, MPI_Fint *, > MPI_Fint *, MPI_Fint *, MPI_Fint * ); > void mpi_scan_ ( void *sendbuf, void *recvbuf, MPI_Fint *count, > MPI_Fint *datatype, MPI_Fint *op, MPI_Fint *comm, > MPI_Fint *__ierr ) > { > *__ierr = MPI_Scan(MPIR_F_PTR(sendbuf), MPIR_F_PTR(recvbuf), > (int)*count, MPI_Type_f2c(*datatype), > MPI_Op_f2c(*op), MPI_Comm_f2c(*comm)); > } > > void mpi_scatter_ ( void *, MPI_Fint *, MPI_Fint *, > void *, MPI_Fint *, MPI_Fint *, > MPI_Fint *, MPI_Fint *, MPI_Fint * ); > void mpi_scatter_ ( void *sendbuf, MPI_Fint *sendcnt, MPI_Fint *sendtype, > void *recvbuf, MPI_Fint *recvcnt, MPI_Fint *recvtype, > MPI_Fint *root, MPI_Fint *comm, MPI_Fint *__ierr ) > { > *__ierr = MPI_Scatter(MPIR_F_PTR(sendbuf), (int)*sendcnt, > MPI_Type_f2c(*sendtype), MPIR_F_PTR(recvbuf), > (int)*recvcnt, MPI_Type_f2c(*recvtype), > (int)*root, MPI_Comm_f2c(*comm)); > } > > void mpi_scatterv_ ( void *, MPI_Fint *, MPI_Fint *, MPI_Fint *, > void *, MPI_Fint *, MPI_Fint *, MPI_Fint *, > MPI_Fint *, MPI_Fint * ); > void mpi_scatterv_ ( void *sendbuf, MPI_Fint *sendcnts, > MPI_Fint *displs, MPI_Fint *sendtype, > void *recvbuf, MPI_Fint *recvcnt, > MPI_Fint *recvtype, MPI_Fint *root, > MPI_Fint *comm, MPI_Fint *__ierr ) > { > if (sizeof(MPI_Fint) == sizeof(int)) > *__ierr = MPI_Scatterv(MPIR_F_PTR(sendbuf), sendcnts, displs, > MPI_Type_f2c(*sendtype), MPIR_F_PTR(recvbuf), > *recvcnt, MPI_Type_f2c(*recvtype), > *root, MPI_Comm_f2c(*comm) ); > else { > int size; > int *l_sendcnts; > int *l_displs; > int i; > > MPI_Comm_size(MPI_Comm_f2c(*comm), &size); > > MPIR_FALLOC(l_sendcnts,(int*)MALLOC(sizeof(int)* size), > MPIR_COMM_WORLD, MPI_ERR_EXHAUSTED, > "MPI_Scatterv"); > MPIR_FALLOC(l_displs,(int*)MALLOC(sizeof(int)* size), > MPIR_COMM_WORLD, MPI_ERR_EXHAUSTED, > "MPI_Scatterv"); > for (i=0; i l_sendcnts[i] = (int)sendcnts[i]; > l_displs[i] = (int)displs[i]; > } > > *__ierr = MPI_Scatterv(MPIR_F_PTR(sendbuf), l_sendcnts, l_displs, > MPI_Type_f2c(*sendtype), MPIR_F_PTR(recvbuf), > (int)*recvcnt, MPI_Type_f2c(*recvtype), > (int)*root, MPI_Comm_f2c(*comm) ); > FREE( l_sendcnts); > FREE( l_displs); > } 1799a1884 > void mpi_finalize_ ( int * ); Index: mpe/viewers/jumpshot-2/src/Mainwin.java =================================================================== RCS file: /MPIhome/jumpshot-2.0/src/Mainwin.java,v retrieving revision 1.4 retrieving revision 1.5 diff -r1.4 -r1.5 458a459 > readWorker.start(); 475c476,479 < if (reader_alive) {readWorker.interrupt (); readWorker = null;} --- > if (readWorker != null && reader_alive) { > readWorker.interrupt (); > readWorker = null; > } Index: mpe/viewers/jumpshot-2/src/SwingWorker.java =================================================================== RCS file: /MPIhome/jumpshot-2.0/src/SwingWorker.java,v retrieving revision 1.1 retrieving revision 1.2 diff -r1.1 -r1.2 4,7c4,13 < * An abstract class that you subclass to perform < * GUI-related work in a dedicated thread. < * For instructions on using this class, see < * http://java.sun.com/products/jfc/swingdoc-current/threads2.html --- > * This is the 3rd version of SwingWorker (also known as > * SwingWorker 3), an abstract class that you subclass to > * perform GUI-related work in a dedicated thread. For > * instructions on using this class, see: > * > * http://java.sun.com/docs/books/tutorial/uiswing/misc/threads.html > * > * Note that the API changed slightly in the 3rd version: > * You must now invoke start() on the SwingWorker after > * creating it. 10c16 < private Object value; --- > private Object value; // see getValue(), setValue() 13a20,47 > * Class to maintain reference to current worker thread > * under separate synchronization control. > */ > private static class ThreadVar { > private Thread thread; > ThreadVar(Thread t) { thread = t; } > synchronized Thread get() { return thread; } > synchronized void clear() { thread = null; } > } > > private ThreadVar threadVar; > > /** > * Get the value produced by the worker thread, or null if it > * hasn't been constructed yet. > */ > protected synchronized Object getValue() { > return value; > } > > /** > * Set the value produced by worker thread > */ > private synchronized void setValue(Object x) { > value = x; > } > > /** 27c61 < * to force the worker to abort what it's doing. --- > * to force the worker to stop what it's doing. 30,34c64,68 < Thread t = thread; < if (t != null) { < t.interrupt(); < } < thread = null; --- > Thread t = threadVar.get(); > if (t != null) { > t.interrupt(); > } > threadVar.clear(); 38a73,76 > * Returns null if either the constructing thread or the current > * thread was interrupted before a value was produced. > * > * @return the value created by the construct method 41,47c79,82 < while (true) { // keep trying if we're interrupted < Thread t; < synchronized (SwingWorker.this) { < t = thread; < if (t == null) { < return value; < } --- > while (true) { > Thread t = threadVar.get(); > if (t == null) { > return getValue(); 52a88,89 > Thread.currentThread().interrupt(); // propagate > return null; 56a94 > 68,70c106,110 < synchronized(SwingWorker.this) { < value = construct(); < thread = null; --- > try { > setValue(construct()); > } > finally { > threadVar.clear(); 71a112 > 76,77c117,128 < thread = new Thread(doConstruct); < thread.start(); --- > Thread t = new Thread(doConstruct); > threadVar = new ThreadVar(t); > } > > /** > * Start the worker thread. > */ > public void start() { > Thread t = threadVar.get(); > if (t != null) { > t.start(); > } Index: mpe/viewers/jumpshot-3/src/main/FrameReadingTask.java =================================================================== RCS file: /MPIhome/jumpshot-3/src/main/FrameReadingTask.java,v retrieving revision 1.2 retrieving revision 1.4 diff -r1.2 -r1.4 5,30c5,30 < private ViewFrameChooser frame_chooser = null; < private SLOG_InputStream slog = null; < private int frame_idx = 0; < private int connect_idx = 0; < private int view_idx = 0; < < private SLOG_Frame slog_frame = null; < private PlotData slog_plotdata = null; < < private SwingWorker read_worker; < < private final int max_prog_idx = 100; < private final int min_prog_idx = 0; < private int cur_prog_idx = min_prog_idx; < < private String status_str = ""; < private boolean plotdata_ready = false; < < private static int ONE_SECOND = 1000; < private final int refresh_intvl = ONE_SECOND / 10; < < public FrameReadingTask( ViewFrameChooser in_chooser, < final SLOG_InputStream in_slog, < final int in_frame_idx, < final int in_connect_idx, < final int in_view_idx ) --- > private ViewFrameChooser frame_chooser = null; > private SLOG_ProxyInputStream slog = null; > private int frame_idx = 0; > private int connect_idx = 0; > private int view_idx = 0; > > private SLOG_Frame slog_frame = null; > private PlotData slog_plotdata = null; > > private SwingWorker read_worker; > > private final int max_prog_idx = 100; > private final int min_prog_idx = 0; > private int cur_prog_idx = min_prog_idx; > > private String status_str = ""; > private boolean plotdata_ready = false; > > private static int ONE_SECOND = 1000; > private final int refresh_intvl = ONE_SECOND / 10; > > public FrameReadingTask( ViewFrameChooser in_chooser, > final SLOG_ProxyInputStream in_slog, > final int in_frame_idx, > final int in_connect_idx, > final int in_view_idx ) 41c41,43 < read_worker = new SwingWorker() --- > read_worker = new SwingWorker() > { > public Object construct() 43,55c45,57 < public Object construct() < { < plotdata_ready = false; < ReadFrameAndConvert(); < return( slog_plotdata ); < } < public void finished() < { < slog_plotdata = ( PlotData ) get(); < plotdata_ready = true; < frame_chooser.DisplayFrame(); < } < }; --- > plotdata_ready = false; > ReadFrame(); > ConvertFrameToPlotData(); > return( slog_plotdata ); > } > public void finished() > { > slog_plotdata = ( PlotData ) get(); > plotdata_ready = true; > frame_chooser.DisplayFrame(); > } > }; > read_worker.start(); 58c60 < private void ReadFrameAndConvert() --- > private void ReadFrame() 62c64 < SLOG_DirEntry dir_entry = slog.dir.EntryAt( frame_idx ); --- > SLOG_DirEntry dir_entry = slog.GetDir().EntryAt( frame_idx ); 72a75 > } 74c77,79 < SetCurProgIdx( max_prog_idx * 7 / 10 ); --- > private void ConvertFrameToPlotData() > { > SetCurProgIdx( max_prog_idx * 5 / 10 ); Index: mpe/viewers/jumpshot-3/src/main/Mainwin.java =================================================================== RCS file: /MPIhome/jumpshot-3/src/main/Mainwin.java,v retrieving revision 1.3 retrieving revision 1.7 diff -r1.3 -r1.7 5a6 > import java.rmi.*; 25,27c26,29 < public class Mainwin extends JFrame < implements ActionListener { < SLOG_InputStream slog = null; --- > public class Mainwin extends JPanel > implements ActionListener > { > SLOG_ProxyInputStream slog = null; 32,48c34,51 < // File with default link to Color file and Help file < private String setupFile = "jumpshot.setup"; < // Directory with the distribution < private String distributionDir = "./"; < String distributionUrl; < //Dir with byte code < private String classDir1 = "js_classes"; < private String classDir2 = "jumpshot.jar"; < //Dir with the ASCII file < private String dataDir = ""; < private String logFileDir = "logfiles"; < < private Object openAppFileDlg; < private ApltFileDlg openApltFileDlg; < private MyTextField logFileField; < private JMenuItem metalMenuItem, selectFileMenuItem; < String logFileName; --- > // Relative Path to the files for the GUI system's configuration > private String configDefaultFile = "etc/jumpshot.conf"; > private String colorDefaultFile = "share/jumpshot.colors"; > private String tourDefaultFile = "doc/html/index.html"; > private String buttonDefaultFile = "doc/jumpshot.def"; > private String configFile = configDefaultFile; > private String colorFile; > private String tourHTMLFile; > private String btnsDefnFile; > //Directory to the sample logfiles > private String logFileDir = "logfiles"; > > // private Object openAppFileDlg; > private JFileChooser openAppFileDlg; > private ApltFileDlg openApltFileDlg; > private MyTextField logFileField; > private JMenuItem metalMenuItem, selectFileMenuItem; > String logFileName; 54,57c57,60 < private HTMLviewer btns_viewer; < private HTMLviewer tour_viewer; < private JMenuBar menuBar; < Mainwin startwin; --- > private HTMLviewer btns_viewer; > private HTMLviewer tour_viewer; > private JMenuBar menuBar; > Mainwin startwin; 62c65 < private boolean child; --- > private boolean isChild; 64,66c67,68 < jumpshot parent; < boolean aplt; < int dtype; --- > Component parent; > private String parent_superclass; 68,69c70,71 < private String about = "Jumpshot, the SLOG viewer, Version 3.0\n" < + "Questions: mpi-maint@mcs.anl.gov"; --- > private boolean isApplet; > int dtype; 71,72c73,77 < private MyButton read_btn; < private boolean reader_alive; --- > private String about = "Jumpshot, the SLOG viewer, Version 3.0\n" > + "Questions: mpi-maint@mcs.anl.gov"; > > private MyButton read_btn; > private boolean reader_alive; 75,76c80,81 < public Mainwin ( jumpshot origin, boolean is_applet, boolean is_child, < String filename, int frame_idx ) --- > public Mainwin( Component origin, boolean is_child, > String filename, int frame_idx ) 78c83,86 < parent = origin; aplt = is_applet; child = is_child; --- > parent = origin; > parent_superclass = parent.getClass().getSuperclass().getName(); > isApplet = parent_superclass.equals( "javax.swing.JApplet" ); > isChild = is_child; 91c99 < logFileName = new String ("No Name"); --- > logFileName = new String( "No Name" ); 95a104,106 > public boolean getIsApplet() > { return isApplet; } > 99,117c110,120 < setupUI (); < adjustFrameStuff (); < setupData (); < setupDlgs (); < setupPanels (); < disableRead (); < setupEventHandlers (); < pack (); < // setSize (getMinimumSize ()); setResizable (false); < setResizable (false); < setVisible (true); < if (!(logFileName.equals ("No Name"))) { < if (aplt) logFileName = distributionUrl + logFileName; < readLogFile(); < /* < try { readLogFile (); } < catch ( IOException ioerr ) < { System.err.println( "setup()'s readLogFile() has IO error" ); } < */ --- > setupUI(); > adjustFrameStuff(); > setupData(); > // setupDlgs(); > setupPanels(); > disableRead(); > setupEventHandlers(); > // setSize( getMinimumSize() ); setResizable( false ); > setVisible(true); > if ( ! logFileName.equals( "No Name" ) ) { > readLogFile(); 134,137c137,139 < if (child) setTitle ("Jumpshot: (Child)"); < else setTitle ("Jumpshot"); < Toolkit toolkit = getToolkit (); < Dimension dimScreen = new Dimension (toolkit.getScreenSize ()); --- > if ( isChild ) > ( (MainFrame)parent ).setTitle( "Jumpshot-3: Child" ); > Dimension dimScreen = Toolkit.getDefaultToolkit().getScreenSize(); 145c147,148 < private void setupData () { --- > private void setupData() > { 147c150,152 < Properties settings = new Properties (); --- > Properties settings = new Properties(); > URL setup_URL, color_URL; > boolean useDefaultSettings; 149d153 < String path; 151,157c155,167 < if (!aplt) { < path = getDataPath (); < if (path == null) { < new ErrorDialog (null, "Jumpshot cannot locate setup files. Exiting"); < return; < } < setin = getFileIn (path + setupFile); --- > setup_URL = getURL( configFile ); > if ( setup_URL != null ) { > try { > setin = setup_URL.openStream(); > settings.load( setin ); > setin.close(); > } > catch ( IOException err ) { > new WarnDialog( this, "IO Error:" + err.getMessage() + " " > + "in reading the setup file. Use default settings" ); > useDefaultSettings = true; > } > useDefaultSettings = false; 160,165c170,172 < path = getDataUrl (); < if (path == null) { < new ErrorDialog (null, "Jumpshot cannot locate setup files. Exiting"); < return; < } < setin = getUrlIn (path + setupFile); --- > new WarnDialog( this, "Cannot locate setup file " + configFile + ". " > + "Use default settings." ); > useDefaultSettings = true; 168,179c175,200 < try {settings.load (setin); setin.close ();} < catch (IOException x) < {new ErrorDialog (this, "IO Error:" + x.getMessage ()); return;} < < String colorFile = settings.getProperty ("COLORFILE", "jumpshot.colors"); < < if (!aplt) < colorin = getFileIn (path + colorFile); < else < colorin = getUrlIn (path + colorFile); < < ColorUtil.readColors (this, colorin); --- > // Load the settings if possible > if ( useDefaultSettings ) { > colorFile = colorDefaultFile; > tourHTMLFile = tourDefaultFile; > btnsDefnFile = buttonDefaultFile; > } > else { > colorFile = settings.getProperty( "COLORFILE", colorDefaultFile ); > tourHTMLFile = settings.getProperty( "HTMLFILE", tourDefaultFile ); > btnsDefnFile = settings.getProperty( "BUTTONFILE", buttonDefaultFile ); > } > > color_URL = getURL( colorFile ); > if ( color_URL == null ) { > new ErrorDialog( this, "Cannot locate " + colorFile + ". Exiting!" ); > close(); > } > > colorin = null; > try { colorin = color_URL.openStream(); } > catch ( IOException err ) { > new ErrorDialog( this, "IO Error:" + err.getMessage() + ". " > + "Cannot open " + colorFile + ". Exiting!" ); > close(); > } > ColorUtil.readColors( this, colorin ); 182c203 < } --- > } 185,220c206,213 < //Bug: Method setCurrentDirectory of JFileChooser does not work completely. < // So, method rescanCurrentDirectory has to be called also to get the < // desired effect. We want the JFileChooser dialog to open up with a < // listing of files of the directory from which Jumpshot was executed < private void setupDlgs () { < if (!aplt) { < Class c = null; openAppFileDlg = null; < try {c = Class.forName ("com.sun.java.swing.preview.JFileChooser");} < catch (ClassNotFoundException e1) { < try {c = Class.forName ("javax.swing.JFileChooser");} < catch (ClassNotFoundException e2) < {System.err.println (e2.toString ());} < } < < if (c != null) { < try {openAppFileDlg = c.newInstance ();} < catch (InstantiationException e) < {System.err.println (e.toString ());} < catch (IllegalAccessException e) < {System.err.println (e.toString ());} < } < < // ExFileFilter filter = new ExFileFilter( new String [] {"slog"}, < // "slog logfiles"); < < if (openAppFileDlg != null) { < // ROUTINES.invokeMethod( openAppFileDlg, "addChoosableFileFilter", < // filter, filter.getClass ()); < // ROUTINES.invokeMethod( openAppFileDlg, "setFileFilter", filter, < // (filter.getClass ()).getSuperclass ()); < < String s = new String ("Select Logfile"); < ROUTINES.invokeMethod (openAppFileDlg, "setDialogTitle", s); < < File f = new File ((System.getProperties ()).getProperty ("user.dir")); < ROUTINES.invokeMethod (openAppFileDlg, "setCurrentDirectory", f); --- > /* > private void setupDlgs() > { > URL init_URL = getURL( tourHTMLFile ); > if ( init_URL != null ) > tour_viewer = new HTMLviewer( init_URL ); > else > tour_viewer = null; 222,225c215,217 < ROUTINES.invokeMethod (openAppFileDlg, "rescanCurrentDirectory", null); < } < else selectFileMenuItem.setEnabled (false); < } --- > URL btns_URL = getURL( btnsDefnFile ); > if ( btns_URL != null ) > btns_viewer = new HTMLviewer( btns_URL ); 227,232c219,221 < openApltFileDlg = new ApltFileDlg (this, "Select Logfile"); < URL init_URL = ClassLoader.getSystemResource( "doc/html/index.html" ); < tour_viewer = new HTMLviewer( init_URL ); < URL btns_URL = ClassLoader.getSystemResource( "doc/jumpshot.def" ); < btns_viewer = new HTMLviewer( btns_URL ); < } --- > btns_viewer = null; > } > */ 234,236c223,226 < private void setupPanels () { < getContentPane ().setLayout (new GridBagLayout ()); < GridBagConstraints con = new GridBagConstraints (); --- > private void setupPanels() > { > setLayout( new GridBagLayout() ); > GridBagConstraints con = new GridBagConstraints(); 240c230 < getContentPane ().add (setupMenuBar (), con); --- > add( setupMenuBar(), con ); 246c236 < Border border1, border2 = BorderFactory.createLoweredBevelBorder (); --- > Border border1, border2 = BorderFactory.createLoweredBevelBorder(); 249,251c239,241 < JPanel pl = new JPanel (new FlowLayout ()); < border1 = BorderFactory.createEmptyBorder (4, 4, 2, 4); < pl.setBorder (BorderFactory.createCompoundBorder (border1, border2)); --- > JPanel pl = new JPanel( new FlowLayout() ); > border1 = BorderFactory.createEmptyBorder( 4, 4, 2, 4 ); > pl.setBorder( BorderFactory.createCompoundBorder( border1, border2 ) ); 253,254c243 < pl.add (new JLabel ("Logfile")); < // loadImageIcon ("images/jumpshot.gif"), JLabel.RIGHT)); --- > pl.add( new JLabel( "Logfile" ) ); 256,257c245,246 < logFileField = new MyTextField (logFileName, 35, false); < pl.add (logFileField); --- > logFileField = new MyTextField( logFileName, 35, false ); > pl.add( logFileField ); 260c249 < getContentPane ().add (pl, con); --- > add( pl, con ); 263,265c252,254 < read_btn = new MyButton ("Read", "Reading the selected logfile", this); < getContentPane ().add (read_btn, con); < } --- > read_btn = new MyButton( "Read", "Reading the selected logfile", this ); > add( read_btn, con ); > } 382c371,372 < private void setupEventHandlers () { --- > private void setupEventHandlers() > { 384,388d373 < < // Define, instantiate and register a WindowListener object. < addWindowListener (new WindowAdapter () { < public void windowClosing (WindowEvent e) {close ();} < }); 403c388 < new Mainwin( parent, aplt, true, null, 0 ); --- > new MainFrame( true, null, 0 ); 405c390 < selectFile (); --- > selectFile(); 408,411c393,410 < else if ( command.equals( "Manual" ) ) < btns_viewer.setVisible( true ); < else if ( command.equals( "Tour" ) ) < tour_viewer.setVisible( true ); --- > else if ( command.equals( "Manual" ) ) { > URL btns_URL = getURL( btnsDefnFile ); > if ( btns_URL != null ) { > btns_viewer = new HTMLviewer( btns_URL ); > btns_viewer.setVisible( true ); > } > else > new WarnDialog( this, "Cannot locate " + btnsDefnFile + "." ); > } > else if ( command.equals( "Tour" ) ) { > URL init_URL = getURL( tourHTMLFile ); > if ( init_URL != null ) { > tour_viewer = new HTMLviewer( init_URL ); > tour_viewer.setVisible( true ); > } > else > new WarnDialog( this, "Cannot locate " + tourHTMLFile + "." ); > } 413c412 < URL icon_URL = ClassLoader.getSystemResource( "images/jumpshot.gif" ); --- > URL icon_URL = getURL( "images/jumpshot.gif" ); 426,431d424 < /* < try { readLogFile(); } < catch ( IOException ioerr ) { < System.err.println( "Read Button's readLogFile() has IO error" ); < } < */ 437c430,433 < private void disableRead () {read_btn.setEnabled (false);} --- > private void disableRead() > { > read_btn.setEnabled(false); > } 440c436,439 < public void enableRead() { read_btn.setEnabled (true); } --- > public void enableRead() > { > read_btn.setEnabled(true); > } 444a444,447 > //Bug: Method setCurrentDirectory of JFileChooser does not work completely. > // So, method rescanCurrentDirectory has to be called also to get the > // desired effect. We want the JFileChooser dialog to open up with a > // listing of files of the directory from which Jumpshot was executed 447,461c450,451 < if (!aplt) { //Application - Read file from machine's memory < Component comp; Class c = this.getClass (); < < while (!(c.getName ().equals ("java.awt.Component"))) { < c = c.getSuperclass(); < } < < int r = ( (Integer)ROUTINES.invokeMethod( openAppFileDlg, < "showOpenDialog", < (Component)this, c ) < ).intValue (); < if (r == 0) { < String file; < File f = (File)ROUTINES.invokeMethod(openAppFileDlg, < "getSelectedFile", null); --- > if ( !isApplet ) { //Application - Read file from machine's memory > openAppFileDlg = new JFileChooser(); 463c453,471 < if (f != null) file = f.toString (); else file = null; --- > if ( openAppFileDlg != null ) { > openAppFileDlg.setDialogTitle( "Select Logfile" ); > File f = new File( (System.getProperties()) > .getProperty( "user.dir" ) ); > openAppFileDlg.setCurrentDirectory( f ); > openAppFileDlg.rescanCurrentDirectory(); > } > else > selectFileMenuItem.setEnabled( false ); > > int r = openAppFileDlg.showOpenDialog( this ); > if ( r == 0 ) { > String file; > File f = openAppFileDlg.getSelectedFile(); > > if ( f != null ) > file = f.toString (); > else > file = null; 465,494c473,480 < if (file != null) { < logFileName = file; < logFileField.setText (logFileName); < readLogFile(); < /* < try { readLogFile (); } < catch ( IOException ioerr ) { < System.err.println( "selectFIle()'s readLogFile() has IO error" ); < } < */ < } < } < else JOptionPane.showMessageDialog (this, "No file chosen"); < } else { //Applet - Read file from host machine's memory < openApltFileDlg.show (); < if (openApltFileDlg.select) { < String file = openApltFileDlg.getFile (); < if (file != null) { < logFileName = file; < logFileField.setText (logFileName); < readLogFile(); < /* < try { readLogFile (); } < catch ( IOException ioerr ) { < System.err.println( "selectFIle()'s readLogFile() has IO error" ); < } < */ < } < } < else JOptionPane.showMessageDialog (this, "No file chosen"); --- > if ( file != null ) { > logFileName = file; > logFileField.setText( logFileName ); > readLogFile(); > } > } > else > JOptionPane.showMessageDialog( this, "No file chosen" ); 496,521c482,498 < } < < /** < * reads a log file by creating a FrameReader instance < */ < /* < private void readLogFile() < throws IOException < { < if ( ChkFileExist( logFileName ) ) { < freeMem(); < waitCursor(); < disableRead(); < < if ( slog == null ) < slog = new SLOG_InputStream( logFileName ); < < // The btn_names[] needs to be synchronized with SetIndexes() < // of StateGroupLabel class < String[] btn_names = { "Application", "Thread", "Processor" }; < frame_chooser = new ViewFrameChooser( slog, btn_names ); < frame_chooser.SetInitWindow( this ); < frame_chooser.pack(); < frame_chooser.setVisible( true ); < < normalCursor(); --- > else { //Applet - Read file from host machine's memory > MainApplet top_applet = (MainApplet) parent; > openApltFileDlg = new ApltFileDlg( top_applet, "Select Logfile" ); > openApltFileDlg.show(); > if ( openApltFileDlg.getSelected() ) { > String file = openApltFileDlg.getFile(); > if ( file != null ) { > logFileField.setText( file ); > logFileName = top_applet.GetLogFileDirName() + "/" + file; > String prefix = top_applet.GetLogFilePathPrefix(); > if ( prefix != null && prefix.length() > 0 ) > logFileName = prefix + "/" + logFileName ; > top_applet.showStatus( "Mainwin: After openApltFileDlg.show(), " > + "logFileName = " + logFileName + ", " > + "file = " + file ); > readLogFile(); > } 522a500,501 > else > JOptionPane.showMessageDialog( this, "No file chosen" ); 524,525c503,504 < */ < --- > } > 531c510,511 < if ( ChkFileExist( logFileName ) ) { --- > // if ( ChkFileExist( logFileName ) ) { > if ( true ) { 539a520,523 > MainApplet top_applet; > String serviceURLname; > String locationURL; > 542a527,539 > if ( isApplet ) { > top_applet = (MainApplet) parent; > serviceURLname = top_applet.GetServiceURLname(); > locationURL = serviceURLname; > } > else { > serviceURLname = null; > locationURL = "local filesystem"; > } > /* > top_applet.showStatus( "ServiceURLname = " > + top_applet.GetServiceURLname() ); > */ 544,549c541,563 < return ( new SLOG_InputStream( logFileName ) ); < } catch ( IOException err ) { < new ErrorDialog( startwin, < "Reading SLOG header of file " < + logFileName + " fails" ); < return null; --- > return ( new SLOG_ProxyInputStream( serviceURLname, > logFileName ) > ); > } > catch ( NotBoundException err ) { > new ErrorDialog( startwin, > "NotBoundException: ServiceURL = " > + serviceURLname ); > return null; > } > catch ( FileNotFoundException err ) { > new ErrorDialog( startwin, > "FileNotFoundException: File = " > + logFileName + " at " > + locationURL ); > return null; > } > catch ( IOException err ) { > new ErrorDialog( startwin, > "IOException: Reading file = " > + logFileName + " fails at " > + locationURL ); > return null; 555c569 < slog = ( SLOG_InputStream ) get(); --- > slog = ( SLOG_ProxyInputStream ) get(); 557,564c571,580 < // The btn_names[] needs to be synchronized with < // SetIndexes() of StateGroupLabel class < String[] btn_names = { "MPI-Process", "Thread", < "Processor" }; < frame_chooser = new ViewFrameChooser( slog, btn_names ); < frame_chooser.SetInitWindow( startwin ); < frame_chooser.pack(); < frame_chooser.setVisible( true ); --- > if ( slog != null ) { > // The btn_names[] needs to be synchronized with > // SetIndexes() of StateGroupLabel class > String[] btn_names = { "MPI-Process", "Thread", > "Processor" }; > frame_chooser = new ViewFrameChooser( slog, btn_names ); > frame_chooser.SetInitWindow( startwin ); > frame_chooser.pack(); > frame_chooser.setVisible( true ); > } 569a586,589 > // Start the readWorker thread after the thread has been created. > // It is done to avoid race condition in SwingWorker2. > readWorker.start(); > 577c597 < if ( aplt ) { --- > if ( isApplet ) { 581c601,602 < new ErrorDialog(this, "Bad URL:" + url); --- > new ErrorDialog(this, "Mainwin: ChkFileExist(): Bad URL: " > + url + ", filename = " + filename ); 605,607c626,630 < private void close () { < freeMem (); < this.setVisible (false); this.dispose (); --- > private void close () > { > freeMem(); > this.setVisible( false ); > parent.setVisible( false ); 609c632 < if (!child && !aplt) System.exit (0); --- > if (!isChild && !isApplet) System.exit (0); 616c639 < if ( reader_alive ) { --- > if ( readWorker != null && reader_alive ) { 676c699 < new ErrorDialog (this, "Bad URL:" + url); --- > new ErrorDialog (this, "Mainwin: getUrlIn: Bad URL:" + url); 689,752c712,714 < /** < * This method returns the path to data directory (..../jumpshot.../data/) < * in which data files including jumpshot.setup reside. This path is < * extracted from Java class path present in the set of system properties. < * Java class path contains a pointer to the classes directory having < * all the bytecode. From this classes path, distribution path < * (...jumpshot-1.0) is got to which data is added to obtain data < * directory path < */ < private String getDataPath () { < Properties s = System.getProperties (); < < String classpath = s.getProperty ("java.class.path"); < < StringTokenizer tokens = new StringTokenizer( classpath, < File.pathSeparator ); < < int ct = tokens.countTokens (); < < for (int i = 0; i < ct; i++) { < String dir; < File f = new File (tokens.nextToken ()); < try {dir = f.getCanonicalPath ();} < catch (IOException x) { < new ErrorDialog (this, "IO Exception:" + x.getMessage()); < continue; < } < if (dir.endsWith (classDir1)) { < distributionDir = dir.substring (0, dir.lastIndexOf (classDir1)); < return (distributionDir + dataDir + File.separator); < } < else if (dir.endsWith (classDir2)) { < distributionDir = dir.substring (0, dir.lastIndexOf (classDir2)); < return (distributionDir + dataDir + File.separator); < } < } < new ErrorDialog (null, "Neither of " + classDir1 + " nor " < + classDir2 + " could be found in " < + "java.class.classpath"); < return null; < } < < /** < * Similar explanation as above method < */ < private String getDataUrl () { < String url = (parent.getCodeBase ()).toString (); < < int i = url.lastIndexOf (classDir1); < if (i == -1) distributionUrl = url; < else < distributionUrl = url.substring (0, i); < < return (distributionUrl + dataDir + "/"); < //Here front slash "/" is used because this is the specified character < //that is a file separator in url conventions < } < < private ImageIcon loadImageIcon(String filename) { < if(!aplt) { < return new ImageIcon (distributionDir + filename); < } < else { < URL url = null; --- > private URL getURL(String filename) > { > URL url = null; 754,759c716,732 < try {url = new URL (distributionUrl + filename);} < catch (MalformedURLException e) { < new ErrorDialog (this, "Bad URL:" + url); < return null; < } < return new ImageIcon(url); --- > /* > if ( isApplet ) { > URL codeBase = ( (JApplet) parent ).getCodeBase(); > try { > url = new URL( codeBase, filename ); > } catch ( java.net.MalformedURLException e ) { > System.out.println("badly specified URL"); > return null; > } > } > else > url = ClassLoader.getSystemResource( filename ); > */ > > url = getClass().getResource( filename ); > > return url; 761c734 < } --- > 835,836c808,810 < private void makeUIChanges () { < SwingUtilities.updateComponentTreeUI(this); --- > private void makeUIChanges() > { > SwingUtilities.updateComponentTreeUI( this ); 838,840c812,814 < setResizable (true); setSize (getPreferredSize ()); setResizable (false); < if (!aplt) < SwingUtilities.updateComponentTreeUI ((Component)openAppFileDlg); --- > setSize( getPreferredSize() ); > if ( !isApplet ) > SwingUtilities.updateComponentTreeUI( (Component)openAppFileDlg ); 842c816 < SwingUtilities.updateComponentTreeUI (openApltFileDlg); --- > SwingUtilities.updateComponentTreeUI( openApltFileDlg ); 844,845c818,821 < SwingUtilities.updateComponentTreeUI (btns_viewer); < SwingUtilities.updateComponentTreeUI (tour_viewer); --- > if ( btns_viewer != null ) > SwingUtilities.updateComponentTreeUI( btns_viewer ); > if ( tour_viewer != null ) > SwingUtilities.updateComponentTreeUI( tour_viewer ); 847c823 < } --- > } Index: mpe/viewers/jumpshot-3/src/main/SwingWorker.java =================================================================== RCS file: /MPIhome/jumpshot-3/src/main/SwingWorker.java,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -r1.1.1.1 -r1.2 1,2c1 < //import com.sun.java.swing.SwingUtilities; //old package name < import javax.swing.SwingUtilities; //new package name --- > import javax.swing.SwingUtilities; 5,8c4,13 < * An abstract class that you subclass to perform < * GUI-related work in a dedicated thread. < * For instructions on using this class, see < * http://java.sun.com/products/jfc/swingdoc-current/threads2.html --- > * This is the 3rd version of SwingWorker (also known as > * SwingWorker 3), an abstract class that you subclass to > * perform GUI-related work in a dedicated thread. For > * instructions on using this class, see: > * > * http://java.sun.com/docs/books/tutorial/uiswing/misc/threads.html > * > * Note that the API changed slightly in the 3rd version: > * You must now invoke start() on the SwingWorker after > * creating it. 56c61 < * to force the worker to abort what it's doing. --- > * to force the worker to stop what it's doing. 68,69c73,74 < * Returns null if either the constructing thread or < * the current thread was interrupted before a value was produced. --- > * Returns null if either the constructing thread or the current > * thread was interrupted before a value was produced. 114c119,128 < t.start(); --- > } > > /** > * Start the worker thread. > */ > public void start() { > Thread t = threadVar.get(); > if (t != null) { > t.start(); > } Index: mpid/ch2/chnodename.c =================================================================== RCS file: /MPIhome/mpich/mpid/ch2/chnodename.c,v retrieving revision 1.3 retrieving revision 1.4 diff -r1.3 -r1.4 44c44 < char *p_in = he->h_name; --- > char *p_in; 45a46,47 > > p_in = (he != NULL) ? he->h_name : utname.nodename; Index: mpid/ch_p4/configure =================================================================== RCS file: /MPIhome/mpich/mpid/ch_p4/configure,v retrieving revision 1.15 retrieving revision 1.17 diff -r1.15 -r1.17 1050c1050 < for program in remsh rsh ssh ; do --- > for program in remsh rsh ; do 1061c1061 < if test "$cross_compiling" = yes; then --- > if test "$cross_compiling" = yes; then 1082c1082 < if test "$cross_compiling" = yes; then --- > if test "$cross_compiling" = yes; then 1153c1153 < output=`$RSHCOMMAND $machine -n true 2>&1` --- > output=`$RSHCOMMAND $machine -n true 2>&1 # Check ssh with special options to avoid user prompting which causes the > # configure script to "hang" > if test -z "$RSHCOMMAND" ; then > # Extract the first word of "ssh", so it can be a program name with args. > set dummy ssh; ac_word=$2 > echo $ac_n "checking for $ac_word""... $ac_c" 1>&1 > echo "configure:1176: checking for $ac_word" >&2 > if eval "test \"`echo '$''{'ac_cv_path_RSHCOMMAND'+set}'`\" = set"; then > echo $ac_n "(cached) $ac_c" 1>&1 > else > case "$RSHCOMMAND" in > /*) > ac_cv_path_RSHCOMMAND="$RSHCOMMAND" # Let the user override the test with a path. > ;; > ?:/*) > ac_cv_path_RSHCOMMAND="$RSHCOMMAND" # Let the user override the test with a dos path. > ;; > *) > IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" > ac_dummy="$PATH" > for ac_dir in $ac_dummy; do > test -z "$ac_dir" && ac_dir=. > if test -f $ac_dir/$ac_word; then > ac_cv_path_RSHCOMMAND="$ac_dir/$ac_word" > break > fi > done > IFS="$ac_save_ifs" > ;; > esac > fi > RSHCOMMAND="$ac_cv_path_RSHCOMMAND" > if test -n "$RSHCOMMAND"; then > echo "$ac_t""$RSHCOMMAND" 1>&1 > else > echo "$ac_t""no" 1>&1 > fi > > if test -n "$RSHCOMMAND" ; then > echo $ac_n "checking whether $RSHCOMMAND works""... $ac_c" 1>&1 > echo "configure:1210: checking whether $RSHCOMMAND works" >&2 > output=`$RSHCOMMAND -o "StrictHostKeyChecking no" \ > -o "BatchMode yes" $machine -n true 2>&1 if test $? -ne 0 ; then > echo "$ac_t""no" 1>&1 > echo "Errors while trying to run true on $machine with ssh" > echo "$output" > RSHCOMMAND="" > # HORRIBLE, TERRIBLE BUG in AUTOCONF!!! > # It is determined to INCORRECTLY remember some results, > # while forgetting others (like "cross-compiling") > unset ac_cv_path_RSHCOMMAND > else > echo "$ac_t""yes" 1>&1 > fi > fi > fi 1175c1232 < echo "configure:1176: checking size of int" >&2 --- > echo "configure:1233: checking size of int" >&2 1183c1240 < #line 1184 "configure" --- > #line 1241 "configure" 1194c1251 < if { (eval echo configure:1195: \"$ac_link\") 1>&2; (eval $ac_link) 2>&2; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null --- > if { (eval echo configure:1252: \"$ac_link\") 1>&2; (eval $ac_link) 2>&2; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null 1214c1271 < echo "configure:1215: checking size of long" >&2 --- > echo "configure:1272: checking size of long" >&2 1222c1279 < #line 1223 "configure" --- > #line 1280 "configure" 1233c1290 < if { (eval echo configure:1234: \"$ac_link\") 1>&2; (eval $ac_link) 2>&2; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null --- > if { (eval echo configure:1291: \"$ac_link\") 1>&2; (eval $ac_link) 2>&2; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null 1256c1313 < echo "configure:1257: checking for $ac_func" >&2 --- > echo "configure:1314: checking for $ac_func" >&2 1258c1315 < #line 1259 "configure" --- > #line 1316 "configure" 1279c1336 < if { (eval echo configure:1280: \"$ac_link\") 1>&2; (eval $ac_link) 2>&2; } && test -s conftest${ac_exeext}; then --- > if { (eval echo configure:1337: \"$ac_link\") 1>&2; (eval $ac_link) 2>&2; } && test -s conftest${ac_exeext}; then Index: mpid/ch_p4/configure.in =================================================================== RCS file: /MPIhome/mpich/mpid/ch_p4/configure.in,v retrieving revision 1.7 retrieving revision 1.9 diff -r1.7 -r1.9 35c35 < for program in remsh rsh ssh ; do --- > for program in remsh rsh ; do 40c40 < output=`$RSHCOMMAND $machine -n true 2>&1` --- > output=`$RSHCOMMAND $machine -n true 2>&1 # Check ssh with special options to avoid user prompting which causes the > # configure script to "hang" > if test -z "$RSHCOMMAND" ; then > AC_PATH_PROG(RSHCOMMAND, ssh) > if test -n "$RSHCOMMAND" ; then > AC_MSG_CHECKING([whether $RSHCOMMAND works]) > output=`$RSHCOMMAND -o "StrictHostKeyChecking no" \ > -o "BatchMode yes" $machine -n true 2>&1 if test $? -ne 0 ; then > AC_MSG_RESULT([no]) > echo "Errors while trying to run true on $machine with ssh" > echo "$output" > RSHCOMMAND="" > # HORRIBLE, TERRIBLE BUG in AUTOCONF!!! > # It is determined to INCORRECTLY remember some results, > # while forgetting others (like "cross-compiling") > unset ac_cv_path_RSHCOMMAND > else > AC_MSG_RESULT([yes]) > fi > fi > fi Index: mpid/ch_p4/p4/alog/alog.h =================================================================== RCS file: /MPIhome/mpich/mpid/ch_p4/p4/alog/alog.h,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -r1.1.1.1 -r1.2 155c155 < #define getwd(X) getcwd(X) --- > #define getwd(X) getcwd(X,sizeof(X)) Index: mpid/ch_p4/p4/lib/p4_MD.c =================================================================== RCS file: /MPIhome/mpich/mpid/ch_p4/p4/lib/p4_MD.c,v retrieving revision 1.6 retrieving revision 1.8 diff -r1.6 -r1.8 96a97,100 > > if (nsegs > P4_MAX_SYSV_SHMIDS) > p4_error( "exceeding max num of P4_MAX_SYSV_SHMIDS\n", P4_MAX_SYSV_SHMIDS ); > 242,243c246 < char *MD_shmalloc(size) < int size; --- > char *MD_shmalloc( int size ) 1604c1607 < printf("%s\n",machine_type); --- > p4_dprintf("invalid machine type=:%s:\n",machine_type); Index: mpid/ch_p4/p4/lib/p4_MD.h =================================================================== RCS file: /MPIhome/mpich/mpid/ch_p4/p4/lib/p4_MD.h,v retrieving revision 1.12 retrieving revision 1.15 diff -r1.12 -r1.15 443,444c443,444 < # define P4_MAX_SYSV_SHMIDS 16 < # define P4_MAX_SYSV_SEMIDS 16 --- > # define P4_MAX_SYSV_SHMIDS 256 > # define P4_MAX_SYSV_SEMIDS 256 765c765 < extern P4VOID exit ANSI_ARGS((int)); --- > extern P4VOID exit (int); 768c768 < #define P4_MAXPROCS 256 --- > #define P4_MAXPROCS 1024 783c783,785 < #include "mpisys.h" --- > /* For this include to work, the include path must include the ch_p4mpd > directory */ > #include "tr2.h" Index: mpid/ch_p4mpd/p4mpd/lib/p4_bm.c =================================================================== RCS file: /MPIhome/mpich/mpid/ch_p4mpd/p4mpd/lib/p4_bm.c,v retrieving revision 1.11 retrieving revision 1.18 diff -r1.11 -r1.18 3d2 < #include "bnr.h" 7c6 < void peer_msg_handler(char *); --- > void p4_peer_msg_handler(char *); 9,11c8 < int bm_start(argc, argv) < int *argc; < char **argv; --- > int bm_start(int *argc, char **argv) 15c12,13 < int rc, mygroupid, myjsize, myrank; --- > int rc, myjsize, myrank; > BNR_Group mygroup; 24d21 < setup_conntab(); 26,29c23,30 < rc = BNR_Pre_init( peer_msg_handler ); /* specific to mpich-1 */ < rc = BNR_Init( &mygroupid ); < rc = BNR_Rank( mygroupid, &myrank ); < rc = BNR_Size( mygroupid, &myjsize ); --- > rc = BNR_Pre_init( p4_peer_msg_handler ); /* specific to mpich-1 */ > rc = BNR_Init( ); > rc = BNR_Get_group( &mygroup ); > rc = BNR_Get_rank( mygroup, &myrank ); > rc = BNR_Get_size( mygroup, &myjsize ); > > p4_dprintfl(10,"IGNORING SIGPIPE\n"); > SIGNAL_P4(SIGPIPE,SIG_IGN); 35c36,38 < p4_local->my_job = mygroupid; /* default jobid for now */ --- > p4_local->my_job = (int) mygroup; /* default jobid for now */ > > setup_conntab(); 78a82 > p4_global->my_host_name, 80a85,86 > BNR_Fence( mygroup ); /* to make sure p4 data structures are set before interrupts > can occur */ 84c90 < void peer_msg_handler( msg ) --- > void p4_peer_msg_handler( msg ) 89c95 < int torank,toport,connection_fd,num_tries,rc,connected,optval; --- > int flags,torank,toport,connection_fd,num_tries,rc,connected,optval; 94c100 < p4_dprintfl(077,"peer_msg_handler entered with msg :%s:\n",msg ); --- > p4_dprintfl(077,"p4_peer_msg_handler entered with msg :%s:\n",msg ); 97c103 < p4_dprintfl(077,"invalid msg in peer_msg_handler :%s:\n",msg); --- > p4_dprintf("invalid msg in p4_peer_msg_handler :%s:\n",msg); 111c117 < p4_dprintfl(077, "peer_msg_handler: already conn'd to %d\n", torank); --- > p4_dprintfl(077, "p4_peer_msg_handler: already conn'd to %d\n", torank); 118c124 < p4_dprintfl(077, "peer_msg_handler: already making conn to %d\n", torank); --- > p4_dprintfl(077, "p4_peer_msg_handler: already making conn to %d\n", torank); 125c131,146 < p4_error("peer_msg_handler socket", connection_fd); --- > p4_error("p4_peer_msg_handler socket", connection_fd); > flags = fcntl(connection_fd, F_GETFL, 0); > if (flags < 0) > p4_error("p4_bm fcntl1", flags); > # if defined(HP) > flags |= O_NONBLOCK; > # else > flags |= O_NDELAY; > p4_dprintfl(90, "p4_bm: setting ndelay for %d\n",connection_fd); > # endif > # if defined(RS6000) > flags |= O_NONBLOCK; > # endif > flags = fcntl(connection_fd, F_SETFL, flags); > if (flags < 0) > p4_error("p4_bm fcntl2", flags); 138c159 < p4_dprintfl(077,"peer_msg_handler: connect to %s failed; will try %d more times \n",c_toipaddr,num_tries); --- > p4_dprintfl(077,"p4_peer_msg_handler: connect to %s failed; will try %d more times \n",c_toipaddr,num_tries); 145c166 < p4_dprintfl(077,"peer_msg_handler: connected to %s\n",c_toipaddr); --- > p4_dprintfl(077,"p4_peer_msg_handler: connected to %s\n",c_toipaddr); 153c174 < /* p4_dprintfl(077, "peer_msg_handler: connected after %d tries, connection_fd=%d host = %s\n", --- > /* p4_dprintfl(077, "p4_peer_msg_handler: connected after %d tries, connection_fd=%d host = %s\n", 155c176 < p4_dprintfl(077, "peer_msg_handler: connected after %d tries, connection_fd=%d\n", --- > p4_dprintfl(077, "p4_peer_msg_handler: connected after %d tries, connection_fd=%d\n", 161c182 < p4_dprintfl(077,"peer_msg_handler done\n" ); --- > p4_dprintfl(077,"p4_peer_msg_handler done\n" ); 405a427 > bm_msg.local_name, 505a528 > p4_global->my_host_name, Index: mpid/globus2/Makefile.in =================================================================== RCS file: /MPIhome/mpich/mpid/globus2/Makefile.in,v retrieving revision 1.11 retrieving revision 1.13 diff -r1.11 -r1.13 2c2 < # $Id: Makefile.in,v 1.11 2000/08/16 18:27:33 toonen Exp $ --- > # $Id: Makefile.in,v 1.13 2001/04/10 17:46:53 gropp Exp $ 74c74 < /bin/rm -f cmnargs.h --- > rm -f cmnargs.h 76c76 < /bin/rm -f cmnargs.c --- > rm -f cmnargs.c 78c78 < /bin/rm -f queue.h --- > rm -f queue.h 80c80 < /bin/rm -f queue.c --- > rm -f queue.c 82c82 < /bin/rm -f sbcnst2.h --- > rm -f sbcnst2.h 84c84 < /bin/rm -f sbcnst2.c --- > rm -f sbcnst2.c 86c86 < /bin/rm -f chdebug.c --- > rm -f chdebug.c 88c88 < /bin/rm -f chnodename.c --- > rm -f chnodename.c 90c90 < /bin/rm -f chtick.c --- > rm -f chtick.c 92c92 < /bin/rm -f dev.h --- > rm -f dev.h 94c94 < /bin/rm -f mpid.h --- > rm -f mpid.h 96c96 < /bin/rm -f attach.h --- > rm -f attach.h 98c98 < /bin/rm -f calltrace.h --- > rm -f calltrace.h 100c100 < /bin/rm -f chhetero.h --- > rm -f chhetero.h 102c102 < /bin/rm -f cookie.h --- > rm -f cookie.h 104c104 < /bin/rm -f mpid_bind.h --- > rm -f mpid_bind.h 106c106 < /bin/rm -f objtrace.h --- > rm -f objtrace.h 108c108 < /bin/rm -f chpackflow.h --- > rm -f chpackflow.h 110c110 < /bin/rm -f packets.h --- > rm -f packets.h 112c112 < /bin/rm -f mpid_debug.h --- > rm -f mpid_debug.h 114c114 < /bin/rm -f mpiddev.h --- > rm -f mpiddev.h 116c116 < /bin/rm -f mpimem.h --- > rm -f mpimem.h 118c118 < /bin/rm -f tr2.h --- > rm -f tr2.h 120c120 < /bin/rm -f channel.h --- > rm -f channel.h 125c125 < . $(builddir)/mpid/$(DEVICE)/mpich-globus2-settings ; \ --- > @. $(builddir)/mpid/$(DEVICE)/mpich-globus2-settings ; \ 141c141 < /bin/rm -f *~ $(MPI_OBJECTS) --- > rm -f *~ $(MPI_OBJECTS) 145c145 < . $(builddir)/mpid/$(DEVICE)/mpich-globus2-settings ; \ --- > @. $(builddir)/mpid/$(DEVICE)/mpich-globus2-settings ; \ 147c147 < /bin/rm -f $(includebuild_dir)/mpid_defs.h ; \ --- > rm -f $(includebuild_dir)/mpid_defs.h ; \ 150c150 < /bin/rm -f $(builddir)/src/fortran/include/mpif.h.orig \ --- > rm -f $(builddir)/src/fortran/include/mpif.h.orig \ 154c154 < /bin/rm -f $(builddir)/mpid/$(DEVICE)/chconfig.h \ --- > rm -f $(builddir)/mpid/$(DEVICE)/chconfig.h \ 169c169 < pr_mpi_g.o: pr_mpi_g.c --- > pr_mpi_g.o: $(srcdir)/pr_mpi_g.c 171c171 < -DMPICH_ARCH_$(ARCH) -c pr_mpi_g.c --- > -DMPICH_ARCH_$(ARCH) -c $(srcdir)/pr_mpi_g.c Index: mpid/globus2/install_globus2 =================================================================== RCS file: /MPIhome/mpich/mpid/globus2/install_globus2,v retrieving revision 1.3 retrieving revision 1.5 diff -r1.3 -r1.5 9c9 < . ${top_srcdir}/mpid/$DEVICE/mpich-globus2-settings --- > . mpid/$DEVICE/mpich-globus2-settings 35a36 > echo "rm ${bindir}/mpi${compiler}.orig" >> $UNINSTALLFILE Index: mpid/globus2/mpich-globus2-cc.in =================================================================== RCS file: /MPIhome/mpich/mpid/globus2/mpich-globus2-cc.in,v retrieving revision 1.4 retrieving revision 1.5 diff -r1.4 -r1.5 27a28,29 > RemoveDefaultOpt=0 > opt_args= 69a72,75 > -O* | -g) > RemoveDefaultOpt=1 > opt_args="$opt_args $1" > ;; 139a146,160 > fi > > # > # Remove -O and -g from the default options if the user has supplied his/her > # own set of optimization options. > # > if test $RemoveDefaultOpt -ne 0 ; then > gc_flags=`echo "$gc_flags" | \ > sed -e 's/[ ][ ]*-g[ ][ ]*/ /g' \ > -e 's/^-g[ ][ ]*//' \ > -e 's/[ ][ ]*-g$//' \ > -e 's/[ ][ ]*-O[^ ]*[ ]*/ /g' \ > -e 's/^-O[^ ]*[ ][ ]*//' \ > -e 's/[ ][ ]*-O[^ ]*$//'` > compile_args="$opt_args $compile_args" Index: mpid/globus2/mpich-globus2-fc.in =================================================================== RCS file: /MPIhome/mpich/mpid/globus2/mpich-globus2-fc.in,v retrieving revision 1.5 retrieving revision 1.6 diff -r1.5 -r1.6 29a30,31 > RemoveDefaultOpt=0 > opt_args= 74a77,80 > -O* | -g) > RemoveDefaultOpt=1 > opt_args="$opt_args $1" > ;; 158a165,179 > fi > > # > # Remove -O and -g from the default options if the user has supplied his/her > # own set of optimization options. > # > if test $RemoveDefaultOpt -ne 0 ; then > gc_flags=`echo "$gc_flags" | \ > sed -e 's/[ ][ ]*-g[ ][ ]*/ /g' \ > -e 's/^-g[ ][ ]*//' \ > -e 's/[ ][ ]*-g$//' \ > -e 's/[ ][ ]*-O[^ ]*[ ]*/ /g' \ > -e 's/^-O[^ ]*[ ][ ]*//' \ > -e 's/[ ][ ]*-O[^ ]*$//'` > compile_args="$opt_args $compile_args" Index: mpid/globus2/mpirun.globus2.in =================================================================== RCS file: /MPIhome/mpich/mpid/globus2/mpirun.globus2.in,v retrieving revision 1.6 retrieving revision 1.7 diff -r1.6 -r1.7 24c24,26 < if [ "$count" -eq 0 ]; then --- > if [ "$count" = "" ]; then > count=1 > elif [ "$count" -eq 0 ]; then 49,50c51,52 < echo " (directory=$my_dirname)" < echo " (executable=$my_progname)" --- > echo " (directory=\"$my_dirname\")" > echo " (executable=\"$my_progname\")" 52c54 < echo " (executable=\$(GLOBUSRUN_GASS_URL)$my_progname)" --- > echo " (executable=\"\$(GLOBUSRUN_GASS_URL)$my_progname\")" Index: romio/adio/ad_pvfs/ad_pvfs_flush.c =================================================================== RCS file: /MPIhome/romio/adio/ad_pvfs/ad_pvfs_flush.c,v retrieving revision 1.3 retrieving revision 1.4 diff -r1.3 -r1.4 2c2 < * $Id: ad_pvfs_flush.c,v 1.3 2000/02/09 21:29:56 thakur Exp $ --- > * $Id: ad_pvfs_flush.c,v 1.4 2000/11/03 20:17:43 thakur Exp $ 12a13,15 > #ifndef PRINT_ERR_MSG > static char myname[] = "ADIOI_PVFS_FLUSH"; > #endif Index: romio/adio/ad_pvfs/ad_pvfs_open.c =================================================================== RCS file: /MPIhome/romio/adio/ad_pvfs/ad_pvfs_open.c,v retrieving revision 1.8 retrieving revision 1.9 diff -r1.8 -r1.9 2c2 < * $Id: ad_pvfs_open.c,v 1.8 2000/03/27 23:02:21 thakur Exp $ --- > * $Id: ad_pvfs_open.c,v 1.9 2001/02/22 17:14:01 rross Exp $ 15c15 < struct pvfs_stat pstat = {-1,-1,-1,0,0}; --- > struct pvfs_filestat pstat = {-1,-1,-1,0,0}; Index: src/env/Makefile.in =================================================================== RCS file: /MPIhome/mpich/src/env/Makefile.in,v retrieving revision 1.34 retrieving revision 1.39 diff -r1.34 -r1.39 118c118 < if test -n "@SHAREDKIND_FOR_TV@" -a "@SHAREDKIND_FOR_TV@" != "ignore" ; then \ --- > @if test -n "@SHAREDKIND_FOR_TV@" -a "@SHAREDKIND_FOR_TV@" != "ignore" ; then \ 136,138c136,138 < mpehname.o: ${top_srcdir}/mpe/mpehname.c < ${CC} ${DEFS} ${CFLAGS} @GETNAME_DEFS@ -c -I${top_srcdir}/mpe \ < ${top_srcdir}/mpe/mpehname.c --- > mpehname.o: ${top_srcdir}/mpe/src/mpehname.c > ${CC} ${DEFS} ${CFLAGS} @GETNAME_DEFS@ -c -I${top_srcdir}/mpe/include \ > ${top_srcdir}/mpe/src/mpehname.c 140,143c140,145 < dbxerr.o: ${top_srcdir}/mpe/dbxerr.c < ${CC} ${DEFS} ${CFLAGS} @GETNAME_DEFS@ -c -I${top_srcdir}/mpe \ < ${top_srcdir}/mpe/dbxerr.c < rm -f dbxerr.c --- > # It is tempting to put ${top_srcdir}/mpe/src/dbxerr.c as prerequisite here. > # But there is only dbxerr.c.in in ${top_srcdir}/mpe/src, dbxerr.c is created > # in ${mpich_build_dir}/mpe/src by configure. > dbxerr.o: ../../mpe/src/dbxerr.c > ${CC} ${DEFS} ${CFLAGS} @GETNAME_DEFS@ -c -I${top_srcdir}/mpe/include \ > ../../mpe/src/dbxerr.c 163c165 < /bin/rm -f *.o *~ ${srcdir}/*.o --- > rm -f *.o *~ ${srcdir}/*.o Index: src/fortran/src/Makefile.in =================================================================== RCS file: /MPIhome/mpich/src/fortran/src/Makefile.in,v retrieving revision 1.7 retrieving revision 1.9 diff -r1.7 -r1.9 19a20,21 > CFLAGS = @CFLAGS@ > FFLAGS = @FFLAGS@ 155,156c157,159 < if [ ! -d .tmp ] ; then mkdir .tmp ; else rm -f .tmp/*.o ; fi < for file in $? ; do \ --- > @echo "Rename xxx.po to _xxx.o for profiling interface." > @if [ ! -d .tmp ] ; then mkdir .tmp ; else rm -f .tmp/*.o ; fi > @for file in $? ; do \ 160,161c163,164 < cd .tmp && ${AR} cr $@ *.o && rm -f *.o < -rmdir .tmp --- > @cd .tmp && ${AR} cr $@ *.o && rm -f *.o > -@rmdir .tmp Index: src/fortran/src/mpif77.in =================================================================== RCS file: /MPIhome/mpich/src/fortran/src/mpif77.in,v retrieving revision 1.10 retrieving revision 1.13 diff -r1.10 -r1.13 57c57 < sharedlibdir=@sharedlibbuild_dir@ --- > sharedlibdir=@sharedlib_dir@ 183a184 > echo "mpif77 for $MPIVERSION" 193,219c194,221 < echo "This is a program to compile or link MPI programs" < echo "In addition, the following special options are supported" < echo " -mpilog - Build version that generate MPE log files" < echo " -mpitrace - Build version that generates traces" < echo " -mpianim - Build version that generates real-time" < echo " animation" < echo " -fc=pgm - Change the program to use to compile and link" < echo " MPI programs. WARNING! The program that you" < echo " choose MUST be compatible with the MPICH " < echo " libraries. If you have trouble, you should" < echo " reconfigure and rebuild MPICH, selecting" < echo " this compiler." < echo " -show - Show the commands that would be used without" < echo " runnning them" < echo " -compile_info - Show how to compile a program" < echo " -link_info - Show how to link a program" < echo " -help - Give this help" < echo " -echo - Show exactly what this program is doing." < echo " This option should normally not be used." < echo "This should be used just like the usual Fortran compiler" < echo "For example," < echo " $0 -c foo.f " < echo "and" < echo " $0 -o foo foo.o" < echo "Combining compilation and linking in a single command" < echo " $0 -o foo foo.f" < echo "may not work on some systems, and is not recommended." --- > cat < This is a program to compile or link MPI programs > In addition, the following special options are supported > -mpilog - Build version that generate MPE log files > -mpitrace - Build version that generates traces > -mpianim - Build version that generates real-time animation > -fc=pgm - Change the program to use to compile and link > MPI programs. WARNING! The program that you > choose MUST be compatible with the MPICH > libraries. If you have trouble, you should > reconfigure and rebuild MPICH, selecting > this compiler. > -show - Show the commands that would be used without > runnning them > -compile_info - Show how to compile a program > -link_info - Show how to link a program > -help - Give this help > -echo - Show exactly what this program is doing. > This option should normally not be used. > This should be used just like the usual Fortran compiler > For example, > $0 -c foo.f > and > $0 -o foo foo.o > Combining compilation and linking in a single command > $0 -o foo foo.f > may not work on some systems, and is not recommended. > EOF Index: src/fortran/src/mpif90.in =================================================================== RCS file: /MPIhome/mpich/src/fortran/src/mpif90.in,v retrieving revision 1.1 retrieving revision 1.5 diff -r1.1 -r1.5 23,24c23,24 < includedir=@includebuild_dir@ < libdir=@libbuild_dir@ --- > includedir=@includedir@ > libdir=@libdir@ 44a45 > FWRAPNAME="@FWRAPNAME@" 57c58 < sharedlibdir=@sharedlibbuild_dir@ --- > sharedlibdir=@sharedlib_dir@ 72,74d72 < proflib=-lp${MPILIBNAME} < proflibfullname=${libdir}/libp${MPILIBNAME}.a < 130c128 < MPILOG="-lf${MPILIBNAME} -llmpe -lmpe" --- > MPILOG="-l${FWRAPNAME} -llmpe -lmpe" 143c141 < MPILOG="-lf${MPILIBNAME} -ltmpe" --- > MPILOG="-l${FWRAPNAME} -ltmpe" 156c154 < MPILOG="-lf${MPILIBNAME} -lampe -lmpe" --- > MPILOG="-l${FWRAPNAME} -lampe -lmpe" 166a165,172 > -config=*) > FCname=`echo A$arg | sed -e 's/A-config=//g'` > if [ -s $sysconfdir/mpif90-$FCname.conf ] ; then > . $sysconfdir/mpif90-$FCname.conf > else > echo "Configuration file mpif90-$FCname.conf not found" > fi > ;; 187a194 > echo "mpif90 for $MPIVERSION" 248c255 < "$ext" = ".for" -o "$ext" = ".FOR" ] ; then --- > "$ext" = ".for" -o "$ext" = ".FOR" -o "$ext" = ".F90" ] ; then 275c282 < moduledir="${F90MODINC}${includedir}/f90choice" --- > moduledir="${F90MODINC}${f90includedir}/f90choice" 278c285 < moduledir="${F90MODINC}${includedir}/f90base" --- > moduledir="${F90MODINC}${f90includedir}/f90base" 294a302 > # This should really be the (related) f77includedir (see mpif77). Index: src/pt2pt/bsend_init.c =================================================================== RCS file: /MPIhome/mpich/src/pt2pt/bsend_init.c,v retrieving revision 1.8 retrieving revision 1.9 diff -r1.8 -r1.9 2c2 < * $Id: bsend_init.c,v 1.8 1999/08/30 15:48:37 swider Exp $ --- > * $Id: bsend_init.c,v 1.9 2001/03/06 20:50:58 toonen Exp $ 59,60d58 < int psize; < void *bufp; 100,111c98,101 < if (dest != MPI_PROC_NULL) { < MPIR_ERROR_PUSH(comm_ptr); < /* Allocate space if needed */ < MPIR_CALL_POP(MPI_Pack_size( count, datatype, comm, &psize ), < comm_ptr,myname); < MPIR_CALL_POP(MPIR_BsendAlloc( psize, *request, &bufp ),comm_ptr,myname); < /* Information stored in the bsend part by BsendAlloc */ < /* shandle->shandle.start = bufp; < shandle->shandle.bytes_as_contig = psize; */ < MPIR_ERROR_POP(comm_ptr); < } < else --- > if (dest == MPI_PROC_NULL) > { > /* [BRT] Q: is this really needed??? */ > 113a104 > } Index: src/pt2pt/ibsend.c =================================================================== RCS file: /MPIhome/mpich/src/pt2pt/ibsend.c,v retrieving revision 1.9 retrieving revision 1.10 diff -r1.9 -r1.10 2c2 < * $Id: ibsend.c,v 1.9 1999/08/30 15:48:56 swider Exp $ --- > * $Id: ibsend.c,v 1.10 2001/03/06 20:50:58 toonen Exp $ 62,63d61 < int psize; < void *bufp; 95,99d92 < < /* Allocate space if needed */ < MPI_Pack_size( count, datatype, comm, &psize ); < MPIR_CALL(MPIR_BsendAlloc( psize, *request, &bufp ),comm_ptr, myname ); < /* Information stored in the bsend part by BsendAlloc */ Index: src/util/bsendutil2.c =================================================================== RCS file: /MPIhome/mpich/src/util/bsendutil2.c,v retrieving revision 1.10 retrieving revision 1.12 diff -r1.10 -r1.12 2c2 < * $Id: bsendutil2.c,v 1.10 1999/08/20 02:28:06 ashton Exp $ --- > * $Id: bsendutil2.c,v 1.12 2001/03/21 22:18:06 gropp Exp $ 103c103,115 < BSendData *MPIR_MergeBlock ANSI_ARGS(( BSendData *)); --- > static BSendData *MPIR_MergeBlock ANSI_ARGS(( BSendData *)); > static int MPIR_BsendAlloc ANSI_ARGS((int, BSendData **)); > static void MPIR_BsendCopyData ANSI_ARGS((BSendData *, > struct MPIR_COMMUNICATOR *, > void *, > int, > struct MPIR_DATATYPE *, > void **, > int *)); > #ifdef DEBUG_BSEND /* #DEBUG_BSEND_START# */ > static int MPIR_BsendBufferPrint( ); > #endif /* #DEBUG_BSEND_END# */ > 113,117c125 < * MPIR_BsendAlloc( ) - to allocate space for the bsend buffer for a < * Ibsend/Bsend_init, as well as the request that will < * be used internally. < * MPIR_BsendFree( ) - to release space < * MPIR_BsendStart( ) - to begin a send (copy data and start send) --- > * MPIR_IbsendDatatype( ) - to buffer a message and begin sending it 122c130,134 < * MPIR_BsendCopyData - Copies data from user area into previously --- > * MPIR_BsendAlloc( ) - to allocate space for the bsend buffer for a > * Ibsend/Bsend_init, as well as the request that will > * be used internally. this routine also frees up buffers > * once the send has completed. > * MPIR_BsendCopyData( ) - Copies data from user area into previously 221c233 < BSendData *MPIR_MergeBlock( BSendData *b ) --- > static BSendData *MPIR_MergeBlock( BSendData *b ) 286c298 < int MPIR_BsendAlloc( --- > static int MPIR_BsendAlloc( 288,289c300 < MPI_Request rq, < void **bufp ) --- > BSendData ** bp ) 312c323,324 < if (b->req != MPI_REQUEST_NULL/* && !b->req->shandle.is_complete*/) { --- > if (b->req != MPI_REQUEST_NULL) > { 317,318c329,330 < FPRINTF( stderr, "Testing for completion of block at %lx\n", < (long)b ); --- > FPRINTF(stderr, "Testing for completion of block at %lx\n", > (long)b ); 343c355,356 < "Found large block of size %d (need %d) at %lx\n", --- > "Found large block of size %d " > "(need %d) at %lx\n", 350c363 < new->prev = b; --- > new->prev = b; 352,353c365,366 < new->len = b->len - size - sizeof(BSendData); < new->req = MPI_REQUEST_NULL; --- > new->len = b->len - size - sizeof(BSendData); > new->req = MPI_REQUEST_NULL; 364d376 < *bufp = (void *)(b+1); 371,373c383 < /* < MEMCPY( b->req, rq, sizeof(MPIR_SHANDLE) ); < */ --- > 375c385 < b->buf = *bufp; --- > b->buf = (void *)(b+1); 377,381c387,388 < /* Mark in the request (user's) where the corresponding bsend < area is */ < rq->shandle.bsend = (void *)b; < /* Also remember in the bsend request */ < b->req->shandle.bsend = (void *)b; --- > /* return the location of the new buffer */ > *bp = b; 407,408c414,415 < void MPIR_BsendCopyData( < MPIR_SHANDLE *shandle, --- > static void MPIR_BsendCopyData( > BSendData * b, 416d422 < BSendData *b; 419d424 < /* MPIR_SHANDLE *brq; */ 422d426 < b = (BSendData *)(shandle->bsend); 438,445d441 < #ifdef FOO < /* This really should be the same as rq now... */ < brq = (MPIR_SHANDLE *)b->req; < if (shandle != brq) { < MPIR _ ERROR( MPIR_COMM_WORLD, MPI_ERR_INTERN, < "Error in BSEND data; requests do not match" ); < } < #endif 474,526d469 < /* < Set the persistant flag for a request < */ < void MPIR_BsendPersistent( < MPI_Request request, < int flag) < { < BSendData *b; < < b = (BSendData *)request->shandle.bsend; < if (flag) < b->req->handle_type = MPIR_PERSISTENT_SEND; < else < b->req->handle_type = MPIR_SEND; < } < < /* < Mark a request as free in the Buffer code < This is called only in MPI_Request_free (commreq_free.c) < < Note that we never want a USER call to free an INTERNAL buffer request. < We do this by marking the request used by these routines as a regular < send (MPIR_SEND) which it is. < < We may actually not need this routine, since we handle the case internally < in the get/merge code. < */ < void MPIR_BsendFreeReq( < MPIR_SHANDLE *rq) < { < BSendData *b; < int mpi_errno; < < DEBUG_PRINT("Entering MPIR_BsendFreeReq"); < #ifdef DEBUG_BSEND /* #DEBUG_BSEND_START# */ < if (DebugBsend) < FPRINTF( stderr, < "Nulling Bsend request at %lx\n", (long) b ); < #endif /* #DEBUG_BSEND_END# */ < if (!rq->bsend) return; < b = (BSendData *)(rq->bsend); < if (MPIR_TestBufferPtr(b)) { < /* Error in pointer */ < mpi_errno = MPIR_Err_setmsg( MPI_ERR_INTERN, MPIR_ERR_BSEND_CORRUPT, < (char *)0, (char *)0, (char *)0, < "FreeBuffer" ); < MPIR_ERROR( MPIR_COMM_WORLD, mpi_errno, (char *)0 ); < return; < } < b->req = MPI_REQUEST_NULL; < DEBUG_PRINT("Exiting MPIR_BsendFreeReq"); < } < 531c474 < int MPIR_BsendBufferPrint( ) --- > static int MPIR_BsendBufferPrint( ) 570d512 < MPI_Request bsend_request; 572a515 > int psize; 573a517 > BSendData * b; 582,584c526,534 < /* init request */ < bsend_request = ((BSendData *)(request->shandle.bsend))->req; < MPID_Request_init( (&(bsend_request)->shandle), MPIR_SEND ); --- > /* Allocate space in buffer */ > MPI_Pack_size( count, dtype_ptr->self, comm_ptr->self, &psize ); > mpi_errno = MPIR_BsendAlloc( psize, &b ); > if (mpi_errno) > { > *error_code = MPIR_ERROR( comm_ptr, mpi_errno, (char *)0 ); > goto fn_exit; > } > 586c536 < MPIR_BsendCopyData( &request->shandle, comm_ptr, buf, count, dtype_ptr, --- > MPIR_BsendCopyData( b, comm_ptr, buf, count, dtype_ptr, 589c539,540 < /* use ISendContig to send the message */ --- > /* use ISendContig to send the message - note: request was already > initialized in MPIR_BsendAlloc() */ 592c543 < bsend_request, &mpi_errno ); --- > b->req, &mpi_errno ); 595a547,548 > > fn_exit: Index: util/mpirun_dbg.totalview.in =================================================================== RCS file: /MPIhome/mpich/util/mpirun_dbg.totalview.in,v retrieving revision 1.1 retrieving revision 1.3 diff -r1.1 -r1.3 6a7 > tvcommand=${TOTALVIEW:-totalview} 31c32,41 < totalview $prognamemain -a cmdLineArgs -p4pg $p4pgfile -p4wd $p4workdir -mpichtv --- > if [ $just_testing = 1 ] ; then > doitall="echo" > else > # We need the eval to handle arguments containing blanks. > doitall="eval" > fi > # Note that this is run from within the mpirun.ch_p4 script only (!), so > # the argument list is p4 specific. FIX ME! > # > $doitall $tvcommand $prognamemain -a $cmdLineArgs -p4pg $p4pgfile -p4wd $p4workdir -mpichtv .