From 0020dd6f1b5992f30f6755a2a7a756098275feb6 Mon Sep 17 00:00:00 2001 From: Sven Verdoolaege Date: Sat, 20 Aug 2022 09:49:40 +0200 Subject: [PATCH] remove selection of default specialization Ever since barvinok-0.21-122-g2f7cca5df (optionc.c: move choice of which specialization to use to barvinok_options, Thu Sep 21 14:30:59 2006 +0200), the type of specialization selected at configure time only determines the default specialization. Since the actual choice of specialization type can be set at run time, there is little point in being able to set this default at configure time. Signed-off-by: Sven Verdoolaege --- configure.ac | 17 ----------------- doc/Internal.tex | 2 -- options.c | 10 +--------- version.c | 8 -------- 4 files changed, 1 insertion(+), 36 deletions(-) diff --git a/configure.ac b/configure.ac index 709a1d9..522db26 100644 --- a/configure.ac +++ b/configure.ac @@ -200,23 +200,6 @@ esac AM_CONDITIONAL(BUNDLED_PET, test $with_pet = bundled) AM_CONDITIONAL(BUILD_PET, test $with_pet = build) -AC_MSG_CHECKING(whether to use incremental algorithm) -AC_ARG_ENABLE(incremental, - [AS_HELP_STRING([--enable-incremental@<:@=bf|df@:>@], - [Enable incremental algorithm [bf]])], - [bv_cv_incremental=$enableval], [bv_cv_incremental="no"]) -AC_MSG_RESULT($bv_cv_incremental) -case $bv_cv_incremental in - yes | bf) - AC_DEFINE(USE_INCREMENTAL_BF,[], - [Use breadth-first incremental algorithm]) - ;; - df) - AC_DEFINE(USE_INCREMENTAL_DF,[], - [Use depth-first incremental algorithm]) - ;; -esac - AC_ARG_WITH(ntl, [AS_HELP_STRING([--with-ntl=system|build], [Which NTL to use [default=system]])]) diff --git a/doc/Internal.tex b/doc/Internal.tex index 911878d..8b2c239 100644 --- a/doc/Internal.tex +++ b/doc/Internal.tex @@ -335,8 +335,6 @@ If set to {\tt 0} then a direct specialization is performed using a random vector. Value {\tt 1} selects a depth first incremental specialization, while value {\tt 2} selects a breadth first incremental specialization. -The default is selected by the \ai[\tt]{--enable-incremental} -\ai[\tt]{configure} option. For more information we refer to~\citeN[Section~4.4.3]{Verdoolaege2005PhD}. \end{itemize} diff --git a/options.c b/options.c index a726164..dce3813 100644 --- a/options.c +++ b/options.c @@ -132,14 +132,6 @@ static void print_version(void) printf("%s", barvinok_version()); } -#ifdef USE_INCREMENTAL_BF -#define DEFAULT_SPECIALIZATION BV_SPECIALIZATION_BF -#elif defined USE_INCREMENTAL_DF -#define DEFAULT_SPECIALIZATION BV_SPECIALIZATION_DF -#else -#define DEFAULT_SPECIALIZATION BV_SPECIALIZATION_RANDOM -#endif - static struct isl_arg_choice specialization[] = { {"bf", BV_SPECIALIZATION_BF}, {"df", BV_SPECIALIZATION_DF}, @@ -210,7 +202,7 @@ ISL_ARG_LONG(struct barvinok_options, LLL_a, 0, "lll-reduction-num", 1, ISL_ARG_LONG(struct barvinok_options, LLL_b, 0, "lll-reduction-den", 1, "LLL reduction parameter denominator") ISL_ARG_CHOICE(struct barvinok_options, incremental_specialization, - 0, "specialization", specialization, DEFAULT_SPECIALIZATION, NULL) + 0, "specialization", specialization, BV_SPECIALIZATION_RANDOM, NULL) ISL_ARG_ULONG(struct barvinok_options, max_index, 0, "index", 1, "maximal index of simple cones in decomposition") ISL_ARG_BOOL(struct barvinok_options, primal, 0, "primal", 0, NULL) diff --git a/version.c b/version.c index b131cc5..720f6ec 100644 --- a/version.c +++ b/version.c @@ -6,14 +6,6 @@ const char *barvinok_version(void) { return GIT_HEAD_ID"\n" -#ifdef USE_INCREMENTAL_BF - " INCREMENTAL=BF" -#elif defined USE_INCREMENTAL_DF - " INCREMENTAL=DF" -#else - " -INCREMENTAL" -#endif - "\n" #ifdef HAVE_PET " +PET" #else -- 2.11.4.GIT