Commit b8063b9f authored by Praetorius, Simon's avatar Praetorius, Simon
Browse files

Merge branch 'cleanup/trailing_whitespaces' into 'master'

removed all trailing whitespaces in all git files

Cleanup of all files, i.e. removed all white-spaces at the end of lines

See merge request !3
parents 5f0ca3b5 836978e9
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
<body> <body>
<h1> Using AMDiS with cmake </h1> <h1> Using AMDiS with cmake </h1>
With this short page, I will show you, how to use the cmake buildsystem with AMDiS. The introduction consists of two main parts: With this short page, I will show you, how to use the cmake buildsystem with AMDiS. The introduction consists of two main parts:
<ol> <ol>
<li> <a href="#compiling" > compiling and installing AMDiS with CMake </a ></li> <li> <a href="#compiling" > compiling and installing AMDiS with CMake </a ></li>
<li> <a href="#using" > using the cmake installed AMDiS in your project </a ></li> <li> <a href="#using" > using the cmake installed AMDiS in your project </a ></li>
<li> <a href="#faq" > some frequently asked questions </a ></li> <li> <a href="#faq" > some frequently asked questions </a ></li>
...@@ -37,7 +37,7 @@ cd ${HOME}/work/amdis_build </pre> ...@@ -37,7 +37,7 @@ cd ${HOME}/work/amdis_build </pre>
The simplest configuration of AMDiS, i.e. without umfpack and parallelization, only sets the install destination to the directory "${HOME}/programs/". To do this, you have to call cmake with your install destination and the AMDiS source directory as commandline arguments The simplest configuration of AMDiS, i.e. without umfpack and parallelization, only sets the install destination to the directory "${HOME}/programs/". To do this, you have to call cmake with your install destination and the AMDiS source directory as commandline arguments
<pre class="desc" > <pre class="desc" >
cmake -DCMAKE_INSTALL_PREFIX=${HOME}/programs/ ../amdis/AMDiS</pre> cmake -DCMAKE_INSTALL_PREFIX=${HOME}/programs/ ../amdis/AMDiS</pre>
Compilation and installation is the same as with automake/autoconf: Compilation and installation is the same as with automake/autoconf:
<pre class="desc"> <pre class="desc">
make && make install </pre > make && make install </pre >
...@@ -80,7 +80,7 @@ and we have to tell cmake, that we need the library amdis and each library amdis ...@@ -80,7 +80,7 @@ and we have to tell cmake, that we need the library amdis and each library amdis
target_link_libraries(fooProg ${AMDIS_LIBRARIES}) target_link_libraries(fooProg ${AMDIS_LIBRARIES})
</pre > </pre >
If cmake does not find AMDiS, you have to set the variable AMDIS_DIR to the directory containing the file AMDiSConfig.cmake. This file resides in If cmake does not find AMDiS, you have to set the variable AMDIS_DIR to the directory containing the file AMDiSConfig.cmake. This file resides in
<pre class="desc" > <pre class="desc" >
${CMAKE_INSTALL_PREFIX}/share/amdis/ ${CMAKE_INSTALL_PREFIX}/share/amdis/
</pre > </pre >
......
set(COMPILER_TEST_DIR ${CMAKE_BINARY_DIR}/CMakeFiles/compilerTest) set(COMPILER_TEST_DIR ${CMAKE_BINARY_DIR}/CMakeFiles/compilerTest)
file(WRITE ${COMPILER_TEST_DIR}/CMakeLists.txt file(WRITE ${COMPILER_TEST_DIR}/CMakeLists.txt
"project(compilerTest) "project(compilerTest)
cmake_minimum_required(VERSION 2.8) cmake_minimum_required(VERSION 2.8)
add_definitions(-std=c++11) add_definitions(-std=c++11)
...@@ -28,25 +28,25 @@ file(WRITE ${COMPILER_TEST_DIR}/CMakeLists.txt ...@@ -28,25 +28,25 @@ file(WRITE ${COMPILER_TEST_DIR}/CMakeLists.txt
# RANGE-BASED FOR LOOPS # RANGE-BASED FOR LOOPS
add_executable(test_range_based_for test_range_based_for.cpp) add_executable(test_range_based_for test_range_based_for.cpp)
target_link_libraries(test_range_based_for)") target_link_libraries(test_range_based_for)")
file(WRITE ${COMPILER_TEST_DIR}/test_variadic_templ_class.cpp file(WRITE ${COMPILER_TEST_DIR}/test_variadic_templ_class.cpp
"template<class... Ts> struct A{}; int main(){A<int, double> a;}") "template<class... Ts> struct A{}; int main(){A<int, double> a;}")
file(WRITE ${COMPILER_TEST_DIR}/test_variadic_templ_fct.cpp file(WRITE ${COMPILER_TEST_DIR}/test_variadic_templ_fct.cpp
"template<class... Ts> void foo(Ts... ts){}; int main(){foo(1, 2.0, 3.0f);}") "template<class... Ts> void foo(Ts... ts){}; int main(){foo(1, 2.0, 3.0f);}")
file(WRITE ${COMPILER_TEST_DIR}/test_alias_templates.cpp file(WRITE ${COMPILER_TEST_DIR}/test_alias_templates.cpp
"template<class T> struct A{}; template<class T> using B=A<T>; int main(){B<int> b;}") "template<class T> struct A{}; template<class T> using B=A<T>; int main(){B<int> b;}")
file(WRITE ${COMPILER_TEST_DIR}/test_decltype.cpp file(WRITE ${COMPILER_TEST_DIR}/test_decltype.cpp
"int main(){decltype(1) a = 1;}") "int main(){decltype(1) a = 1;}")
file(WRITE ${COMPILER_TEST_DIR}/test_auto.cpp file(WRITE ${COMPILER_TEST_DIR}/test_auto.cpp
"int main(){auto a = 1;}") "int main(){auto a = 1;}")
file(WRITE ${COMPILER_TEST_DIR}/test_constexpr.cpp file(WRITE ${COMPILER_TEST_DIR}/test_constexpr.cpp
"constexpr int foo(){return 1;}; int main(){static constexpr int f = foo();}") "constexpr int foo(){return 1;}; int main(){static constexpr int f = foo();}")
file(WRITE ${COMPILER_TEST_DIR}/test_delegating_constructors.cpp file(WRITE ${COMPILER_TEST_DIR}/test_delegating_constructors.cpp
"struct A{ A(){} A(int) : A(){} }; int main(){ A a(1);}") "struct A{ A(){} A(int) : A(){} }; int main(){ A a(1);}")
file(WRITE ${COMPILER_TEST_DIR}/test_range_based_for.cpp file(WRITE ${COMPILER_TEST_DIR}/test_range_based_for.cpp
"int main(){ int vec[10]; for (int& elem : vec) { elem = 1; } }") "int main(){ int vec[10]; for (int& elem : vec) { elem = 1; } }")
set(COMPILER_CXX11_FEATURES "") set(COMPILER_CXX11_FEATURES "")
try_compile(TEST_VARIADIC_TEMPL_CLASS ${COMPILER_TEST_DIR} ${COMPILER_TEST_DIR} compilerTest test_variadic_templ_class) try_compile(TEST_VARIADIC_TEMPL_CLASS ${COMPILER_TEST_DIR} ${COMPILER_TEST_DIR} compilerTest test_variadic_templ_class)
......
#!/bin/sh #!/bin/sh
if test "$1" = "upgrade" ; then if test "$1" = "upgrade" ; then
exit 0 exit 0
fi fi
NEWDIRS_SEMI="@deb_add_dirs@" NEWDIRS_SEMI="@deb_add_dirs@"
......
...@@ -2,7 +2,7 @@ if (ENABLE_PARALLEL_DOMAIN) ...@@ -2,7 +2,7 @@ if (ENABLE_PARALLEL_DOMAIN)
option(ENABLE_ZOLTAN "Add support for the Parallel Partitioning suite Zoltan" false) option(ENABLE_ZOLTAN "Add support for the Parallel Partitioning suite Zoltan" false)
option(ENABLE_PARALLEL_SOLVERS "Add some problem dependent solver, e.g. Feti, Navier-Stokes and Cahn-Hilliard" true) option(ENABLE_PARALLEL_SOLVERS "Add some problem dependent solver, e.g. Feti, Navier-Stokes and Cahn-Hilliard" true)
mark_as_advanced(ENABLE_PARALLEL_SOLVERS) mark_as_advanced(ENABLE_PARALLEL_SOLVERS)
add_library(amdis_parallel INTERFACE) add_library(amdis_parallel INTERFACE)
target_sources(amdis PRIVATE target_sources(amdis PRIVATE
${SOURCE_DIR}/parallel/DofComm.cc ${SOURCE_DIR}/parallel/DofComm.cc
...@@ -21,14 +21,14 @@ if (ENABLE_PARALLEL_DOMAIN) ...@@ -21,14 +21,14 @@ if (ENABLE_PARALLEL_DOMAIN)
${SOURCE_DIR}/parallel/ParMetisPartitioner.cc ${SOURCE_DIR}/parallel/ParMetisPartitioner.cc
${SOURCE_DIR}/parallel/StdMpi.cc ${SOURCE_DIR}/parallel/StdMpi.cc
) )
target_sources(amdis_debug INTERFACE target_sources(amdis_debug INTERFACE
${SOURCE_DIR}/parallel/ParallelDebug.cc ${SOURCE_DIR}/parallel/ParallelDebug.cc
) )
target_compile_definitions(amdis_parallel INTERFACE target_compile_definitions(amdis_parallel INTERFACE
HAVE_PARALLEL_DOMAIN_AMDIS=1) HAVE_PARALLEL_DOMAIN_AMDIS=1)
# MPI is required # MPI is required
find_package(MPI REQUIRED) find_package(MPI REQUIRED)
if (MPI_FOUND) if (MPI_FOUND)
...@@ -37,15 +37,15 @@ if (ENABLE_PARALLEL_DOMAIN) ...@@ -37,15 +37,15 @@ if (ENABLE_PARALLEL_DOMAIN)
target_compile_options(amdis_parallel INTERFACE target_compile_options(amdis_parallel INTERFACE
${MPI_COMPILE_FLAGS}) ${MPI_COMPILE_FLAGS})
endif (MPI_FOUND) endif (MPI_FOUND)
# PETSc library is required # PETSc library is required
set(PETSC_EXECUTABLE_RUNS ON) set(PETSC_EXECUTABLE_RUNS ON)
include(find_petsc) include(find_petsc)
if (PETSc_FOUND) if (PETSc_FOUND)
target_include_directories(amdis_parallel INTERFACE target_include_directories(amdis_parallel INTERFACE
${PETSC_DIR}/include ${PETSC_DIR}/include
${PETSC_DIR}/${PETSC_ARCH}/include) ${PETSC_DIR}/${PETSC_ARCH}/include)
# parmetis is required # parmetis is required
find_file(PARMETIS_HEADER_FILE "parmetis.h" HINTS ${PETSC_DIR}/include ) find_file(PARMETIS_HEADER_FILE "parmetis.h" HINTS ${PETSC_DIR}/include )
if (PARMETIS_HEADER_FILE) if (PARMETIS_HEADER_FILE)
...@@ -54,7 +54,7 @@ if (ENABLE_PARALLEL_DOMAIN) ...@@ -54,7 +54,7 @@ if (ENABLE_PARALLEL_DOMAIN)
else() else()
message(FATAL_ERROR "Could not find ParMetis header file 'parmetis.h'!") message(FATAL_ERROR "Could not find ParMetis header file 'parmetis.h'!")
endif (PARMETIS_HEADER_FILE) endif (PARMETIS_HEADER_FILE)
# add support for the zoltan library # add support for the zoltan library
if (ENABLE_ZOLTAN) if (ENABLE_ZOLTAN)
find_file(ZOLTAN_HEADER_FILE "zoltan_cpp.h" HINTS ${PETSC_DIR}/include) find_file(ZOLTAN_HEADER_FILE "zoltan_cpp.h" HINTS ${PETSC_DIR}/include)
...@@ -64,18 +64,18 @@ if (ENABLE_PARALLEL_DOMAIN) ...@@ -64,18 +64,18 @@ if (ENABLE_PARALLEL_DOMAIN)
else() else()
message(FATAL_ERROR "Could not find Zoltan include file 'zoltan_cpp.h'!") message(FATAL_ERROR "Could not find Zoltan include file 'zoltan_cpp.h'!")
endif(ZOLTAN_HEADER_FILE) endif(ZOLTAN_HEADER_FILE)
target_compile_definitions(amdis_parallel INTERFACE HAVE_ZOLTAN=1) target_compile_definitions(amdis_parallel INTERFACE HAVE_ZOLTAN=1)
target_sources(amdis PRIVATE target_sources(amdis PRIVATE
${SOURCE_DIR}/parallel/ZoltanPartitioner.cc) ${SOURCE_DIR}/parallel/ZoltanPartitioner.cc)
endif (ENABLE_ZOLTAN) endif (ENABLE_ZOLTAN)
if (ENABLE_BDDCML) if (ENABLE_BDDCML)
target_compile_definitions(amdis_parallel INTERFACE HAVE_BDDCML=1) target_compile_definitions(amdis_parallel INTERFACE HAVE_BDDCML=1)
target_sources(amdis PRIVATE target_sources(amdis PRIVATE
${SOURCE_DIR}/parallel/BddcMlSolver.cc) ${SOURCE_DIR}/parallel/BddcMlSolver.cc)
endif (ENABLE_BDDCML) endif (ENABLE_BDDCML)
# add some more source-files that need petsc # add some more source-files that need petsc
target_sources(amdis PRIVATE target_sources(amdis PRIVATE
${SOURCE_DIR}/parallel/MatrixNnzStructure.cc ${SOURCE_DIR}/parallel/MatrixNnzStructure.cc
...@@ -86,7 +86,7 @@ if (ENABLE_PARALLEL_DOMAIN) ...@@ -86,7 +86,7 @@ if (ENABLE_PARALLEL_DOMAIN)
${SOURCE_DIR}/parallel/PetscSolverGlobalBlockMatrix.cc ${SOURCE_DIR}/parallel/PetscSolverGlobalBlockMatrix.cc
${SOURCE_DIR}/solver/PetscTypes.cc ${SOURCE_DIR}/solver/PetscTypes.cc
) )
if (ENABLE_PARALLEL_SOLVERS) if (ENABLE_PARALLEL_SOLVERS)
target_sources(amdis PRIVATE target_sources(amdis PRIVATE
${SOURCE_DIR}/parallel/PetscSolverFeti.cc ${SOURCE_DIR}/parallel/PetscSolverFeti.cc
...@@ -103,23 +103,23 @@ if (ENABLE_PARALLEL_DOMAIN) ...@@ -103,23 +103,23 @@ if (ENABLE_PARALLEL_DOMAIN)
target_compile_definitions(amdis_parallel INTERFACE target_compile_definitions(amdis_parallel INTERFACE
HAVE_PARALLEL_SOLVERS=1) HAVE_PARALLEL_SOLVERS=1)
endif (ENABLE_PARALLEL_SOLVERS) endif (ENABLE_PARALLEL_SOLVERS)
target_compile_definitions(amdis_parallel INTERFACE target_compile_definitions(amdis_parallel INTERFACE
HAVE_PARALLEL_PETSC=1 HAVE_PARALLEL_PETSC=1
PETSC_VERSION=${PETSC_VERSION}) PETSC_VERSION=${PETSC_VERSION})
target_link_libraries(amdis amdis_parallel ${PETSC_LIBRARIES} blas lapack) target_link_libraries(amdis amdis_parallel ${PETSC_LIBRARIES} blas lapack)
endif (PETSc_FOUND) endif (PETSc_FOUND)
# specify how to install this target: # specify how to install this target:
# ----------------------------------- # -----------------------------------
file(GLOB AMDIS_PARALLEL_HEADERS "${SOURCE_DIR}/parallel/*.h") file(GLOB AMDIS_PARALLEL_HEADERS "${SOURCE_DIR}/parallel/*.h")
install(FILES ${AMDIS_PARALLEL_HEADERS} DESTINATION include/amdis/parallel/) install(FILES ${AMDIS_PARALLEL_HEADERS} DESTINATION include/amdis/parallel/)
install(FILES install(FILES
${BASE_DIR}/cmake3/ResolveCompilerPaths.cmake ${BASE_DIR}/cmake3/ResolveCompilerPaths.cmake
${BASE_DIR}/cmake3/FindPackageMultipass.cmake ${BASE_DIR}/cmake3/FindPackageMultipass.cmake
${BASE_DIR}/cmake3/find_petsc.cmake ${BASE_DIR}/cmake3/find_petsc.cmake
DESTINATION share/amdis/) DESTINATION share/amdis/)
endif (ENABLE_PARALLEL_DOMAIN) endif (ENABLE_PARALLEL_DOMAIN)
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
set(MUPARSER_SOURCE_DIR ${BASE_DIR}/lib/muparser_v134/src) set(MUPARSER_SOURCE_DIR ${BASE_DIR}/lib/muparser_v134/src)
set(MUPARSER_INCLUDE_DIR ${BASE_DIR}/lib/muparser_v134/include) set(MUPARSER_INCLUDE_DIR ${BASE_DIR}/lib/muparser_v134/include)
add_library(muparser add_library(muparser
${MUPARSER_SOURCE_DIR}/muParser.cpp ${MUPARSER_SOURCE_DIR}/muParser.cpp
${MUPARSER_SOURCE_DIR}/muParserBase.cpp ${MUPARSER_SOURCE_DIR}/muParserBase.cpp
${MUPARSER_SOURCE_DIR}/muParserBytecode.cpp ${MUPARSER_SOURCE_DIR}/muParserBytecode.cpp
...@@ -13,7 +13,7 @@ add_library(muparser ...@@ -13,7 +13,7 @@ add_library(muparser
${MUPARSER_SOURCE_DIR}/muParserInt.cpp ${MUPARSER_SOURCE_DIR}/muParserInt.cpp
${MUPARSER_SOURCE_DIR}/muParserTest.cpp ${MUPARSER_SOURCE_DIR}/muParserTest.cpp
${MUPARSER_SOURCE_DIR}/muParserTokenReader.cpp) ${MUPARSER_SOURCE_DIR}/muParserTokenReader.cpp)
target_include_directories(muparser PUBLIC ${MUPARSER_INCLUDE_DIR}) target_include_directories(muparser PUBLIC ${MUPARSER_INCLUDE_DIR})
if (ENABLE_CXX11) if (ENABLE_CXX11)
......
...@@ -14,7 +14,7 @@ macro(test_compile_features RESULT_VAR TARGET SCOPE) # feature1 feature2 feature ...@@ -14,7 +14,7 @@ macro(test_compile_features RESULT_VAR TARGET SCOPE) # feature1 feature2 feature
else () else ()
set(DUMMY_FILE ${AMDIS_DIR}/dummy.cc) set(DUMMY_FILE ${AMDIS_DIR}/dummy.cc)
endif () endif ()
message(STATUS "Test for cxx11 features for target ${TARGET}") message(STATUS "Test for cxx11 features for target ${TARGET}")
execute_process(COMMAND ${CMAKE_COMMAND} -E make_directory ${_DIR}) execute_process(COMMAND ${CMAKE_COMMAND} -E make_directory ${_DIR})
file(WRITE ${_DIR}/CMakeLists.txt " file(WRITE ${_DIR}/CMakeLists.txt "
......
This diff is collapsed.
project (mtl4) # GPU version project (mtl4) # GPU version
cmake_minimum_required(VERSION 2.8) cmake_minimum_required(VERSION 2.8)
option(ENABLE_GCOV "enable gnu coverage flags for gnu compiler" OFF) option(ENABLE_GCOV "enable gnu coverage flags for gnu compiler" OFF)
...@@ -77,4 +77,4 @@ enable_testing() ...@@ -77,4 +77,4 @@ enable_testing()
include(CTest) include(CTest)
set(MTL_IS_CONFIGURED True) # impede double double configuration in libs set(MTL_IS_CONFIGURED True) # impede double double configuration in libs
add_subdirectory(libs) add_subdirectory(libs)
This diff is collapsed.
...@@ -2,9 +2,9 @@ ...@@ -2,9 +2,9 @@
Software License for MTL Software License for MTL
Copyright (c) 2007-2008 The Trustees of Indiana University. Copyright (c) 2007-2008 The Trustees of Indiana University.
2008 Dresden University of Technology and the Trustees of Indiana University. 2008 Dresden University of Technology and the Trustees of Indiana University.
2010 SimuNova UG, www.simunova.com. 2010 SimuNova UG, www.simunova.com.
All rights reserved. All rights reserved.
Authors: Peter Gottschling and Andrew Lumsdaine Authors: Peter Gottschling and Andrew Lumsdaine
......
...@@ -11,7 +11,7 @@ See also license.mtl.txt in the distribution. ...@@ -11,7 +11,7 @@ See also license.mtl.txt in the distribution.
--------------------------------------------------------------- ---------------------------------------------------------------
The Matrix Template Library The Matrix Template Library
Version 4 Version 4
I. Introduction I. Introduction
=============== ===============
......
...@@ -9,7 +9,7 @@ def macro_flag(env, flag): ...@@ -9,7 +9,7 @@ def macro_flag(env, flag):
if sys.platform == 'win32' and conf.env['CC'] == 'cl': if sys.platform == 'win32' and conf.env['CC'] == 'cl':
return '/D' + flag return '/D' + flag
else: else:
return '-D' + flag return '-D' + flag
# add debugging flags to environment # add debugging flags to environment
def add_debug(env): def add_debug(env):
...@@ -20,7 +20,7 @@ def add_debug(env): ...@@ -20,7 +20,7 @@ def add_debug(env):
env.Append(CCFLAGS = '-g') env.Append(CCFLAGS = '-g')
#print macro_flag(env, 'MTL_ASSERT_FOR_THROW') #print macro_flag(env, 'MTL_ASSERT_FOR_THROW')
env.Append(CCFLAGS = macro_flag(env, 'MTL_ASSERT_FOR_THROW')) env.Append(CCFLAGS = macro_flag(env, 'MTL_ASSERT_FOR_THROW'))
def check_g5(): def check_g5():
print "platform ", sys.platform print "platform ", sys.platform
...@@ -38,7 +38,7 @@ def check_g5(): ...@@ -38,7 +38,7 @@ def check_g5():
def add_platform_flags(env): def add_platform_flags(env):
if env['CC'] == 'cl': if env['CC'] == 'cl':
# Turn off some warnings: 1. for problems with CRTP 2. with VC's own headers # Turn off some warnings: 1. for problems with CRTP 2. with VC's own headers
# 3. alleged ambiguos assignment # 3. alleged ambiguos assignment
# I hope we find a cleaner way to get rid of this warning # I hope we find a cleaner way to get rid of this warning
wd = ' /wd4355 /wd4996 /wd4522' wd = ' /wd4355 /wd4996 /wd4522'
...@@ -79,10 +79,10 @@ def add_opt(env, opt): ...@@ -79,10 +79,10 @@ def add_opt(env, opt):
env.Append(CCFLAGS = '-O2') env.Append(CCFLAGS = '-O2')
# env.Append(CCFLAGS = '-pg') # for profiling # env.Append(CCFLAGS = '-pg') # for profiling
# env.Append(LINKFLAGS = '-pg') # for profiling # env.Append(LINKFLAGS = '-pg') # for profiling
if env['CC'] != 'cl': if env['CC'] != 'cl':
env.Append(CXXFLAGS = conf.env['CCFLAGS']) env.Append(CXXFLAGS = conf.env['CCFLAGS'])
def check_no_long_double(conf): def check_no_long_double(conf):
cc = conf.env['CC'] cc = conf.env['CC']
...@@ -117,7 +117,7 @@ def check_for_blas(env): ...@@ -117,7 +117,7 @@ def check_for_blas(env):
if blas_path: if blas_path:
print 'adding ' + blas_path + ' to LIBPATH.' print 'adding ' + blas_path + ' to LIBPATH.'
env.Append(LIBPATH = [ blas_path, blas_path + '/lib/' ]) env.Append(LIBPATH = [ blas_path, blas_path + '/lib/' ])
# extra linker flags for blas # extra linker flags for blas
blas_ldflags = ARGUMENTS.get('blas_ldflags', '') blas_ldflags = ARGUMENTS.get('blas_ldflags', '')
if blas_ldflags: if blas_ldflags:
...@@ -137,7 +137,7 @@ def check_for_blas(env): ...@@ -137,7 +137,7 @@ def check_for_blas(env):
return myenv return myenv
else: else:
print "Autodetecting BLAS support. See config.log for details!" print "Autodetecting BLAS support. See config.log for details!"
######################## ########################
# check for acml # check for acml
myenv = env.Copy() myenv = env.Copy()
...@@ -151,7 +151,7 @@ def check_for_blas(env): ...@@ -151,7 +151,7 @@ def check_for_blas(env):
myenv = conf.Finish() myenv = conf.Finish()
if(found_blas == 1): if(found_blas == 1):
return myenv return myenv
######################## ########################
# check for goto # check for goto
myenv = env.Copy() myenv = env.Copy()
...@@ -161,7 +161,7 @@ def check_for_blas(env): ...@@ -161,7 +161,7 @@ def check_for_blas(env):
myenv.Append(LIBS=['pthread']) myenv.Append(LIBS=['pthread'])
# extra linker flags for libgoto # extra linker flags for libgoto
# myenv.Append(_LIBFLAGS=['libs/numeric/mtl/build/xerbla.c']) # myenv.Append(_LIBFLAGS=['libs/numeric/mtl/build/xerbla.c'])
myenv.Append(_LIBFLAGS=['libs/numeric/mtl/build/xerbla.o']) # not portable !!! myenv.Append(_LIBFLAGS=['libs/numeric/mtl/build/xerbla.o']) # not portable !!!
# myenv.Library('build/xerbla', 'build/xerbla.c') # myenv.Library('build/xerbla', 'build/xerbla.c')
# myenv.Append(LIBS=['xerbla']) # myenv.Append(LIBS=['xerbla'])
# myenv.Append(LIBPATH=['build']) # myenv.Append(LIBPATH=['build'])
...@@ -176,7 +176,7 @@ def check_for_blas(env): ...@@ -176,7 +176,7 @@ def check_for_blas(env):
myenv = conf.Finish() myenv = conf.Finish()
if(found_blas == 1): if(found_blas == 1):
return myenv return myenv
######################## ########################
# check for ATLAS # check for ATLAS
myenv = env.Copy() myenv = env.Copy()
...@@ -192,9 +192,9 @@ def check_for_blas(env): ...@@ -192,9 +192,9 @@ def check_for_blas(env):
return myenv return myenv
return env return env
################################### ###################################
# Add UMFPACK (extremely simplistic) # Add UMFPACK (extremely simplistic)
################################### ###################################
...@@ -236,7 +236,7 @@ def check_for_umfpack(env): ...@@ -236,7 +236,7 @@ def check_for_umfpack(env):
env.Append(CPPPATH = [ umfpack_path + '/Include' ]) env.Append(CPPPATH = [ umfpack_path + '/Include' ])
detected_umfpack(env) detected_umfpack(env)
return env return env
...@@ -351,12 +351,12 @@ if int(ARGUMENTS.get('full_warnings', 0)): ...@@ -351,12 +351,12 @@ if int(ARGUMENTS.get('full_warnings', 0)):
full_warnings = ARGUMENTS.get('full_warnings', 0) full_warnings = ARGUMENTS.get('full_warnings', 0)
# add user-defined CC flags # add user-defined CC flags
add_ccflag = ARGUMENTS.get('add_ccflag', '') add_ccflag = ARGUMENTS.get('add_ccflag', '')
if add_ccflag: if add_ccflag:
env.Append(CCFLAGS = add_ccflag) env.Append(CCFLAGS = add_ccflag)
# add user-defined CXX flags # add user-defined CXX flags
add_cxxflag = ARGUMENTS.get('add_cxxflag', '') add_cxxflag = ARGUMENTS.get('add_cxxflag', '')
if add_cxxflag: if add_cxxflag:
env.Append(CXXFLAGS = add_cxxflag) env.Append(CXXFLAGS = add_cxxflag)
...@@ -379,12 +379,12 @@ add_debug(debug_env) ...@@ -379,12 +379,12 @@ add_debug(debug_env)
opt = ARGUMENTS.get('opt', 0) opt = ARGUMENTS.get('opt', 0)
# Add optimization flags and then copy C flags into C++ flags # Add optimization flags and then copy C flags into C++ flags
add_opt(debug_env, 0) add_opt(debug_env, 0)
add_opt(env, int(opt)) add_opt(env, int(opt))
add_opt(opt_env, 1) add_opt(opt_env, 1)
add_opt(high_opt_env, 2) add_opt(high_opt_env, 2)
# add user-defined optimization flags # add user-defined optimization flags
add_optflag = ARGUMENTS.get('add_optflag', '') add_optflag = ARGUMENTS.get('add_optflag', '')
if add_optflag: if add_optflag:
add_user_opt(env, add_optflag) add_user_opt(env, add_optflag)
...@@ -400,12 +400,12 @@ check = ARGUMENTS.get('check', 0) ...@@ -400,12 +400,12 @@ check = ARGUMENTS.get('check', 0)
Export('env debug_env opt_env high_opt_env check full_warnings') Export('env debug_env opt_env high_opt_env check full_warnings')
SConscript(['libs/numeric/mtl/build/SConscript', SConscript(['libs/numeric/mtl/build/SConscript',
'libs/numeric/mtl/test/SConscript', 'libs/numeric/mtl/test/SConscript',
'libs/numeric/mtl/test_with_optimization/SConscript', 'libs/numeric/mtl/test_with_optimization/SConscript',
'libs/numeric/mtl/examples/SConscript', 'libs/numeric/mtl/examples/SConscript',
'libs/numeric/mtl/experimental/SConscript', 'libs/numeric/mtl/experimental/SConscript',
'libs/numeric/mtl/timing/SConscript', 'libs/numeric/mtl/timing/SConscript',
'libs/numeric/linear_algebra/test/SConscript', 'libs/numeric/linear_algebra/test/SConscript',
'libs/numeric/itl/test/SConscript']) 'libs/numeric/itl/test/SConscript'])
...@@ -33,27 +33,27 @@ class basic_iteration ...@@ -33,27 +33,27 @@ class basic_iteration
max_iter(max_iter_), rtol_(t), atol_(a), is_finished(false), my_quite(false), my_suppress(false) { } max_iter(max_iter_), rtol_(t), atol_(a), is_finished(false), my_quite(false), my_suppress(false) { }
basic_iteration(Real nb, int max_iter_, Real t, Real a = Real(0)) basic_iteration(Real nb, int max_iter_, Real t, Real a = Real(0))
: error(0), i(0), norm_r0(nb), max_iter(max_iter_), rtol_(t), atol_(a), is_finished(false), : error(0), i(0), norm_r0(nb), max_iter(max_iter_), rtol_(t), atol_(a), is_finished(false),
my_quite(false), my_suppress(false) {} my_quite(false), my_suppress(false) {}
virtual ~basic_iteration() {} virtual ~basic_iteration() {}
bool check_max() bool check_max()
{