Skip to content
Snippets Groups Projects
Commit b9f10dad authored by Matthieu Schaller's avatar Matthieu Schaller
Browse files

Better help string for the alternative mallocs and better configuration summary.

parent 4e6c833b
No related branches found
No related tags found
1 merge request!552More standard ways of linking other allocators - Correctly apply tc-malloc recommended flags.
...@@ -631,7 +631,7 @@ AM_CONDITIONAL([HAVEFFTW],[test -n "$FFTW_LIBS"]) ...@@ -631,7 +631,7 @@ AM_CONDITIONAL([HAVEFFTW],[test -n "$FFTW_LIBS"])
# Check for -lprofiler usually part of the gperftools along with tcmalloc. # Check for -lprofiler usually part of the gperftools along with tcmalloc.
have_profiler="no" have_profiler="no"
AC_ARG_WITH([profiler], AC_ARG_WITH([profiler],
[AS_HELP_STRING([--with-profiler], [AS_HELP_STRING([--with-profiler=PATH],
[use cpu profiler library or specify the directory with lib @<:@yes/no@:>@] [use cpu profiler library or specify the directory with lib @<:@yes/no@:>@]
)], )],
[with_profiler="$withval"], [with_profiler="$withval"],
...@@ -663,7 +663,7 @@ have_special_allocator="no" ...@@ -663,7 +663,7 @@ have_special_allocator="no"
# Check for tcmalloc a fast malloc that is part of the gperftools. # Check for tcmalloc a fast malloc that is part of the gperftools.
have_tcmalloc="no" have_tcmalloc="no"
AC_ARG_WITH([tcmalloc], AC_ARG_WITH([tcmalloc],
[AS_HELP_STRING([--with-tcmalloc], [AS_HELP_STRING([--with-tcmalloc=PATH],
[use tcmalloc library or specify the directory with lib @<:@yes/no@:>@] [use tcmalloc library or specify the directory with lib @<:@yes/no@:>@]
)], )],
[with_tcmalloc="$withval"], [with_tcmalloc="$withval"],
...@@ -696,9 +696,9 @@ if test "x$with_tcmalloc" != "xno"; then ...@@ -696,9 +696,9 @@ if test "x$with_tcmalloc" != "xno"; then
if test "$have_tcmalloc" = "yes"; then if test "$have_tcmalloc" = "yes"; then
TCMALLOC_LIBS="$tclibs" TCMALLOC_LIBS="$tclibs"
AC_DEFINE([HAVE_TCMALLOC],1,[The tc-malloc library appears to be present.]) AC_DEFINE([HAVE_TCMALLOC],1,[The tcmalloc library appears to be present.])
have_special_allocator="yes" have_special_allocator="tcmalloc"
# Prevent compilers that replace the calls with built-ins (GNU 99) from doing so. # Prevent compilers that replace the calls with built-ins (GNU 99) from doing so.
case "$ax_cv_c_compiler_vendor" in case "$ax_cv_c_compiler_vendor" in
...@@ -717,7 +717,7 @@ AM_CONDITIONAL([HAVETCMALLOC],[test -n "$TCMALLOC_LIBS"]) ...@@ -717,7 +717,7 @@ AM_CONDITIONAL([HAVETCMALLOC],[test -n "$TCMALLOC_LIBS"])
# Check for jemalloc another fast malloc that is good with contention. # Check for jemalloc another fast malloc that is good with contention.
have_jemalloc="no" have_jemalloc="no"
AC_ARG_WITH([jemalloc], AC_ARG_WITH([jemalloc],
[AS_HELP_STRING([--with-jemalloc], [AS_HELP_STRING([--with-jemalloc=PATH],
[use jemalloc library or specify the directory with lib @<:@yes/no@:>@] [use jemalloc library or specify the directory with lib @<:@yes/no@:>@]
)], )],
[with_jemalloc="$withval"], [with_jemalloc="$withval"],
...@@ -739,9 +739,9 @@ if test "x$with_jemalloc" != "xno"; then ...@@ -739,9 +739,9 @@ if test "x$with_jemalloc" != "xno"; then
if test "$have_jemalloc" = "yes"; then if test "$have_jemalloc" = "yes"; then
JEMALLOC_LIBS="$jelibs" JEMALLOC_LIBS="$jelibs"
AC_DEFINE([HAVE_JEMALLOC],1,[The je-malloc library appears to be present.]) AC_DEFINE([HAVE_JEMALLOC],1,[The jemalloc library appears to be present.])
have_special_allocator="yes" have_special_allocator="jemalloc"
# Prevent compilers that replace the regular calls with built-ins (GNU 99) from doing so. # Prevent compilers that replace the regular calls with built-ins (GNU 99) from doing so.
case "$ax_cv_c_compiler_vendor" in case "$ax_cv_c_compiler_vendor" in
...@@ -760,7 +760,7 @@ AM_CONDITIONAL([HAVEJEMALLOC],[test -n "$JEMALLOC_LIBS"]) ...@@ -760,7 +760,7 @@ AM_CONDITIONAL([HAVEJEMALLOC],[test -n "$JEMALLOC_LIBS"])
# Check for tbbmalloc, Intel's fast and parallel allocator # Check for tbbmalloc, Intel's fast and parallel allocator
have_tbbmalloc="no" have_tbbmalloc="no"
AC_ARG_WITH([tbbmalloc], AC_ARG_WITH([tbbmalloc],
[AS_HELP_STRING([--with-tbbmalloc], [AS_HELP_STRING([--with-tbbmalloc=PATH],
[use tbbmalloc library or specify the directory with lib @<:@yes/no@:>@] [use tbbmalloc library or specify the directory with lib @<:@yes/no@:>@]
)], )],
[with_tbbmalloc="$withval"], [with_tbbmalloc="$withval"],
...@@ -782,9 +782,9 @@ if test "x$with_tbbmalloc" != "xno"; then ...@@ -782,9 +782,9 @@ if test "x$with_tbbmalloc" != "xno"; then
if test "$have_tbbmalloc" = "yes"; then if test "$have_tbbmalloc" = "yes"; then
TBBMALLOC_LIBS="$tbblibs" TBBMALLOC_LIBS="$tbblibs"
AC_DEFINE([HAVE_TBBMALLOC],1,[The TBB-malloc library appears to be present.]) AC_DEFINE([HAVE_TBBMALLOC],1,[The TBBmalloc library appears to be present.])
have_special_allocator="yes" have_special_allocator="TBBmalloc"
# Prevent compilers that replace the calls with built-ins (GNU 99) from doing so. # Prevent compilers that replace the calls with built-ins (GNU 99) from doing so.
case "$ax_cv_c_compiler_vendor" in case "$ax_cv_c_compiler_vendor" in
...@@ -821,7 +821,8 @@ if test "$with_hdf5" = "yes"; then ...@@ -821,7 +821,8 @@ if test "$with_hdf5" = "yes"; then
if test "$enable_parallel_hdf5" = "yes"; then if test "$enable_parallel_hdf5" = "yes"; then
AC_MSG_CHECKING([for HDF5 parallel support]) AC_MSG_CHECKING([for HDF5 parallel support])
# Check if the library is capable, the header should define H5_HAVE_PARALLEL.
# Check if the library is capable, the header should define H5_HAVE_PARALLEL.
AC_COMPILE_IFELSE([AC_LANG_SOURCE([[ AC_COMPILE_IFELSE([AC_LANG_SOURCE([[
#include "hdf5.h" #include "hdf5.h"
...@@ -1288,23 +1289,21 @@ AC_MSG_RESULT([ ...@@ -1288,23 +1289,21 @@ AC_MSG_RESULT([
$PACKAGE_NAME v.$PACKAGE_VERSION $PACKAGE_NAME v.$PACKAGE_VERSION
Compiler : $CC Compiler : $CC
- vendor : $ax_cv_c_compiler_vendor - vendor : $ax_cv_c_compiler_vendor
- version : $ax_cv_c_compiler_version - version : $ax_cv_c_compiler_version
- flags : $CFLAGS - flags : $CFLAGS
MPI enabled : $enable_mpi MPI enabled : $enable_mpi
HDF5 enabled : $with_hdf5 HDF5 enabled : $with_hdf5
- parallel : $have_parallel_hdf5 - parallel : $have_parallel_hdf5
Metis enabled : $have_metis Metis enabled : $have_metis
FFTW3 enabled : $have_fftw FFTW3 enabled : $have_fftw
GSL enabled : $have_gsl GSL enabled : $have_gsl
libNUMA enabled : $have_numa libNUMA enabled : $have_numa
GRACKLE enabled : $have_grackle GRACKLE enabled : $have_grackle
Using tbbmalloc : $have_tbbmalloc Special allocators : $have_special_allocator
Using tcmalloc : $have_tcmalloc CPU profiler : $have_profiler
Using jemalloc : $have_jemalloc Pthread barriers : $have_pthread_barrier
CPU profiler : $have_profiler
Pthread barriers : $have_pthread_barrier
Hydro scheme : $with_hydro Hydro scheme : $with_hydro
Dimensionality : $with_dimension Dimensionality : $with_dimension
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment