Skip to content

Commit

Permalink
remove non-used TSIL support
Browse files Browse the repository at this point in the history
  • Loading branch information
Alexander Voigt authored and Alexander Voigt committed Mar 29, 2018
1 parent d323a08 commit 215dfe6
Show file tree
Hide file tree
Showing 15 changed files with 7 additions and 261 deletions.
12 changes: 0 additions & 12 deletions addons/test_call_tsil/call_tsil.cpp

This file was deleted.

6 changes: 0 additions & 6 deletions addons/test_call_tsil/call_tsil.hpp

This file was deleted.

110 changes: 0 additions & 110 deletions addons/test_call_tsil/module.mk

This file was deleted.

9 changes: 0 additions & 9 deletions addons/test_call_tsil/run.cpp

This file was deleted.

1 change: 0 additions & 1 deletion cmake/FlexibleSUSYBuildOptions.cmake
Expand Up @@ -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)
6 changes: 0 additions & 6 deletions config/Makefile.in
Expand Up @@ -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@
Expand Down Expand Up @@ -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 :=
Expand Down Expand Up @@ -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)"
Expand All @@ -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:"
Expand Down
5 changes: 0 additions & 5 deletions config/config.h.in
Expand Up @@ -53,8 +53,6 @@
#define SQLITELIBS "@SQLITELIBS@"
#define SQLITEFLAGS "@SQLITEFLAGS@"
#define THREADLIBS "@THREADLIBS@"
#define TSILLIBS "@TSILLIBS@"
#define TSILFLAGS "@TSILFLAGS@"

/* Switches */

Expand Down Expand Up @@ -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@

Expand Down
3 changes: 0 additions & 3 deletions config/config_cmake.h.in
Expand Up @@ -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

Expand Down
13 changes: 1 addition & 12 deletions config/flexiblesusy-config.in
Expand Up @@ -43,8 +43,6 @@ sqliteflags="@SQLITEFLAGS@"
sqlitelibs="@SQLITELIBS@"
static_lib_cmd="@STATIC_LIB_CMD@"
threadlibs="@THREADLIBS@"
tsilflags="@TSILFLAGS@"
tsillibs="@TSILLIBS@"
gm2calclibs=""

#_____________________________________________________________________
Expand Down Expand Up @@ -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"

Expand Down Expand Up @@ -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() {
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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-<addon> Test if <addon> is compiled in
--with-<solver> Test if BVP <solver> is compiled in
--with-<model> Test if <model> is compiled in
Expand Down Expand Up @@ -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-//'`
Expand Down Expand Up @@ -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" ;;
Expand Down

0 comments on commit 215dfe6

Please sign in to comment.