From 215dfe6189a2729a2ee006cb5c27dcef85415f0e Mon Sep 17 00:00:00 2001 From: Alexander Voigt Date: Thu, 29 Mar 2018 18:35:18 +0200 Subject: [PATCH] remove non-used TSIL support --- addons/test_call_tsil/call_tsil.cpp | 12 --- addons/test_call_tsil/call_tsil.hpp | 6 -- addons/test_call_tsil/module.mk | 110 --------------------------- addons/test_call_tsil/run.cpp | 9 --- cmake/FlexibleSUSYBuildOptions.cmake | 1 - config/Makefile.in | 6 -- config/config.h.in | 5 -- config/config_cmake.h.in | 3 - config/flexiblesusy-config.in | 13 +--- configure | 76 ------------------ src/build_info.cpp | 7 -- src/module.mk | 4 +- templates/module.addon.mk.in | 6 +- templates/module.mk.in | 6 +- utils/install-bash_completions.bash | 4 - 15 files changed, 7 insertions(+), 261 deletions(-) delete mode 100644 addons/test_call_tsil/call_tsil.cpp delete mode 100644 addons/test_call_tsil/call_tsil.hpp delete mode 100644 addons/test_call_tsil/module.mk delete mode 100644 addons/test_call_tsil/run.cpp diff --git a/addons/test_call_tsil/call_tsil.cpp b/addons/test_call_tsil/call_tsil.cpp deleted file mode 100644 index b22b79c89..000000000 --- a/addons/test_call_tsil/call_tsil.cpp +++ /dev/null @@ -1,12 +0,0 @@ -#include "call_tsil.hpp" -#include "tsil_cpp.h" - -double call_A(double m, double q) -{ - TSIL_REAL m2 = m*m; - TSIL_REAL q2 = q*q; - - TSIL_COMPLEXCPP result = TSIL_A_(m2, q2); - - return std::real(result); -} diff --git a/addons/test_call_tsil/call_tsil.hpp b/addons/test_call_tsil/call_tsil.hpp deleted file mode 100644 index 3c138d46a..000000000 --- a/addons/test_call_tsil/call_tsil.hpp +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef CALL_TSIL_HPP -#define CALL_TSIL_HPP - -double call_A(double m, double q); - -#endif diff --git a/addons/test_call_tsil/module.mk b/addons/test_call_tsil/module.mk deleted file mode 100644 index 124b805b8..000000000 --- a/addons/test_call_tsil/module.mk +++ /dev/null @@ -1,110 +0,0 @@ -DIR := addons/test_call_tsil -MODNAME := test_call_tsil -WITH_$(MODNAME) := yes - -LIBtest_call_tsil_MK := $(DIR)/module.mk - -# source files -LIBtest_call_tsil_SRC := \ - $(DIR)/call_tsil.cpp - -# main() -EXEtest_call_tsil_SRC := \ - $(DIR)/run.cpp - -# header files -LIBtest_call_tsil_HDR := \ - $(DIR)/call_tsil.hpp - -LIBtest_call_tsil_OBJ := \ - $(patsubst %.cpp, %.o, $(filter %.cpp, $(LIBtest_call_tsil_SRC))) \ - $(patsubst %.c, %.o, $(filter %.c, $(LIBtest_call_tsil_SRC))) \ - $(patsubst %.f, %.o, $(filter %.f, $(LIBtest_call_tsil_SRC))) - -EXEtest_call_tsil_OBJ := \ - $(patsubst %.cpp, %.o, $(filter %.cpp, $(EXEtest_call_tsil_SRC))) \ - $(patsubst %.c, %.o, $(filter %.c, $(EXEtest_call_tsil_SRC))) \ - $(patsubst %.f, %.o, $(filter %.f, $(EXEtest_call_tsil_SRC))) - -LIBtest_call_tsil_DEP := \ - $(LIBtest_call_tsil_OBJ:.o=.d) - -EXEtest_call_tsil_DEP := \ - $(EXEtest_call_tsil_OBJ:.o=.d) - -EXEtest_call_tsil_EXE := \ - $(patsubst %.cpp, %.x, $(filter %.cpp, $(EXEtest_call_tsil_SRC))) \ - $(patsubst %.f, %.x, $(filter %.f, $(EXEtest_call_tsil_SRC))) - -LIBtest_call_tsil := \ - $(DIR)/lib$(MODNAME)$(MODULE_LIBEXT) - -LIBtest_call_tsil_INSTALL_DIR := \ - $(INSTALL_DIR)/$(DIR) - -.PHONY: all-$(MODNAME) clean-$(MODNAME) clean-$(MODNAME)-dep \ - clean-$(MODNAME)-lib clean-$(MODNAME)-obj clean-$(MODNAME)-src \ - distclean-$(MODNAME) - -all-$(MODNAME): $(LIBtest_call_tsil) $(EXEtest_call_tsil_EXE) - @true - -clean-$(MODNAME)-dep: - -rm -f $(LIBtest_call_tsil_DEP) - -rm -f $(EXEtest_call_tsil_DEP) - -clean-$(MODNAME)-lib: - -rm -f $(LIBtest_call_tsil) - -clean-$(MODNAME)-obj: - -rm -f $(LIBtest_call_tsil_OBJ) - -rm -f $(EXEtest_call_tsil_OBJ) - -# BEGIN: NOT EXPORTED ########################################## -# remove generated files -clean-$(MODNAME)-src: - @true - -clean-$(MODNAME): clean-$(MODNAME)-src -# END: NOT EXPORTED ########################################## - -clean-$(MODNAME): clean-$(MODNAME)-dep clean-$(MODNAME)-lib clean-$(MODNAME)-obj - -rm -f $(EXEtest_call_tsil_EXE) - -distclean-$(MODNAME): clean-$(MODNAME) - -clean-obj:: clean-$(MODNAME)-obj - -clean:: clean-$(MODNAME) - -distclean:: distclean-$(MODNAME) - -ifneq ($(INSTALL_DIR),) -install-src:: - install -d $(LIBtest_call_tsil_INSTALL_DIR) - install -m u=rw,g=r,o=r $(LIBtest_call_tsil_SRC) $(LIBtest_call_tsil_INSTALL_DIR) - install -m u=rw,g=r,o=r $(LIBtest_call_tsil_HDR) $(LIBtest_call_tsil_INSTALL_DIR) - install -m u=rw,g=r,o=r $(EXEtest_call_tsil_SRC) $(LIBtest_call_tsil_INSTALL_DIR) - $(INSTALL_STRIPPED) $(LIBtest_call_tsil_MK) $(LIBtest_call_tsil_INSTALL_DIR) -m u=rw,g=r,o=r -endif - -$(LIBtest_call_tsil_DEP) $(EXEtest_call_tsil_DEP) $(LIBtest_call_tsil_OBJ) $(EXEtest_call_tsil_OBJ): CPPFLAGS += $(GSLFLAGS) $(EIGENFLAGS) $(BOOSTFLAGS) - -ifneq (,$(findstring yes,$(ENABLE_LOOPTOOLS)$(ENABLE_FFLITE))) -$(LIBtest_call_tsil_DEP) $(EXEtest_call_tsil_DEP) $(LIBtest_call_tsil_OBJ) $(EXEtest_call_tsil_OBJ): CPPFLAGS += $(LOOPFUNCFLAGS) -endif - -ifeq ($(ENABLE_TSIL),yes) -$(LIBtest_call_tsil_DEP) $(EXEtest_call_tsil_DEP) $(LIBtest_call_tsil_OBJ) $(EXEtest_call_tsil_OBJ): CPPFLAGS += $(TSILFLAGS) -endif - -$(LIBtest_call_tsil): $(LIBtest_call_tsil_OBJ) - $(MODULE_MAKE_LIB_CMD) $@ $^ - -$(EXEtest_call_tsil_EXE): $(EXEtest_call_tsil_OBJ) $(LIBtest_call_tsil) $(LIBFLEXI) $(filter-out -%,$(LOOPFUNCLIBS)) - $(CXX) -o $@ $(call abspathx,$^) $(filter -%,$(LOOPFUNCLIBS)) $(GSLLIBS) $(BOOSTTHREADLIBS) $(THREADLIBS) $(LAPACKLIBS) $(BLASLIBS) $(TSILLIBS) $(FLIBS) - -ALLDEP += $(LIBtest_call_tsil_DEP) $(EXEtest_call_tsil_DEP) -ALLSRC += $(LIBtest_call_tsil_SRC) $(EXEtest_call_tsil_SRC) -ALLLIB += $(LIBtest_call_tsil) -ALLEXE += $(EXEtest_call_tsil_EXE) diff --git a/addons/test_call_tsil/run.cpp b/addons/test_call_tsil/run.cpp deleted file mode 100644 index be552884d..000000000 --- a/addons/test_call_tsil/run.cpp +++ /dev/null @@ -1,9 +0,0 @@ -#include "call_tsil.hpp" -#include - -int main() -{ - std::cout << "C++: A0(100,100) = " << call_A(100., 100.) << '\n'; - - return 0; -} diff --git a/cmake/FlexibleSUSYBuildOptions.cmake b/cmake/FlexibleSUSYBuildOptions.cmake index dad24f6cd..d0fac6217 100644 --- a/cmake/FlexibleSUSYBuildOptions.cmake +++ b/cmake/FlexibleSUSYBuildOptions.cmake @@ -28,4 +28,3 @@ option(ENABLE_FFLITE "Enable use of the FFLite loop functions (default: no)" OFF option(ENABLE_LAPACK "Enable use of the LAPACK library (default: yes)" ON) # option(ENABLE_LOOPTOOLS "Enable use of the LoopTools library (default: no)" OFF) # option(ENABLE_SQLITE "Enable use of the SQLite3 library (default: ON)" ON) -# option(ENABLE_TSIL "Enable use of the TSIL library (default: ON)" ON) diff --git a/config/Makefile.in b/config/Makefile.in index 624d9b008..0d7be68ca 100644 --- a/config/Makefile.in +++ b/config/Makefile.in @@ -22,7 +22,6 @@ ENABLE_SHARED_LIBS := @ENABLE_SHARED_LIBS@ ENABLE_SQLITE := @ENABLE_SQLITE@ ENABLE_STATIC := @ENABLE_STATIC@ ENABLE_THREADS := @ENABLE_THREADS@ -ENABLE_TSIL := @ENABLE_TSIL@ # C/C++ preprocessor defines ENABLE_COLORS := @ENABLE_COLORS@ @@ -78,8 +77,6 @@ HIMALAYALIBS := @HIMALAYALIBS@ SQLITEFLAGS := @SQLITEFLAGS@ SQLITELIBS := @SQLITELIBS@ THREADLIBS := @THREADLIBS@ -TSILFLAGS := @TSILFLAGS@ -TSILLIBS := @TSILLIBS@ # the modules add their dependency files to this variable ALLDEP := @@ -288,8 +285,6 @@ showbuild: @echo "SQLITELIBS = $(SQLITELIBS)" @echo "SQLITEFLAGS = $(SQLITEFLAGS)" @echo "THREADLIBS = $(THREADLIBS)" - @echo "TSILLIBS = $(TSILLIBS)" - @echo "TSILFLAGS = $(TSILFLAGS)" @echo "" @echo "ENABLE_COLORS = $(ENABLE_COLORS)" @echo "ENABLE_COMPILE = $(ENABLE_COMPILE)" @@ -307,7 +302,6 @@ showbuild: @echo "ENABLE_SQLITE = $(ENABLE_SQLITE)" @echo "ENABLE_STATIC = $(ENABLE_STATIC)" @echo "ENABLE_THREADS = $(ENABLE_THREADS)" - @echo "ENABLE_TSIL = $(ENABLE_TSIL)" @echo "ENABLE_VERBOSE = $(ENABLE_VERBOSE)" @echo "" @echo "The list of modules to be built:" diff --git a/config/config.h.in b/config/config.h.in index 475b23734..f78d31c3d 100644 --- a/config/config.h.in +++ b/config/config.h.in @@ -53,8 +53,6 @@ #define SQLITELIBS "@SQLITELIBS@" #define SQLITEFLAGS "@SQLITEFLAGS@" #define THREADLIBS "@THREADLIBS@" -#define TSILLIBS "@TSILLIBS@" -#define TSILFLAGS "@TSILFLAGS@" /* Switches */ @@ -100,9 +98,6 @@ /* Enable multi-threading */ @DEFINE_ENABLE_THREADS@ -/* Enable tsil */ -@DEFINE_ENABLE_TSIL@ - /* Enable two-scale BVP solver */ @DEFINE_ENABLE_TWO_SCALE_SOLVER@ diff --git a/config/config_cmake.h.in b/config/config_cmake.h.in index 0685def6b..e21bc5136 100644 --- a/config/config_cmake.h.in +++ b/config/config_cmake.h.in @@ -72,9 +72,6 @@ /* Enable multi-threading */ #cmakedefine ENABLE_THREADS 1 -/* Enable tsil */ -#cmakedefine ENABLE_TSIL 1 - /* Enable two-scale BVP solver */ #cmakedefine ENABLE_TWO_SCALE_SOLVER 1 diff --git a/config/flexiblesusy-config.in b/config/flexiblesusy-config.in index da40dd4a9..2b9b24f9a 100644 --- a/config/flexiblesusy-config.in +++ b/config/flexiblesusy-config.in @@ -43,8 +43,6 @@ sqliteflags="@SQLITEFLAGS@" sqlitelibs="@SQLITELIBS@" static_lib_cmd="@STATIC_LIB_CMD@" threadlibs="@THREADLIBS@" -tsilflags="@TSILFLAGS@" -tsillibs="@TSILLIBS@" gm2calclibs="" #_____________________________________________________________________ @@ -128,9 +126,6 @@ create_include_directives_for_external_modules() { [ "x@ENABLE_HIMALAYA@" = xyes ] && \ incl="$incl $himalayaflags" - [ "x@ENABLE_TSIL@" = xyes ] && \ - incl="$incl $tsilflags" - [ "x@ENABLE_LOOPTOOLS@" = xyes -a "x@ENABLE_FFLITE@" = xyes ] && \ incl="$incl $loopfuncflags" @@ -176,7 +171,7 @@ cppflags_without_modules="$cppflags_from_configure $incl_external_modules" cppflags="$cppflags_from_configure $incl_FS_modules $incl_external_modules" flexiblesusy_libs="$(create_flexiblesusy_libs)" compile_cmd="$cxx $cppflags $cxxflags" -libs="$ldflags $flexiblesusy_libs $(create_gm2calc_libs) $loopfunclibs $himalayalibs $gsllibs $boostthreadlibs $lapacklibs $blaslibs $flibs $sqlitelibs $tsillibs $threadlibs $ldlibs" +libs="$ldflags $flexiblesusy_libs $(create_gm2calc_libs) $loopfunclibs $himalayalibs $gsllibs $boostthreadlibs $lapacklibs $blaslibs $flibs $sqlitelibs $threadlibs $ldlibs" modules="$(create_module_list)" help() { @@ -215,7 +210,6 @@ Options: --enable-sqlite Test if SQLite is enabled --enable-static Test if static executables are build --enable-threads Test if multi-threading is enabled - --enable-tsil Test if TSIL is linked in --enable-verbose Test if verbose mode is enabled --fc Print Fortran compiler, FC --fflags Print Fortran flags, FFLAGS @@ -244,8 +238,6 @@ Options: --sqlitelibs Print SQLite libararies, SQLITELIBS, SQLITELIBS --static-lib-cmd Print command to build static library, STATIC_LIB_CMD --threadlibs Print thread library, THREADLIBS - --tsilflags Print TSIL flags, TSILFLAGS - --tsillibs Print TSIL libraries, TSILLIBS --with- Test if is compiled in --with- Test if BVP is compiled in --with- Test if is compiled in @@ -302,8 +294,6 @@ while test $# -gt 0; do --sqlitelibs) out="$out $sqlitelibs" ;; --static-lib-cmd) out="$out $static_lib_cmd" ;; --threadlibs) out="$out $threadlibs" ;; - --tsilflags) out="$out $tsilflags" ;; - --tsillibs) out="$out $tsillibs" ;; --with-*) ### Check for models and addons f=`echo $1 | sed 's/--with-//'` @@ -335,7 +325,6 @@ while test $# -gt 0; do --enable-sqlite) out="$out @ENABLE_SQLITE@" ;; --enable-static) out="$out @ENABLE_STATIC@" ;; --enable-threads) out="$out @ENABLE_THREADS@" ;; - --enable-tsil) out="$out @ENABLE_TSIL@" ;; --enable-verbose) out="$out @ENABLE_VERBOSE@" ;; --version|-v) out="$out $version" ;; diff --git a/configure b/configure index ae962ae21..c6aeb3dd2 100755 --- a/configure +++ b/configure @@ -98,7 +98,6 @@ options=" \ enable_sqlite \ enable_static \ enable_threads \ - enable_tsil \ enable_verbose \ " @@ -128,7 +127,6 @@ enable_sqlite="automatic" enable_shared_libs="no" enable_static="no" enable_threads="automatic" -enable_tsil="automatic" enable_verbose="no" # corresponding preprocessor define statements @@ -145,7 +143,6 @@ DEFINE_ENABLE_ODEINT="#undef ENABLE_ODEINT" DEFINE_ENABLE_SILENT="#undef ENABLE_SILENT" DEFINE_ENABLE_SQLITE="#undef ENABLE_SQLITE" DEFINE_ENABLE_THREADS="#define ENABLE_THREADS 1" -DEFINE_ENABLE_TSIL="#undef ENABLE_TSIL" DEFINE_ENABLE_VERBOSE="#undef ENABLE_VERBOSE" DEFINE_ENABLE_TWO_SCALE_SOLVER="#undef ENABLE_TWO_SCALE_SOLVER" DEFINE_ENABLE_LATTICE_SOLVER="#undef ENABLE_LATTICE_SOLVER" @@ -201,8 +198,6 @@ himalaya_lib_dir="" himalaya_inc_dir="" sqlite_lib_dir="" sqlite_inc_dir="" -tsil_lib_dir="" -tsil_inc_dir="" # available RG solvers SOLVERS="two_scale semi_analytic" available_solvers="two_scale lattice semi_analytic" @@ -2154,54 +2149,6 @@ check_sqlite() { fi } -#_____________________________________________________________________ -check_tsil_libs() { - check_library "libtsil" "$tsil_lib_dir" \ - "$default_lib_paths" - if test "x$found_lib" = "x" ; then - return 1 - else - local TSILLIBS_="-ltsil" - if [ -z "$tsil_lib_dir" ]; then - # assume that the linker will look in the default paths - TSILLIBS="$TSILLIBS_" - else - TSILLIBS="-L$tsil_lib_dir $TSILLIBS_" - fi - fi - return 0 -} - -#_____________________________________________________________________ -check_tsil_incl() { - check_header "tsil.h" "$tsil_inc_dir" \ - "$default_inc_paths" - if test "x$found_hdr" = "x" ; then - return 1 - else - # assume that the compiler will look in the default paths - if [ -n "$tsil_inc_dir" ]; then - TSILFLAGS="-I$tsil_inc_dir" - fi - fi - return 0 -} - -#_____________________________________________________________________ -check_tsil() { - if test "x$enable_tsil" != "xno" ; then - if check_tsil_incl && check_tsil_libs ; then - enable_tsil=yes - else - if [ "x$enable_tsil" = xyes ] ; then - message "Error: TSIL not found." - exit 1 - fi - enable_tsil=no - fi - fi -} - #_____________________________________________________________________ find_symbol_using_pkgconfig() { local symbol @@ -2693,17 +2640,6 @@ enable_defines() { logmsg " ${DEFINE_ENABLE_THREADS}" fi - if test "x${enable_tsil}" = "xyes" ; then - DEFINE_ENABLE_TSIL="#define ENABLE_TSIL 1" - message "Enabling TSIL" - logmsg " ${DEFINE_ENABLE_TSIL}" - else - enable_tsil=no - DEFINE_ENABLE_TSIL="#undef ENABLE_TSIL" - message "Disabling TSIL" - logmsg " ${DEFINE_ENABLE_TSIL}" - fi - for s in ${SOLVERS}; do case "$s" in all) @@ -2787,7 +2723,6 @@ replace_markers() { -e "s|@ENABLE_SILENT@|$enable_silent|" \ -e "s|@ENABLE_SQLITE@|$enable_sqlite|" \ -e "s|@ENABLE_THREADS@|$enable_threads|" \ - -e "s|@ENABLE_TSIL@|$enable_tsil|" \ -e "s|@ENABLE_VERBOSE@|$enable_verbose|" \ -e "s|@HIMALAYALIBS@|$HIMALAYALIBS|" \ -e "s|@HIMALAYAFLAGS@|$HIMALAYAFLAGS|" \ @@ -2802,8 +2737,6 @@ replace_markers() { -e "s|@STATIC_LIB_CMD@|$STATIC_LIB_CMD|" \ -e "s|@SQLITELIBS@|$SQLITELIBS|" \ -e "s|@SQLITEFLAGS@|$SQLITEFLAGS|" \ - -e "s|@TSILLIBS@|$TSILLIBS|" \ - -e "s|@TSILFLAGS@|$TSILFLAGS|" \ -e "s|@MODELS@|$MODELS|" \ -e "s|@ENABLE_SHARED_LIBS@|$enable_shared_libs|" \ -e "s|@ENABLE_STATIC@|$enable_static|" \ @@ -2847,7 +2780,6 @@ cat <