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

separate cplint and mpi interface.

Browse Source
This commit is contained in:
Vitor Santos Costa 2013-11-04 13:16:14 +00:00
parent dd6c66392a
commit d2ed850643
4 changed files with 396 additions and 332 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

526
configure vendored
View File

@ -633,6 +633,9 @@ PYTHON_INCLUDES
ENABLE_PYTHON ENABLE_PYTHON
PYTHON_TARGET PYTHON_TARGET
PYTHON PYTHON
MPICF
MPILDF
YAPMPILIB
GECODE_EXTRALIBS GECODE_EXTRALIBS
GECODE_VERSION GECODE_VERSION
GECODE_MAJOR GECODE_MAJOR
@ -697,10 +700,8 @@ STATIC_MODE
MAX_WORKERS MAX_WORKERS
INSTALLCLP INSTALLCLP
INSTALL_COMMAND INSTALL_COMMAND
MPICF MPI_CC
MPILDF
INSTALL_MPI INSTALL_MPI
YAPMPILIB
IN_UNIX IN_UNIX
ENABLE_CLPBN_BP ENABLE_CLPBN_BP
ENABLE_ZLIB ENABLE_ZLIB
@ -743,7 +744,6 @@ CPLINT_SHLIB_LD
CPLINT_LDFLAGS CPLINT_LDFLAGS
CPLINT_CFLAGS CPLINT_CFLAGS
CPLINT_LIBS CPLINT_LIBS
MPI_CC
ENABLE_PRISM ENABLE_PRISM
EGREP EGREP
GREP GREP
@ -850,7 +850,6 @@ enable_clpqr
enable_win64 enable_win64
enable_april enable_april
enable_dlcompat enable_dlcompat
enable_cplint
enable_clpbn_bp enable_clpbn_bp
with_gmp with_gmp
with_R with_R
@ -859,8 +858,6 @@ with_minisat
with_java with_java
with_readline with_readline
with_matlab with_matlab
with_mpi
with_mpe
with_heap_space with_heap_space
with_stack_space with_stack_space
with_trail_space with_trail_space
@ -874,8 +871,11 @@ with_time
with_odbc with_odbc
with_cudd with_cudd
enable_gecode enable_gecode
with_mpi
with_mpe
with_python with_python
with_cuda with_cuda
enable_cplint
' '
ac_precious_vars='build_alias ac_precious_vars='build_alias
host_alias host_alias
@ -1526,12 +1526,12 @@ Optional Features:
--enable-win64 compile YAP for win64 --enable-win64 compile YAP for win64
--enable-april compile Yap to support April ILP system --enable-april compile Yap to support April ILP system
--enable-dlcompat use dlcompat library for dynamic loading on Mac OS X --enable-dlcompat use dlcompat library for dynamic loading on Mac OS X
--enable-cplint=DIR enable the cplint library using the CUDD library in DIR/lib
--enable-clpbn-bp enable belief propagation solver in CLPBN. --enable-clpbn-bp enable belief propagation solver in CLPBN.
--enable-myddas[=DIR] enable the MYDDAS library --enable-myddas[=DIR] enable the MYDDAS library
--enable-myddas-stats enable the MYDDAS library statistics support --enable-myddas-stats enable the MYDDAS library statistics support
--enable-myddas-top-level enable the MYDDAS top-level support to MySQL --enable-myddas-top-level enable the MYDDAS top-level support to MySQL
--enable-gecode install gecode library --enable-gecode install gecode library
--enable-cplint=DIR enable the cplint library using the CUDD library in DIR/lib
Optional Packages: Optional Packages:
--with-PACKAGE[=ARG] use PACKAGE [ARG=yes] --with-PACKAGE[=ARG] use PACKAGE [ARG=yes]
@ -1543,8 +1543,6 @@ Optional Packages:
--with-java=JAVA_HOME use Java instalation in JAVA_HOME --with-java=JAVA_HOME use Java instalation in JAVA_HOME
--with-readline=DIR use GNU Readline Library in DIR --with-readline=DIR use GNU Readline Library in DIR
--with-matlab=DIR use MATLAB package in DIR --with-matlab=DIR use MATLAB package in DIR
--with-mpi=DIR use LAM/MPI library in DIR
--with-mpe=DIR use MPE library in DIR
--with-heap-space=space default heap size in Kbytes --with-heap-space=space default heap size in Kbytes
--with-stack-space=space default stack size in Kbytes --with-stack-space=space default stack size in Kbytes
--with-trail-space=space default trail size in Kbytes --with-trail-space=space default trail size in Kbytes
@ -1554,6 +1552,8 @@ Optional Packages:
--without-time Exclude alarm library --without-time Exclude alarm library
--with-odbc=<dir> Location of ODBC include/lib --with-odbc=<dir> Location of ODBC include/lib
--with-cudd=DIR use CUDD package in DIR --with-cudd=DIR use CUDD package in DIR
--with-mpi=DIR use LAM/MPI library in DIR
--with-mpe=DIR use MPE library in DIR
--with-python=DIR interface to R language --with-python=DIR interface to R language
--enable-cuda use minisat interface --enable-cuda use minisat interface
@ -4264,14 +4264,6 @@ else
fi fi
# Check whether --enable-cplint was given.
if test "${enable_cplint+set}" = set; then :
enableval=$enable_cplint; yap_cv_cplint=$enableval
else
yap_cv_cplint=no
fi
# Check whether --enable-clpbn-bp was given. # Check whether --enable-clpbn-bp was given.
if test "${enable_clpbn_bp+set}" = set; then : if test "${enable_clpbn_bp+set}" = set; then :
enableval=$enable_clpbn_bp; yap_cv_clpbn_bp="$enableval" enableval=$enable_clpbn_bp; yap_cv_clpbn_bp="$enableval"
@ -4400,41 +4392,6 @@ fi
# Check whether --with-mpi was given.
if test "${with_mpi+set}" = set; then :
withval=$with_mpi; if test "$withval" = yes; then
yap_cv_mpi=yes
elif test "$withval" = no; then
yap_cv_mpi=no
else
yap_cv_mpi=$with_mpi
LDFLAGS="$LDFLAGS -L${yap_cv_mpi}/lib"
CPPFLAGS="$CPPFLAGS -I${yap_cv_mpi}/include"
fi
else
yap_cv_mpi=no
fi
# Check whether --with-mpe was given.
if test "${with_mpe+set}" = set; then :
withval=$with_mpe; if test "$withval" = yes; then
yap_cv_mpe=yes
elif test "$withval" = no; then
yap_cv_mpe=no
else
yap_cv_mpe=$with_mpe
LDFLAGS="$LDFLAGS -L${yap_cv_mpe}/lib"
CPPFLAGS="$CPPFLAGS -I${yap_cv_mpe}/include"
fi
else
yap_cv_mpe=no
fi
# Check whether --with-heap-space was given. # Check whether --with-heap-space was given.
if test "${with_heap_space+set}" = set; then : if test "${with_heap_space+set}" = set; then :
withval=$with_heap_space; if test "$withval" = yes; then withval=$with_heap_space; if test "$withval" = yes; then
@ -7145,12 +7102,6 @@ fi
;; ;;
esac esac
if test "$CC" = icc
then
MPI_CC="$CC"
yap_cv_mpi=no
fi
if test "$dynamic_loading" = "yes" if test "$dynamic_loading" = "yes"
then then
YAPLIB_CFLAGS="$SHLIB_CFLAGS" YAPLIB_CFLAGS="$SHLIB_CFLAGS"
@ -7265,187 +7216,6 @@ if test "$tabling" = "yes"
then then
YAP_EXTRAS="$YAP_EXTRAS -DTABLING=1" YAP_EXTRAS="$YAP_EXTRAS -DTABLING=1"
fi fi
if test "$yap_cv_mpi" != "no"; then
if test "$yap_cv_mpi" != "yes"; then
# Extract the first word of "mpicc", so it can be a program name with args.
set dummy mpicc; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
if ${ac_cv_path_MPI_CC+:} false; then :
$as_echo_n "(cached) " >&6
else
case $MPI_CC in
[\\/]* | ?:[\\/]*)
ac_cv_path_MPI_CC="$MPI_CC" # Let the user override the test with a path.
;;
*)
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
as_dummy="$PATH:/sbin:/usr/sbin:/usr/etc:/usr/local/sbin"
for as_dir in $as_dummy
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_path_MPI_CC="$as_dir/$ac_word$ac_exec_ext"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
done
IFS=$as_save_IFS
test -z "$ac_cv_path_MPI_CC" && ac_cv_path_MPI_CC="true"
;;
esac
fi
MPI_CC=$ac_cv_path_MPI_CC
if test -n "$MPI_CC"; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $MPI_CC" >&5
$as_echo "$MPI_CC" >&6; }
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
fi
else
# Extract the first word of "mpicc", so it can be a program name with args.
set dummy mpicc; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
if ${ac_cv_path_MPI_CC+:} false; then :
$as_echo_n "(cached) " >&6
else
case $MPI_CC in
[\\/]* | ?:[\\/]*)
ac_cv_path_MPI_CC="$MPI_CC" # Let the user override the test with a path.
;;
*)
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
as_dummy="$yap_cv_mpi/bin:$PATH:/sbin:/usr/sbin:/usr/etc:/usr/local/sbin"
for as_dir in $as_dummy
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_path_MPI_CC="$as_dir/$ac_word$ac_exec_ext"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
done
IFS=$as_save_IFS
test -z "$ac_cv_path_MPI_CC" && ac_cv_path_MPI_CC="true"
;;
esac
fi
MPI_CC=$ac_cv_path_MPI_CC
if test -n "$MPI_CC"; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $MPI_CC" >&5
$as_echo "$MPI_CC" >&6; }
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
fi
fi
MPILDF=`"$MPI_CC" --showme:link`
MPICF=`"$MPI_CC" --showme:compile`
LIBS="$LIBS $MPILDF"
INSTALL_MPI=""
OLD_CC=${CC}
CC=${MPI_CC}
for ac_header in mpi.h
do :
ac_fn_c_check_header_mongrel "$LINENO" "mpi.h" "ac_cv_header_mpi_h" "$ac_includes_default"
if test "x$ac_cv_header_mpi_h" = xyes; then :
cat >>confdefs.h <<_ACEOF
#define HAVE_MPI_H 1
_ACEOF
fi
done
CC=${OLD_CC}
if test "$yap_cv_mpe" != "no"
then
OLD_CC=${CC}
CC=${MPI_CC}
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for MPE_Init_log in -lmpe" >&5
$as_echo_n "checking for MPE_Init_log in -lmpe... " >&6; }
if ${ac_cv_lib_mpe_MPE_Init_log+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lmpe $LIBS"
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
Use char because int might match the return type of a GCC
builtin and then its argument prototype would still apply. */
#ifdef __cplusplus
extern "C"
#endif
char MPE_Init_log ();
int
main ()
{
return MPE_Init_log ();
;
return 0;
}
_ACEOF
if ac_fn_c_try_link "$LINENO"; then :
ac_cv_lib_mpe_MPE_Init_log=yes
else
ac_cv_lib_mpe_MPE_Init_log=no
fi
rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_mpe_MPE_Init_log" >&5
$as_echo "$ac_cv_lib_mpe_MPE_Init_log" >&6; }
if test "x$ac_cv_lib_mpe_MPE_Init_log" = xyes; then :
$as_echo "#define HAVE_LIBMPE 1" >>confdefs.h
else
$as_echo "#define HAVE_LIBMPE 0" >>confdefs.h
fi
if test "$ac_cv_lib_mpe_MPE_Init_log" = yes
then
MPI_1LIBS="-lmpe"
MPI_OBJS="$MPI_OBJS mpe.o"
fi
for ac_header in mpe.h
do :
ac_fn_c_check_header_mongrel "$LINENO" "mpe.h" "ac_cv_header_mpe_h" "$ac_includes_default"
if test "x$ac_cv_header_mpe_h" = xyes; then :
cat >>confdefs.h <<_ACEOF
#define HAVE_MPE_H 1
_ACEOF
fi
done
CC=${OLD_CC}
fi
else
INSTALL_MPI="# "
MPI_CC=${CC}
fi
if test ! "$yap_cv_cplint" = "no" if test ! "$yap_cv_cplint" = "no"
then then
if test ! "$yap_cv_cplint" = "yes" if test ! "$yap_cv_cplint" = "yes"
@ -8361,9 +8131,6 @@ CMDEXT=sh
@ -10009,7 +9776,7 @@ else
JAVA_TEST=Test.java JAVA_TEST=Test.java
CLASS_TEST=Test.class CLASS_TEST=Test.class
cat << \EOF > $JAVA_TEST cat << \EOF > $JAVA_TEST
/* #line 10012 "configure" */ /* #line 9779 "configure" */
public class Test { public class Test {
} }
EOF EOF
@ -10185,7 +9952,7 @@ EOF
if uudecode$EXEEXT Test.uue; then if uudecode$EXEEXT Test.uue; then
ac_cv_prog_uudecode_base64=yes ac_cv_prog_uudecode_base64=yes
else else
echo "configure: 10188: uudecode had trouble decoding base 64 file 'Test.uue'" >&5 echo "configure: 9955: uudecode had trouble decoding base 64 file 'Test.uue'" >&5
echo "configure: failed file was:" >&5 echo "configure: failed file was:" >&5
cat Test.uue >&5 cat Test.uue >&5
ac_cv_prog_uudecode_base64=no ac_cv_prog_uudecode_base64=no
@ -10316,7 +10083,7 @@ else
JAVA_TEST=Test.java JAVA_TEST=Test.java
CLASS_TEST=Test.class CLASS_TEST=Test.class
cat << \EOF > $JAVA_TEST cat << \EOF > $JAVA_TEST
/* #line 10319 "configure" */ /* #line 10086 "configure" */
public class Test { public class Test {
} }
EOF EOF
@ -10351,7 +10118,7 @@ JAVA_TEST=Test.java
CLASS_TEST=Test.class CLASS_TEST=Test.class
TEST=Test TEST=Test
cat << \EOF > $JAVA_TEST cat << \EOF > $JAVA_TEST
/* [#]line 10354 "configure" */ /* [#]line 10121 "configure" */
public class Test { public class Test {
public static void main (String args[]) { public static void main (String args[]) {
System.exit (0); System.exit (0);
@ -13082,6 +12849,233 @@ fi
# Check whether --with-mpi was given.
if test "${with_mpi+set}" = set; then :
withval=$with_mpi; if test "$withval" = yes; then
yap_cv_mpi=yes
elif test "$withval" = no; then
yap_cv_mpi=no
else
yap_cv_mpi=$with_mpi
LDFLAGS="$LDFLAGS -L${yap_cv_mpi}/lib"
CPPFLAGS="$CPPFLAGS -I${yap_cv_mpi}/include"
fi
else
yap_cv_mpi=no
fi
# Check whether --with-mpe was given.
if test "${with_mpe+set}" = set; then :
withval=$with_mpe; if test "$withval" = yes; then
yap_cv_mpe=yes
elif test "$withval" = no; then
yap_cv_mpe=no
else
yap_cv_mpe=$with_mpe
LDFLAGS="$LDFLAGS -L${yap_cv_mpe}/lib"
CPPFLAGS="$CPPFLAGS -I${yap_cv_mpe}/include"
fi
else
yap_cv_mpe=no
fi
if test "$CC" = icc
then
MPI_CC="$CC"
yap_cv_mpi=no
fi
if test "$yap_cv_mpi" != "no"; then
if test "$yap_cv_mpi" != "yes"; then
# Extract the first word of "mpicc", so it can be a program name with args.
set dummy mpicc; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
if ${ac_cv_path_MPI_CC+:} false; then :
$as_echo_n "(cached) " >&6
else
case $MPI_CC in
[\\/]* | ?:[\\/]*)
ac_cv_path_MPI_CC="$MPI_CC" # Let the user override the test with a path.
;;
*)
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
as_dummy="$PATH:/sbin:/usr/sbin:/usr/etc:/usr/local/sbin"
for as_dir in $as_dummy
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_path_MPI_CC="$as_dir/$ac_word$ac_exec_ext"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
done
IFS=$as_save_IFS
test -z "$ac_cv_path_MPI_CC" && ac_cv_path_MPI_CC="true"
;;
esac
fi
MPI_CC=$ac_cv_path_MPI_CC
if test -n "$MPI_CC"; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $MPI_CC" >&5
$as_echo "$MPI_CC" >&6; }
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
fi
else
# Extract the first word of "mpicc", so it can be a program name with args.
set dummy mpicc; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
if ${ac_cv_path_MPI_CC+:} false; then :
$as_echo_n "(cached) " >&6
else
case $MPI_CC in
[\\/]* | ?:[\\/]*)
ac_cv_path_MPI_CC="$MPI_CC" # Let the user override the test with a path.
;;
*)
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
as_dummy="$yap_cv_mpi/bin:$PATH:/sbin:/usr/sbin:/usr/etc:/usr/local/sbin"
for as_dir in $as_dummy
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_path_MPI_CC="$as_dir/$ac_word$ac_exec_ext"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
done
IFS=$as_save_IFS
test -z "$ac_cv_path_MPI_CC" && ac_cv_path_MPI_CC="true"
;;
esac
fi
MPI_CC=$ac_cv_path_MPI_CC
if test -n "$MPI_CC"; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $MPI_CC" >&5
$as_echo "$MPI_CC" >&6; }
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
fi
fi
MPILDF=`"$MPI_CC" --showme:link`
MPICF=`"$MPI_CC" --showme:compile`
LIBS="$LIBS $MPILDF"
INSTALL_MPI=""
OLD_CC=${CC}
CC=${MPI_CC}
for ac_header in mpi.h
do :
ac_fn_c_check_header_mongrel "$LINENO" "mpi.h" "ac_cv_header_mpi_h" "$ac_includes_default"
if test "x$ac_cv_header_mpi_h" = xyes; then :
cat >>confdefs.h <<_ACEOF
#define HAVE_MPI_H 1
_ACEOF
fi
done
CC=${OLD_CC}
if test "$yap_cv_mpe" != "no"
then
OLD_CC=${CC}
CC=${MPI_CC}
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for MPE_Init_log in -lmpe" >&5
$as_echo_n "checking for MPE_Init_log in -lmpe... " >&6; }
if ${ac_cv_lib_mpe_MPE_Init_log+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lmpe $LIBS"
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
Use char because int might match the return type of a GCC
builtin and then its argument prototype would still apply. */
#ifdef __cplusplus
extern "C"
#endif
char MPE_Init_log ();
int
main ()
{
return MPE_Init_log ();
;
return 0;
}
_ACEOF
if ac_fn_c_try_link "$LINENO"; then :
ac_cv_lib_mpe_MPE_Init_log=yes
else
ac_cv_lib_mpe_MPE_Init_log=no
fi
rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_mpe_MPE_Init_log" >&5
$as_echo "$ac_cv_lib_mpe_MPE_Init_log" >&6; }
if test "x$ac_cv_lib_mpe_MPE_Init_log" = xyes; then :
$as_echo "#define HAVE_LIBMPE 1" >>confdefs.h
else
$as_echo "#define HAVE_LIBMPE 0" >>confdefs.h
fi
if test "$ac_cv_lib_mpe_MPE_Init_log" = yes
then
MPI_1LIBS="-lmpe"
MPI_OBJS="$MPI_OBJS mpe.o"
fi
for ac_header in mpe.h
do :
ac_fn_c_check_header_mongrel "$LINENO" "mpe.h" "ac_cv_header_mpe_h" "$ac_includes_default"
if test "x$ac_cv_header_mpe_h" = xyes; then :
cat >>confdefs.h <<_ACEOF
#define HAVE_MPE_H 1
_ACEOF
fi
done
CC=${OLD_CC}
fi
else
INSTALL_MPI="# "
MPI_CC=${CC}
fi
# Check whether --with-python was given. # Check whether --with-python was given.
if test "${with_python+set}" = set; then : if test "${with_python+set}" = set; then :
withval=$with_python; if test "$withval" = yes; then withval=$with_python; if test "$withval" = yes; then
@ -13266,6 +13260,44 @@ ac_config_files="$ac_config_files packages/cuda/Makefile"
# Check whether --enable-cplint was given.
if test "${enable_cplint+set}" = set; then :
enableval=$enable_cplint; yap_cv_cplint=$enableval
else
yap_cv_cplint=no
fi
if test ! "$yap_cv_cplint" = "no"
then
if test ! "$yap_cv_cplint" = "yes"
then
CPLINT_LDFLAGS+=" -L${yap_cv_cplint}/cudd -L${yap_cv_cplint}/mtr -L${yap_cv_cplint}/st -L${yap_cv_cplint}/util -L${yap_cv_cplint}/epd "
CPLINT_CFLAGS+=" -I${yap_cv_cplint}/include"
CPLINT_LIBS="-lcudd -lmtr -lst -lepd -lutil -lm "$CPLINT_LIBS
fi
ENABLE_CPLINT=""
if test "$target_os" = "cygwin" -o "$target_os" = "mingw32"
then
CPLINT_SHLIB_LD="gcc -shared ../../yap.dll"
SHLIB_SUFFIX="dll"
else
CPLINT_SHLIB_LD=$SHLIB_LD
SHLIB_SUFFIX="so"
fi
else
ENABLE_CPLINT="@#"
fi

89
configure.in
View File

@ -12,13 +12,6 @@ dnl DefHeapSpace= Default DB space
dnl DefStackSpace= Default global+local dnl DefStackSpace= Default global+local
dnl DefTrailSpace= Default trail dnl DefTrailSpace= Default trail
dnl dnl
dnl CPLINT
dnl
dnl CPLINT_LIBS=
dnl CPLINT_LIBS=
dnl CPLINT_LDFLAGS=
dnl CPLINT_SHLIB_LD=
dnl
dnl ENVIRONMENT to run YAP before Install is complete dnl ENVIRONMENT to run YAP before Install is complete
dnl PRE_INSTALL_ENV= prefix to run YAP after libYap.so and yap are available dnl PRE_INSTALL_ENV= prefix to run YAP after libYap.so and yap are available
dnl but before make install dnl but before make install
@ -159,10 +152,6 @@ AC_ARG_ENABLE(dlcompat,
[ --enable-dlcompat use dlcompat library for dynamic loading on Mac OS X], [ --enable-dlcompat use dlcompat library for dynamic loading on Mac OS X],
use_dlcompat="$enableval", use_dlcompat=no) use_dlcompat="$enableval", use_dlcompat=no)
AC_ARG_ENABLE(cplint,
[ --enable-cplint[=DIR] enable the cplint library using the CUDD library in DIR/lib],
yap_cv_cplint=$enableval, yap_cv_cplint=no)
AC_ARG_ENABLE(clpbn-bp, AC_ARG_ENABLE(clpbn-bp,
[ --enable-clpbn-bp enable belief propagation solver in CLPBN. ], [ --enable-clpbn-bp enable belief propagation solver in CLPBN. ],
yap_cv_clpbn_bp="$enableval", yap_cv_clpbn_bp=yes) yap_cv_clpbn_bp="$enableval", yap_cv_clpbn_bp=yes)
@ -260,34 +249,6 @@ AC_ARG_WITH(matlab,
fi, fi,
[yap_cv_matlab=no]) [yap_cv_matlab=no])
AC_ARG_WITH(mpi,
[ --with-mpi[=DIR] use LAM/MPI library in DIR],
if test "$withval" = yes; then
dnl handle UBUNTU systems
yap_cv_mpi=yes
elif test "$withval" = no; then
yap_cv_mpi=no
else
yap_cv_mpi=$with_mpi
LDFLAGS="$LDFLAGS -L${yap_cv_mpi}/lib"
CPPFLAGS="$CPPFLAGS -I${yap_cv_mpi}/include"
fi,
[yap_cv_mpi=no])
AC_ARG_WITH(mpe,
[ --with-mpe[=DIR] use MPE library in DIR],
if test "$withval" = yes; then
yap_cv_mpe=yes
elif test "$withval" = no; then
yap_cv_mpe=no
else
yap_cv_mpe=$with_mpe
LDFLAGS="$LDFLAGS -L${yap_cv_mpe}/lib"
CPPFLAGS="$CPPFLAGS -I${yap_cv_mpe}/include"
fi,
[yap_cv_mpe=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
@ -1092,12 +1053,6 @@ dnl Linux has both elf and a.out, in this case we found elf
;; ;;
esac esac
if test "$CC" = icc
then
MPI_CC="$CC"
yap_cv_mpi=no
fi
if test "$dynamic_loading" = "yes" if test "$dynamic_loading" = "yes"
then then
YAPLIB_CFLAGS="$SHLIB_CFLAGS" YAPLIB_CFLAGS="$SHLIB_CFLAGS"
@ -1206,43 +1161,6 @@ if test "$tabling" = "yes"
then then
YAP_EXTRAS="$YAP_EXTRAS -DTABLING=1" YAP_EXTRAS="$YAP_EXTRAS -DTABLING=1"
fi fi
dnl LAM/MPI interface
if test "$yap_cv_mpi" != "no"; then
if test "$yap_cv_mpi" != "yes"; then
AC_PATH_PROG(MPI_CC,mpicc,true,$PATH:/sbin:/usr/sbin:/usr/etc:/usr/local/sbin)
else
AC_PATH_PROG(MPI_CC,mpicc,true,$yap_cv_mpi/bin:$PATH:/sbin:/usr/sbin:/usr/etc:/usr/local/sbin)
fi
MPILDF=`"$MPI_CC" --showme:link`
MPICF=`"$MPI_CC" --showme:compile`
LIBS="$LIBS $MPILDF"
INSTALL_MPI=""
OLD_CC=${CC}
CC=${MPI_CC}
AC_CHECK_HEADERS(mpi.h)
CC=${OLD_CC}
if test "$yap_cv_mpe" != "no"
then
OLD_CC=${CC}
CC=${MPI_CC}
AC_CHECK_LIB(mpe,MPE_Init_log,
[AC_DEFINE(HAVE_LIBMPE, 1)],
[AC_DEFINE(HAVE_LIBMPE, 0)])
if test "$ac_cv_lib_mpe_MPE_Init_log" = yes
then
MPI_1LIBS="-lmpe"
MPI_OBJS="$MPI_OBJS mpe.o"
fi
AC_CHECK_HEADERS(mpe.h)
CC=${OLD_CC}
fi
else
INSTALL_MPI="# "
MPI_CC=${CC}
fi
if test ! "$yap_cv_cplint" = "no" if test ! "$yap_cv_cplint" = "no"
then then
if test ! "$yap_cv_cplint" = "yes" if test ! "$yap_cv_cplint" = "yes"
@ -1426,11 +1344,8 @@ AC_SUBST(ENABLE_SGML)
AC_SUBST(ENABLE_ZLIB) AC_SUBST(ENABLE_ZLIB)
AC_SUBST(ENABLE_CLPBN_BP) AC_SUBST(ENABLE_CLPBN_BP)
AC_SUBST(IN_UNIX) AC_SUBST(IN_UNIX)
AC_SUBST(YAPMPILIB)
AC_SUBST(INSTALL_MPI) AC_SUBST(INSTALL_MPI)
AC_SUBST(MPI_CC) AC_SUBST(MPI_CC)
AC_SUBST(MPILDF)
AC_SUBST(MPICF)
AC_SUBST(INSTALL_COMMAND) AC_SUBST(INSTALL_COMMAND)
AC_SUBST(INSTALLCLP) AC_SUBST(INSTALLCLP)
AC_SUBST(MAX_WORKERS) AC_SUBST(MAX_WORKERS)
@ -1930,10 +1845,14 @@ fi
m4_include([packages/gecode/configure.in]) m4_include([packages/gecode/configure.in])
m4_include([library/lammpi/configure.in])
m4_include([packages/python/configure.in]) m4_include([packages/python/configure.in])
m4_include([packages/cuda/configure.in]) m4_include([packages/cuda/configure.in])
m4_include([packages/cplint/configure.in])
AC_SUBST(ENABLE_LIBARCHIVE) AC_SUBST(ENABLE_LIBARCHIVE)

74
library/lammpi/configure.in Normal file
View File

@ -0,0 +1,74 @@
AC_ARG_WITH(mpi,
[ --with-mpi[=DIR] use LAM/MPI library in DIR],
if test "$withval" = yes; then
dnl handle UBUNTU systems
yap_cv_mpi=yes
elif test "$withval" = no; then
yap_cv_mpi=no
else
yap_cv_mpi=$with_mpi
LDFLAGS="$LDFLAGS -L${yap_cv_mpi}/lib"
CPPFLAGS="$CPPFLAGS -I${yap_cv_mpi}/include"
fi,
[yap_cv_mpi=no])
AC_ARG_WITH(mpe,
[ --with-mpe[=DIR] use MPE library in DIR],
if test "$withval" = yes; then
yap_cv_mpe=yes
elif test "$withval" = no; then
yap_cv_mpe=no
else
yap_cv_mpe=$with_mpe
LDFLAGS="$LDFLAGS -L${yap_cv_mpe}/lib"
CPPFLAGS="$CPPFLAGS -I${yap_cv_mpe}/include"
fi,
[yap_cv_mpe=no])
if test "$CC" = icc
then
MPI_CC="$CC"
yap_cv_mpi=no
fi
dnl LAM/MPI interface
if test "$yap_cv_mpi" != "no"; then
if test "$yap_cv_mpi" != "yes"; then
AC_PATH_PROG(MPI_CC,mpicc,true,$PATH:/sbin:/usr/sbin:/usr/etc:/usr/local/sbin)
else
AC_PATH_PROG(MPI_CC,mpicc,true,$yap_cv_mpi/bin:$PATH:/sbin:/usr/sbin:/usr/etc:/usr/local/sbin)
fi
MPILDF=`"$MPI_CC" --showme:link`
MPICF=`"$MPI_CC" --showme:compile`
LIBS="$LIBS $MPILDF"
INSTALL_MPI=""
OLD_CC=${CC}
CC=${MPI_CC}
AC_CHECK_HEADERS(mpi.h)
CC=${OLD_CC}
if test "$yap_cv_mpe" != "no"
then
OLD_CC=${CC}
CC=${MPI_CC}
AC_CHECK_LIB(mpe,MPE_Init_log,
[AC_DEFINE(HAVE_LIBMPE, 1)],
[AC_DEFINE(HAVE_LIBMPE, 0)])
if test "$ac_cv_lib_mpe_MPE_Init_log" = yes
then
MPI_1LIBS="-lmpe"
MPI_OBJS="$MPI_OBJS mpe.o"
fi
AC_CHECK_HEADERS(mpe.h)
CC=${OLD_CC}
fi
else
INSTALL_MPI="# "
MPI_CC=${CC}
fi
AC_SUBST(YAPMPILIB)
AC_SUBST(MPILDF)
AC_SUBST(MPICF)

39
packages/cplint/configure.in Normal file
View File

@ -0,0 +1,39 @@
dnl CPLINT
dnl
dnl CPLINT_LIBS=
dnl CPLINT_LIBS=
dnl CPLINT_LDFLAGS=
dnl CPLINT_SHLIB_LD=
dnl
AC_ARG_ENABLE(cplint,
[ --enable-cplint[=DIR] enable the cplint library using the CUDD library in DIR/lib],
yap_cv_cplint=$enableval, yap_cv_cplint=no)
if test ! "$yap_cv_cplint" = "no"
then
if test ! "$yap_cv_cplint" = "yes"
then
CPLINT_LDFLAGS+=" -L${yap_cv_cplint}/cudd -L${yap_cv_cplint}/mtr -L${yap_cv_cplint}/st -L${yap_cv_cplint}/util -L${yap_cv_cplint}/epd "
CPLINT_CFLAGS+=" -I${yap_cv_cplint}/include"
CPLINT_LIBS="-lcudd -lmtr -lst -lepd -lutil -lm "$CPLINT_LIBS
fi
ENABLE_CPLINT=""
if test "$target_os" = "cygwin" -o "$target_os" = "mingw32"
then
CPLINT_SHLIB_LD="gcc -shared ../../yap.dll"
SHLIB_SUFFIX="dll"
else
CPLINT_SHLIB_LD=$SHLIB_LD
SHLIB_SUFFIX="so"
fi
AC_SUBST(CPLINT_LIBS)
AC_SUBST(CPLINT_CFLAGS)
AC_SUBST(CPLINT_LDFLAGS)
AC_SUBST(CPLINT_SHLIB_LD)
AC_SUBST(SHLIB_SUFFIX)
else
ENABLE_CPLINT="@#"
fi