Skip to content
Snippets Groups Projects
Unverified Commit 5cc0aa75 authored by René Fritze's avatar René Fritze
Browse files

apply format

parent dacaf844
No related branches found
No related tags found
No related merge requests found
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 448 additions and 57 deletions
shared @ b6ec0ca0
Compare 37afc034...b6ec0ca0
Subproject commit 37afc034878b25dae654557ef95ee36edf9b9e1b
Subproject commit b6ec0ca01422a982220d1cec629da92e2f3e4934
.pylicense-cpp.py
+ 2
− 2
View file @ 5cc0aa75
......@@ -19,5 +19,5 @@ prefix = '//'
include_patterns = ('*.cc', '*.cxx', '*.hh', '*.hxx', '*cmake_config.h.in', '*headercheck.cpp.in', '*config.h.cmake',
'*version.hh.in', '*.pbh')
exclude_patterns = ('*mathexpr.*', '*gtest-all.cc', '*.vcsetup*', '*gtest-all.cxx', '*dune/xt/functions/expression/mathexpr.cc',
'*dune/xt/functions/expression/mathexpr.hh')
exclude_patterns = ('*mathexpr.*', '*gtest-all.cc', '*.vcsetup*', '*gtest-all.cxx',
'*dune/xt/functions/expression/mathexpr.cc', '*dune/xt/functions/expression/mathexpr.hh')
CMakeLists.txt
+ 4
− 1
View file @ 5cc0aa75
......@@ -60,7 +60,10 @@ execute_process(COMMAND ${CMAKE_SOURCE_DIR}/getRevision.sh
dune_enable_all_packages(INCLUDE_DIRS
${dune-xt-common_SOURCE_DIR}/dune
MODULE_LIBRARIES
dunextcommon dunextgrid dunextfunctions dunextla
dunextcommon
dunextgrid
dunextfunctions
dunextla
gtest_dune_xt_common)
include(DunePybindxiInstallPythonPackage)
......
cmake/modules/DuneUtils.cmake
+ 12
− 12
View file @ 5cc0aa75
......@@ -53,23 +53,23 @@ include(DuneXTTesting)
macro(add_header_listing) # header
file(GLOB_RECURSE current_module_header
"${CMAKE_CURRENT_SOURCE_DIR}/dune/*.hh"
"${CMAKE_CURRENT_SOURCE_DIR}/dune/*.pbh"
"${CMAKE_CURRENT_SOURCE_DIR}/dune/*.hxx"
"${CMAKE_CURRENT_SOURCE_DIR}/python/*.hh"
"${CMAKE_CURRENT_SOURCE_DIR}/python/*.pbh"
"${CMAKE_CURRENT_SOURCE_DIR}/python/*.hxx")
"${CMAKE_CURRENT_SOURCE_DIR}/dune/*.hh"
"${CMAKE_CURRENT_SOURCE_DIR}/dune/*.pbh"
"${CMAKE_CURRENT_SOURCE_DIR}/dune/*.hxx"
"${CMAKE_CURRENT_SOURCE_DIR}/python/*.hh"
"${CMAKE_CURRENT_SOURCE_DIR}/python/*.pbh"
"${CMAKE_CURRENT_SOURCE_DIR}/python/*.hxx")
set(COMMON_HEADER ${current_module_header} ${DUNE_HEADERS})
# add header of dependent modules for header listing
foreach(_mod ${ALL_DEPENDENCIES})
file(GLOB_RECURSE HEADER_LIST
"${CMAKE_CURRENT_SOURCE_DIR}/../${_mod}/dune/*.hh"
"${CMAKE_CURRENT_SOURCE_DIR}/../${_mod}/dune/*.pbh"
"${CMAKE_CURRENT_SOURCE_DIR}/../${_mod}/dune/*.hxx"
"${CMAKE_CURRENT_SOURCE_DIR}/../${_mod}/python/*.hh"
"${CMAKE_CURRENT_SOURCE_DIR}/../${_mod}/python/*.pbh"
"${CMAKE_CURRENT_SOURCE_DIR}/../${_mod}/python/*.hxx")
"${CMAKE_CURRENT_SOURCE_DIR}/../${_mod}/dune/*.hh"
"${CMAKE_CURRENT_SOURCE_DIR}/../${_mod}/dune/*.pbh"
"${CMAKE_CURRENT_SOURCE_DIR}/../${_mod}/dune/*.hxx"
"${CMAKE_CURRENT_SOURCE_DIR}/../${_mod}/python/*.hh"
"${CMAKE_CURRENT_SOURCE_DIR}/../${_mod}/python/*.pbh"
"${CMAKE_CURRENT_SOURCE_DIR}/../${_mod}/python/*.hxx")
list(APPEND COMMON_HEADER ${HEADER_LIST})
endforeach(_mod DEPENDENCIES)
set_source_files_properties(${COMMON_HEADER} PROPERTIES HEADER_FILE_ONLY 1)
......
cmake/modules/DuneXTTesting.cmake
+ 24
− 25
View file @ 5cc0aa75
......@@ -67,29 +67,29 @@ macro(BEGIN_TESTCASES) # https://cmake.org/cmake/help/v3.0/module/FindGTest.html
minifile
${source})
if(EXISTS ${minifile})
if(dune-testtools_FOUND)
dune_add_system_test(SOURCE
${source}
${COMMON_HEADER}
INIFILE
${minifile}
BASENAME
test_${testbase}
CREATED_TARGETS
targetlist_${testbase}
ADDED_TESTS
testlist_${testbase}
SCRIPT
dune_xt_execute.py
${DEBUG_MACRO_TESTS})
foreach(target ${targetlist_${testbase}})
target_link_libraries(${target} ${ARGN} ${COMMON_LIBS} ${GRID_LIBS} gtest_dune_xt_common)
list(APPEND dxt_test_binaries ${target})
set(dxt_test_names_${target} ${testlist_${testbase}_${target}})
endforeach(target)
else(dune-testtools_FOUND)
MESSAGE("-- missing dune-testtools, disabling test ${source}")
endif(dune-testtools_FOUND)
if(dune-testtools_FOUND)
dune_add_system_test(SOURCE
${source}
${COMMON_HEADER}
INIFILE
${minifile}
BASENAME
test_${testbase}
CREATED_TARGETS
targetlist_${testbase}
ADDED_TESTS
testlist_${testbase}
SCRIPT
dune_xt_execute.py
${DEBUG_MACRO_TESTS})
foreach(target ${targetlist_${testbase}})
target_link_libraries(${target} ${ARGN} ${COMMON_LIBS} ${GRID_LIBS} gtest_dune_xt_common)
list(APPEND dxt_test_binaries ${target})
set(dxt_test_names_${target} ${testlist_${testbase}_${target}})
endforeach(target)
else(dune-testtools_FOUND)
message("-- missing dune-testtools, disabling test ${source}")
endif(dune-testtools_FOUND)
else(EXISTS ${minifile})
set(target test_${testbase})
dune_add_test(NAME
......@@ -224,8 +224,7 @@ macro(END_TESTCASES) # this excludes meta-ini variation test cases because ther
endforeach(target ${dxt_test_binaries})
set(dxt_headercheck_targets "")
get_headercheck_targets(dxt_headercheck_targets)
configure_file(${dune-xt-module-path}/dxt_test_binaries.cmake.in
${CMAKE_CURRENT_BINARY_DIR}/dxt_test_binaries.cmake)
configure_file(${dune-xt-module-path}/dxt_test_binaries.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/dxt_test_binaries.cmake)
configure_file(${dune-xt-module-path}/dxt_all_sorted_testnames.cmake.in
${CMAKE_CURRENT_BINARY_DIR}/dxt_all_sorted_testnames.cmake)
configure_file(${dune-xt-module-path}/dxt_headercheck_targets.cmake.in
......
dune/xt/test/CMakeLists.txt
+ 1
− 2
View file @ 5cc0aa75
enable_testing()
begin_testcases(dunextgrid dunextcommon dunextla)
......@@ -10,7 +9,7 @@ add_subdirectory(grid)
add_subdirectory(la)
add_subdirectory(functions)
if (ALBERTA_FOUND)
if(ALBERTA_FOUND)
add_dune_alberta_flags(GRIDDIM 2 test_dd_glued_2d)
add_dune_alberta_flags(GRIDDIM 3 test_dd_glued_3d)
......
dune/xt/test/common/CMakeLists.txt
+ 0
− 1
View file @ 5cc0aa75
......@@ -11,7 +11,6 @@
# Tobias Leibner (2015 - 2016)
# ~~~
dependencycheck(${xtcommon})
include_directories(SYSTEM ${DUNE_XT_COMMON_TEST_DIR}/gtest)
......
dune/xt/test/functions/builder_definitions.cmake
+ 307
− 9
View file @ 5cc0aa75
This diff is collapsed.
dune/xt/test/la/builder_definitions.cmake
+ 95
− 4
View file @ 5cc0aa75
set(DXT_BIN_COUNT "2" CACHE STRING "number of bins for test targets" )
add_custom_target(test_binaries_builder_0 DEPENDS headercheck__dune_xt_la_container_common.hh headercheck__dune_xt_la_container_common_matrix.hh headercheck__dune_xt_la_container_common_matrix_dense.hh headercheck__dune_xt_la_container_common_vector.hh headercheck__dune_xt_la_container_common_vector_dense.hh headercheck__dune_xt_la_container_conversion.hh headercheck__dune_xt_la_container_eigen_base.hh headercheck__dune_xt_la_container_eigen_dense.hh headercheck__dune_xt_la_container_eye-matrix.hh headercheck__dune_xt_la_container_io.hh headercheck__dune_xt_la_container_matrix-interface.hh headercheck__dune_xt_la_container_pattern.hh headercheck__dune_xt_la_container_vector-array_list.hh headercheck__dune_xt_la_eigen-solver_default.hh headercheck__dune_xt_la_eigen-solver_internal_lapacke.hh headercheck__dune_xt_la_exceptions.hh headercheck__dune_xt_la_matrix-inverter_default.hh headercheck__dune_xt_la_matrix-inverter_eigen.hh headercheck__dune_xt_la_matrix-inverter_fmatrix.hh headercheck__dune_xt_la_matrix-inverter_internal_eigen.hh headercheck__dune_xt_la_solver.hh headercheck__dune_xt_la_solver_eigen.hh headercheck__dune_xt_la_solver_fasp.hh headercheck__dune_xt_la_solver_istl.hh headercheck__dune_xt_la_solver_istl_amg.hh headercheck__dune_xt_la_solver_istl_preconditioners.hh headercheck__dune_xt_la_solver_istl_schurcomplement.hh headercheck__dune_xt_la_test_container.hh headercheck__dune_xt_la_test_eigensolver.hh headercheck__dune_xt_la_type_traits.hh headercheck__python_dune_xt_la_container.bindings.hh headercheck__python_dune_xt_la_container_container-interface.hh headercheck__python_dune_xt_la_container_vector-interface.hh test_algorithms_qr_5x5 test_algorithms_solve_sym_tridiag_posdef test_convert test_eigensolver_for_real_matrix_with_distinct_real_evs test_eigensolver_for_real_matrix_with_real_evs_from_2d_euler_equations test_eigensolver_for_real_matrix_with_real_evs_from_3d_pointsource test_empty test_matrix_view test_matrixinverter_for_complex_matrix test_matrixinverter_for_complex_matrix_2 test_saddlepoint)
set(DXT_BIN_COUNT "2" CACHE STRING "number of bins for test targets")
add_custom_target(test_binaries_builder_0
DEPENDS headercheck__dune_xt_la_container_common.hh
headercheck__dune_xt_la_container_common_matrix.hh
headercheck__dune_xt_la_container_common_matrix_dense.hh
headercheck__dune_xt_la_container_common_vector.hh
headercheck__dune_xt_la_container_common_vector_dense.hh
headercheck__dune_xt_la_container_conversion.hh
headercheck__dune_xt_la_container_eigen_base.hh
headercheck__dune_xt_la_container_eigen_dense.hh
headercheck__dune_xt_la_container_eye-matrix.hh
headercheck__dune_xt_la_container_io.hh
headercheck__dune_xt_la_container_matrix-interface.hh
headercheck__dune_xt_la_container_pattern.hh
headercheck__dune_xt_la_container_vector-array_list.hh
headercheck__dune_xt_la_eigen-solver_default.hh
headercheck__dune_xt_la_eigen-solver_internal_lapacke.hh
headercheck__dune_xt_la_exceptions.hh
headercheck__dune_xt_la_matrix-inverter_default.hh
headercheck__dune_xt_la_matrix-inverter_eigen.hh
headercheck__dune_xt_la_matrix-inverter_fmatrix.hh
headercheck__dune_xt_la_matrix-inverter_internal_eigen.hh
headercheck__dune_xt_la_solver.hh
headercheck__dune_xt_la_solver_eigen.hh
headercheck__dune_xt_la_solver_fasp.hh
headercheck__dune_xt_la_solver_istl.hh
headercheck__dune_xt_la_solver_istl_amg.hh
headercheck__dune_xt_la_solver_istl_preconditioners.hh
headercheck__dune_xt_la_solver_istl_schurcomplement.hh
headercheck__dune_xt_la_test_container.hh
headercheck__dune_xt_la_test_eigensolver.hh
headercheck__dune_xt_la_type_traits.hh
headercheck__python_dune_xt_la_container.bindings.hh
headercheck__python_dune_xt_la_container_container-interface.hh
headercheck__python_dune_xt_la_container_vector-interface.hh
test_algorithms_qr_5x5
test_algorithms_solve_sym_tridiag_posdef
test_convert
test_eigensolver_for_real_matrix_with_distinct_real_evs
test_eigensolver_for_real_matrix_with_real_evs_from_2d_euler_equations
test_eigensolver_for_real_matrix_with_real_evs_from_3d_pointsource
test_empty
test_matrix_view
test_matrixinverter_for_complex_matrix
test_matrixinverter_for_complex_matrix_2
test_saddlepoint)
set_tests_properties(test_algorithms_qr_5x5 PROPERTIES LABELS "builder_0")
set_tests_properties(test_algorithms_solve_sym_tridiag_posdef PROPERTIES LABELS "builder_0")
set_tests_properties(test_convert PROPERTIES LABELS "builder_0")
set_tests_properties(test_eigensolver_for_real_matrix_with_distinct_real_evs PROPERTIES LABELS "builder_0")
set_tests_properties(test_eigensolver_for_real_matrix_with_real_evs_from_2d_euler_equations PROPERTIES LABELS "builder_0")
set_tests_properties(test_eigensolver_for_real_matrix_with_real_evs_from_2d_euler_equations
PROPERTIES LABELS "builder_0")
set_tests_properties(test_eigensolver_for_real_matrix_with_real_evs_from_3d_pointsource PROPERTIES LABELS "builder_0")
set_tests_properties(test_empty PROPERTIES LABELS "builder_0")
set_tests_properties(test_matrix_view PROPERTIES LABELS "builder_0")
set_tests_properties(test_matrixinverter_for_complex_matrix PROPERTIES LABELS "builder_0")
set_tests_properties(test_matrixinverter_for_complex_matrix_2 PROPERTIES LABELS "builder_0")
set_tests_properties(test_saddlepoint PROPERTIES LABELS "builder_0")
add_custom_target(test_binaries_builder_1 DEPENDS headercheck__dune_xt_la_algorithms.hh headercheck__dune_xt_la_algorithms_cholesky.hh headercheck__dune_xt_la_algorithms_qr.hh headercheck__dune_xt_la_algorithms_solve_sym_tridiag_posdef.hh headercheck__dune_xt_la_algorithms_triangular_solves.hh headercheck__dune_xt_la_container.hh headercheck__dune_xt_la_container_common_matrix_sparse.hh headercheck__dune_xt_la_container_common_vector_sparse.hh headercheck__dune_xt_la_container_container-interface.hh headercheck__dune_xt_la_container_eigen.hh headercheck__dune_xt_la_container_eigen_sparse.hh headercheck__dune_xt_la_container_interfaces.hh headercheck__dune_xt_la_container_istl.hh headercheck__dune_xt_la_container_matrix-view.hh headercheck__dune_xt_la_container_vector-array_interface.hh headercheck__dune_xt_la_container_vector-interface-internal.hh headercheck__dune_xt_la_container_vector-interface.hh headercheck__dune_xt_la_container_vector-view.hh headercheck__dune_xt_la_eigen-solver.hh headercheck__dune_xt_la_eigen-solver_eigen.hh headercheck__dune_xt_la_eigen-solver_fmatrix.hh headercheck__dune_xt_la_eigen-solver_internal_base.hh headercheck__dune_xt_la_eigen-solver_internal_eigen.hh headercheck__dune_xt_la_eigen-solver_internal_numpy.hh headercheck__dune_xt_la_eigen-solver_internal_shifted-qr.hh headercheck__dune_xt_la_matrix-inverter.hh headercheck__dune_xt_la_matrix-inverter_internal_base.hh headercheck__dune_xt_la_solver_common.hh headercheck__dune_xt_la_solver_istl_saddlepoint.hh headercheck__dune_xt_la_solver_view.hh headercheck__dune_xt_la_test_matrixinverter.hh headercheck__python_dune_xt_la_container_matrix-interface.hh headercheck__python_dune_xt_la_container_pattern.hh test_algorithms_cholesky test_algorithms_qr_5x3 test_algorithms_qr_block_2x3x3 test_algorithms_triangular_solves_2x2 test_algorithms_triangular_solves_3x3 test_container test_container_matrix test_container_vector test_eigensolver_for_matrix_from_eigens_example test_eigensolver_for_real_matrix_with_complex_evs test_eigensolver_for_real_matrix_with_real_evs test_matrixinverter_for_real_matrix_from_3d_pointsource test_pattern)
add_custom_target(test_binaries_builder_1
DEPENDS headercheck__dune_xt_la_algorithms.hh
headercheck__dune_xt_la_algorithms_cholesky.hh
headercheck__dune_xt_la_algorithms_qr.hh
headercheck__dune_xt_la_algorithms_solve_sym_tridiag_posdef.hh
headercheck__dune_xt_la_algorithms_triangular_solves.hh
headercheck__dune_xt_la_container.hh
headercheck__dune_xt_la_container_common_matrix_sparse.hh
headercheck__dune_xt_la_container_common_vector_sparse.hh
headercheck__dune_xt_la_container_container-interface.hh
headercheck__dune_xt_la_container_eigen.hh
headercheck__dune_xt_la_container_eigen_sparse.hh
headercheck__dune_xt_la_container_interfaces.hh
headercheck__dune_xt_la_container_istl.hh
headercheck__dune_xt_la_container_matrix-view.hh
headercheck__dune_xt_la_container_vector-array_interface.hh
headercheck__dune_xt_la_container_vector-interface-internal.hh
headercheck__dune_xt_la_container_vector-interface.hh
headercheck__dune_xt_la_container_vector-view.hh
headercheck__dune_xt_la_eigen-solver.hh
headercheck__dune_xt_la_eigen-solver_eigen.hh
headercheck__dune_xt_la_eigen-solver_fmatrix.hh
headercheck__dune_xt_la_eigen-solver_internal_base.hh
headercheck__dune_xt_la_eigen-solver_internal_eigen.hh
headercheck__dune_xt_la_eigen-solver_internal_numpy.hh
headercheck__dune_xt_la_eigen-solver_internal_shifted-qr.hh
headercheck__dune_xt_la_matrix-inverter.hh
headercheck__dune_xt_la_matrix-inverter_internal_base.hh
headercheck__dune_xt_la_solver_common.hh
headercheck__dune_xt_la_solver_istl_saddlepoint.hh
headercheck__dune_xt_la_solver_view.hh
headercheck__dune_xt_la_test_matrixinverter.hh
headercheck__python_dune_xt_la_container_matrix-interface.hh
headercheck__python_dune_xt_la_container_pattern.hh
test_algorithms_cholesky
test_algorithms_qr_5x3
test_algorithms_qr_block_2x3x3
test_algorithms_triangular_solves_2x2
test_algorithms_triangular_solves_3x3
test_container
test_container_matrix
test_container_vector
test_eigensolver_for_matrix_from_eigens_example
test_eigensolver_for_real_matrix_with_complex_evs
test_eigensolver_for_real_matrix_with_real_evs
test_matrixinverter_for_real_matrix_from_3d_pointsource
test_pattern)
set_tests_properties(test_algorithms_cholesky PROPERTIES LABELS "builder_1")
set_tests_properties(test_algorithms_qr_5x3 PROPERTIES LABELS "builder_1")
set_tests_properties(test_algorithms_qr_block_2x3x3 PROPERTIES LABELS "builder_1")
......
python/test/base.py
+ 2
− 0
View file @ 5cc0aa75
......@@ -51,6 +51,8 @@ def test_timings():
if __name__ == '__main__':
from dune.xt.common.test import runmodule
runmodule(__file__)
def test_types():
cache = {}
rt = types.all_types(cache=cache, dims=(2, 3))
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment