diogo/yap-6.3
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

New LAM MPI module.

Browse Source 
git-svn-id: https://yap.svn.sf.net/svnroot/yap/trunk@1665 b08c6af1-5177-4d33-ba66-4b1c6b8b522a
This commit is contained in:
nunofonseca 2006-06-04 18:43:38 +00:00
parent 4242198e6f
commit 87bac7cafa
4 changed files with 432 additions and 148 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

521
configure vendored
View File

File diff suppressed because it is too large Load Diff

30
configure.in
View File

@ -170,6 +170,7 @@ AC_ARG_WITH(mpi,
fi, fi,
[yap_cv_mpi=no]) [yap_cv_mpi=no])
AC_ARG_WITH(mpe, AC_ARG_WITH(mpe,
[ --with-mpe[=DIR] use MPE library in DIR], [ --with-mpe[=DIR] use MPE library in DIR],
if test "$withval" = yes; then if test "$withval" = yes; then
@ -183,6 +184,19 @@ AC_ARG_WITH(mpe,
fi, fi,
[yap_cv_mpe=no]) [yap_cv_mpe=no])
AC_ARG_WITH(lam,
[ --with-lam[=DIR] use LAM MPI library in DIR],
if test "$withval" = yes; then
yap_cv_lam=yes
elif test "$withval" = no; then
yap_cv_lam=no
else
yap_cv_lam=$with_lam
LDFLAGS="$LDFLAGS -L${yap_cv_lam}/lib/lam"
CPPFLAGS="$CPPFLAGS -I${yap_cv_lam}/include"
fi,
[yap_cv_lam=no])
AC_ARG_WITH(heap-space, AC_ARG_WITH(heap-space,
[ --with-heap-space[=space] default heap size in Kbytes], [ --with-heap-space[=space] default heap size in Kbytes],
if test "$withval" = yes; then if test "$withval" = yes; then
@ -531,9 +545,11 @@ then
fi fi
CC=${OLD_CC} CC=${OLD_CC}
else else
MPI_CC=${CC} MPI_CC=${MPI_CC}
# MPI_CC=${CC}
fi fi
MPI_LIBS= MPI_LIBS=
if test "$yap_cv_mpi" != "no" -a "$yap_cv_mpe" != "no" if test "$yap_cv_mpi" != "no" -a "$yap_cv_mpe" != "no"
then then
@ -550,6 +566,14 @@ then
CC=${OLD_CC} CC=${OLD_CC}
fi fi
# LAM
OLD_CC=${CC}
CC=${MPI_CC}
AC_CHECK_LIB([lam], [main],
LAMOBJS=yap_mpi@SHLIB_SUFFIX@,
LAMOBJS=no)
CC=${OLD_CC}
AC_PROG_CPP AC_PROG_CPP
if test "$cross_compiling" = "yes" if test "$cross_compiling" = "yes"
@ -985,6 +1009,7 @@ AC_SUBST(CROSS_SIMULATOR)
AC_SUBST(INSTALLCLP) AC_SUBST(INSTALLCLP)
AC_SUBST(JAVALIBPATH) AC_SUBST(JAVALIBPATH)
AC_SUBST(JAVAINCPATH) AC_SUBST(JAVAINCPATH)
AC_SUBST(LAMOBJS)
dnl check for threaded code dnl check for threaded code
@ -1260,6 +1285,7 @@ mkdir -p library/random
mkdir -p library/regex mkdir -p library/regex
mkdir -p library/system mkdir -p library/system
mkdir -p library/Tries mkdir -p library/Tries
mkdir -p library/lammpi
mkdir -p library/yap2swi mkdir -p library/yap2swi
mkdir -p CHR mkdir -p CHR
mkdir -p CLPQR mkdir -p CLPQR
@ -1274,7 +1300,7 @@ mkdir -p LGPL/clp
mkdir -p LGPL/clpr mkdir -p LGPL/clpr
mkdir -p LGPL/chr mkdir -p LGPL/chr
AC_OUTPUT(Makefile library/matrices/Makefile library/regex/Makefile library/system/Makefile library/random/Makefile library/yap2swi/Makefile library/mpi/Makefile .depend library/Makefile LGPL/chr/Makefile LGPL/chr/chr_swi_bootstrap.yap CLPBN/Makefile LGPL/clp/Makefile LGPL/clpr/Makefile library/Tries/Makefile LGPL/JPL/Makefile LGPL/JPL/src/Makefile LGPL/JPL/java/Makefile LGPL/JPL/jpl_paths.yap) AC_OUTPUT(Makefile library/matrices/Makefile library/regex/Makefile library/system/Makefile library/random/Makefile library/yap2swi/Makefile library/mpi/Makefile .depend library/Makefile LGPL/chr/Makefile LGPL/chr/chr_swi_bootstrap.yap CLPBN/Makefile LGPL/clp/Makefile LGPL/clpr/Makefile library/lammpi/Makefile library/Tries/Makefile LGPL/JPL/Makefile LGPL/JPL/src/Makefile LGPL/JPL/java/Makefile LGPL/JPL/jpl_paths.yap)
make depend make depend

1
library/Makefile.in
View File

@ -54,6 +54,7 @@ PROGRAMS= $(srcdir)/apply_macros.yap \
$(srcdir)/undgraphs.yap \ $(srcdir)/undgraphs.yap \
$(srcdir)/wdgraphs.yap \ $(srcdir)/wdgraphs.yap \
$(srcdir)/wundgraphs.yap \ $(srcdir)/wundgraphs.yap \
$(srcdir)/lam_mpi.yap \
$(srcdir)/ypp.yap $(srcdir)/ypp.yap
MYDDAS_PROGRAMS= $(srcdir)/MYDDAS/myddas.ypp \ MYDDAS_PROGRAMS= $(srcdir)/MYDDAS/myddas.ypp \

28
library/lam_mpi.yap Normal file
View File

@ -0,0 +1,28 @@
% Author: Nuno A. Fonseca
% Date: 2006-06-01
% $Id: lam_mpi.yap,v 1.1 2006-06-04 18:43:38 nunofonseca Exp $
:- module(lam_mpi, [
mpi_init/0,
mpi_finalize/0,
mpi_comm_size/1,
mpi_comm_rank/1,
mpi_version/2,
mpi_send/3,
mpi_isend/4,
mpi_recv/3,
mpi_irecv/3,
mpi_wait/2,
mpi_wait_rcv/3,
mpi_test/2,
mpi_test_recv/3,
mpi_bcast/2,
mpi_ibcast2/2,
mpi_ibcast2/3,
mpi_bcast2/2,
mpi_bcast2/3,
mpi_barrier/0,
mpi_gc/0
]).
:- load_foreign_files([yap_mpi], [], init_mpi).