|
|
@@ -298,7 +298,7 @@ AC_ARG_WITH(mpicxx, [AS_HELP_STRING([--with-mpicxx[=<path to mpicxx>]],
|
|
|
fi
|
|
|
# nothing was specified: default value is used
|
|
|
AC_PATH_PROG(mpicxx_path, $DEFAULT_MPICXX, [no], [$simgrid_dir/bin:$PATH])
|
|
|
-
|
|
|
+
|
|
|
# try with mpic++ if mpicxx was not found
|
|
|
if test x$mpicxx_path = xno ; then
|
|
|
DEFAULT_MPICXX=mpic++
|
|
|
@@ -341,6 +341,13 @@ if test x$enable_mpi_progression_hook = xyes; then
|
|
|
AC_DEFINE(STARPU_MPI_ACTIVITY, [1], [enable StarPU MPI activity polling method])
|
|
|
fi
|
|
|
|
|
|
+AC_ARG_ENABLE(mpi-pedantic-isend, [AS_HELP_STRING([--enable-mpi-pedantic-isend],
|
|
|
+ [Enable StarPU MPI pedantic isend])],
|
|
|
+ enable_mpi_pedantic_isend=$enableval, enable_mpi_pedantic_isend=no)
|
|
|
+if test x$enable_mpi_pedantic_isend = xyes; then
|
|
|
+ AC_DEFINE(STARPU_MPI_PEDANTIC_ISEND, [1], [enable StarPU MPI pedantic isend])
|
|
|
+fi
|
|
|
+
|
|
|
#We can only build MPI Master Slave if User wants it and MPI is available
|
|
|
if test x$use_mpi_master_slave = xyes -a x$use_mpi = xyes -a x$use_mpicxx = xyes; then
|
|
|
build_mpi_master_slave=yes
|
|
|
@@ -355,10 +362,10 @@ fi
|
|
|
|
|
|
if test x$build_mpi_master_slave = xyes; then
|
|
|
AC_DEFINE(STARPU_USE_MPI_MASTER_SLAVE, [1], [MPI Master Slave support is enabled])
|
|
|
- CC=$mpicc_path
|
|
|
- CCLD=$mpicc_path
|
|
|
- CXX=$mpicxx_path
|
|
|
- CXXLD=mpicxx_path
|
|
|
+ CC=$mpicc_path
|
|
|
+ CCLD=$mpicc_path
|
|
|
+ CXX=$mpicxx_path
|
|
|
+ CXXLD=mpicxx_path
|
|
|
fi
|
|
|
|
|
|
AC_ARG_WITH(mpi-master-slave-multiple-thread, [AS_HELP_STRING([--with-mpi-master-slave-multiple-thread])],
|
|
|
@@ -603,7 +610,7 @@ then
|
|
|
INCLUDE_PTHREAD_H='#include <pthread.h>'
|
|
|
fi
|
|
|
|
|
|
-AC_CHECK_TYPE([struct timespec],
|
|
|
+AC_CHECK_TYPE([struct timespec],
|
|
|
AC_DEFINE(STARPU_HAVE_STRUCT_TIMESPEC,[1],[struct timespec is defined]),
|
|
|
[], [
|
|
|
#include <sys/types.h>
|
|
|
@@ -1330,7 +1337,7 @@ if test x$enable_opencl = xyes -o x$enable_opencl = xmaybe; then
|
|
|
[AC_MSG_RESULT(no)
|
|
|
enable_opencl=no])
|
|
|
LIBS=$SAVED_LIBS
|
|
|
- ;;
|
|
|
+ ;;
|
|
|
*)
|
|
|
STARPU_LOOK_FOR_OPENCL()
|
|
|
# in case OpenCL was explicitely required, but is not available, this is an error
|
|
|
@@ -2136,7 +2143,7 @@ AC_MSG_RESULT($nmaxworkers)
|
|
|
AC_DEFINE_UNQUOTED(STARPU_NMAXWORKERS, [$nmaxworkers], [Maximum number of workers])
|
|
|
|
|
|
# Computes the maximun number of combined worker
|
|
|
-nmaxcombinedworkers=`expr $maxcpus + $nmaxmicthreads`
|
|
|
+nmaxcombinedworkers=`expr $maxcpus + $nmaxmicthreads`
|
|
|
AC_MSG_CHECKING(Maximum number of workers combinations)
|
|
|
AC_MSG_RESULT($nmaxcombinedworkers)
|
|
|
AC_DEFINE_UNQUOTED(STARPU_NMAX_COMBINEDWORKERS,
|
|
|
@@ -2445,9 +2452,9 @@ fi
|
|
|
if test x$build_mpi_master_slave = xyes; then
|
|
|
#Check if we can compile fortran cases
|
|
|
if test x$use_mpi_fort = xyes ; then
|
|
|
- F77LD=$mpifort_path
|
|
|
+ F77LD=$mpifort_path
|
|
|
FCLD=$mpifort_path
|
|
|
- F77=$mpifort_path
|
|
|
+ F77=$mpifort_path
|
|
|
FC=$mpifort_path
|
|
|
else
|
|
|
enable_build_fortran=no
|
|
|
@@ -2810,7 +2817,7 @@ if test x$enable_mlr = xyes -a "$starpu_windows" != "yes" ; then
|
|
|
LDFLAGS="-llapack $LDFLAGS"
|
|
|
else
|
|
|
if test x$blas_lib = xmkl; then
|
|
|
- AC_DEFINE(STARPU_MLR_MODEL, [1], [use mkl library])
|
|
|
+ AC_DEFINE(STARPU_MLR_MODEL, [1], [use mkl library])
|
|
|
else
|
|
|
AC_MSG_CHECKING(whether min-dgels is linked)
|
|
|
if test x"$DGELS_LIBS" != x; then
|