|
|
@@ -311,19 +311,23 @@ if test x$enable_simgrid = xyes ; then
|
|
|
if test x$enable_shared = xno ; then
|
|
|
# When linking statically, libtool does not realize we need libstdc++ for simgrid_cpp.cpp
|
|
|
SIMGRID_LIBS="$SIMGRID_LIBS -lstdc++"
|
|
|
- LDFLAGS="$LDFLAGS -lstdc++"
|
|
|
+ LIBS="$LIBS -lstdc++"
|
|
|
fi
|
|
|
|
|
|
- AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
|
|
|
- #ifdef HAVE_SIMGRID_MSG_H
|
|
|
- #include <simgrid/msg.h>
|
|
|
- #include <simgrid/host.h>
|
|
|
- #else
|
|
|
- #include <msg/msg.h>
|
|
|
- #endif
|
|
|
- ]])],,
|
|
|
- CXXFLAGS="-std=c++11 $CXXFLAGS"
|
|
|
- NVCCFLAGS="-std=c++11 $NVCCFLAGS")
|
|
|
+ case \ $CXXFLAGS\ in
|
|
|
+ *\ -std=*\ *) ;;
|
|
|
+ *)
|
|
|
+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
|
|
|
+ #ifdef STARPU_HAVE_SIMGRID_MSG_H
|
|
|
+ #include <simgrid/msg.h>
|
|
|
+ #include <simgrid/host.h>
|
|
|
+ #else
|
|
|
+ #include <msg/msg.h>
|
|
|
+ #endif
|
|
|
+ ]])],,
|
|
|
+ CXXFLAGS="-std=c++11 $CXXFLAGS")
|
|
|
+ ;;
|
|
|
+ esac
|
|
|
AC_LANG_POP([C++])
|
|
|
AC_ARG_ENABLE(simgrid-mc, [AS_HELP_STRING([--enable-simgrid-mc],
|
|
|
[Enable using Model Checker of simgrid])],
|
|
|
@@ -331,6 +335,7 @@ if test x$enable_simgrid = xyes ; then
|
|
|
if test x$enable_simgrid_mc = xyes ; then
|
|
|
AC_DEFINE(STARPU_SIMGRID_MC, [1], [Define this to enable Model Checker in simgrid execution])
|
|
|
AC_PATH_PROG([SIMGRID_MC], [simgrid-mc], [no], [$simgrid_dir/bin:$PATH])
|
|
|
+ LDFLAGS="$LDFLAGS -Wl,-znorelro -Wl,-znoseparate-code"
|
|
|
fi
|
|
|
fi
|
|
|
AM_CONDITIONAL(STARPU_SIMGRID_MC, test x$enable_simgrid_mc = xyes)
|
|
|
@@ -1444,6 +1449,25 @@ if test x$enable_cuda = xyes; then
|
|
|
STARPU_CUDA_LDFLAGS="$STARPU_CUDA_LDFLAGS -lcudart"
|
|
|
STARPU_CUFFT_LDFLAGS="-lcufft"
|
|
|
|
|
|
+ AC_LANG_PUSH([C++])
|
|
|
+ case \ $NVCCFLAGS\ in
|
|
|
+ *\ -std=*\ *) ;;
|
|
|
+ *)
|
|
|
+ SAVED_CXX="$CXX"
|
|
|
+ CXX="$NVCC"
|
|
|
+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
|
|
|
+ #ifdef STARPU_HAVE_SIMGRID_MSG_H
|
|
|
+ #include <simgrid/msg.h>
|
|
|
+ #include <simgrid/host.h>
|
|
|
+ #else
|
|
|
+ #include <msg/msg.h>
|
|
|
+ #endif
|
|
|
+ ]])],,
|
|
|
+ NVCCFLAGS="-std=c++11 $NVCCFLAGS")
|
|
|
+ CXX="$SAVED_CXX"
|
|
|
+ esac
|
|
|
+ AC_LANG_POP([C++])
|
|
|
+
|
|
|
if test "$F77" = "gfortran" -o "$FC" = "gfortran" ; then
|
|
|
STARPU_CUDA_FORTRAN_LDFLAGS="-lgfortran"
|
|
|
AC_SUBST(STARPU_CUDA_FORTRAN_LDFLAGS)
|
|
|
@@ -1486,7 +1510,7 @@ if test x$enable_cuda = xyes; then
|
|
|
])
|
|
|
],
|
|
|
[
|
|
|
- AC_MSG_ERROR([NVML found, but nvml.h could not be compiled])
|
|
|
+ AC_MSG_WARN([NVML found, but nvml.h could not be compiled])
|
|
|
have_valid_nvml="no"
|
|
|
]
|
|
|
)
|
|
|
@@ -3118,9 +3142,15 @@ AC_SUBST(BLAS_LIB,$blas_lib)
|
|
|
# Multiple linear regression #
|
|
|
# #
|
|
|
###############################################################################
|
|
|
+if test x$enable_simgrid = xyes ; then
|
|
|
+ # There is no need for building mlr models in simgrid mode
|
|
|
+ default_enable_mlr=no
|
|
|
+else
|
|
|
+ default_enable_mlr=yes
|
|
|
+fi
|
|
|
AC_ARG_ENABLE(mlr, [AS_HELP_STRING([--disable-mlr],
|
|
|
[Disable multiple linear regression models])],
|
|
|
- enable_mlr=$enableval, enable_mlr=yes)
|
|
|
+ enable_mlr=$enableval, enable_mlr=$default_enable_mlr)
|
|
|
|
|
|
AC_MSG_CHECKING(whether multiple linear regression models are disabled)
|
|
|
if test x$enable_mlr = xyes -a "$starpu_windows" != "yes" ; then
|
|
|
@@ -3596,6 +3626,8 @@ AC_CONFIG_COMMANDS([executable-scripts], [
|
|
|
test -e tests/microbenchs/parallel_independent_heterogeneous_tasks.sh || ln -sf $ac_abs_top_srcdir/tests/microbenchs/parallel_independent_heterogeneous_tasks.sh tests/microbenchs/
|
|
|
test -e tests/microbenchs/parallel_independent_homogeneous_tasks_data.sh || ln -sf $ac_abs_top_srcdir/tests/microbenchs/parallel_independent_homogeneous_tasks_data.sh tests/microbenchs/
|
|
|
test -e tests/microbenchs/parallel_independent_homogeneous_tasks.sh || ln -sf $ac_abs_top_srcdir/tests/microbenchs/parallel_independent_homogeneous_tasks.sh tests/microbenchs/
|
|
|
+ test -e tests/microbenchs/parallel_redux_homogeneous_tasks_data.sh || ln -sf $ac_abs_top_srcdir/tests/microbenchs/parallel_redux_homogeneous_tasks_data.sh tests/microbenchs/
|
|
|
+ test -e tests/microbenchs/parallel_redux_heterogeneous_tasks_data.sh || ln -sf $ac_abs_top_srcdir/tests/microbenchs/parallel_redux_heterogeneous_tasks_data.sh tests/microbenchs/
|
|
|
mkdir -p tests/datawizard
|
|
|
test -e tests/datawizard/locality.sh || ln -sf $ac_abs_top_srcdir/tests/datawizard/locality.sh tests/datawizard/
|
|
|
mkdir -p tests/overlap
|
