Merge branch 'traversers-optimizations' of mmg-gitlab.fjfi.cvut.cz:mmg/tnl-dev... (5f4d085f) · Commits · TNL / tnl-dev

.gitignore

+1 −2

Original line number	Diff line number	Diff line
		@@ -2,9 +2,8 @@
		/Debug
		/Release
		/Testing
		/Documentation
		/Documentation/html/
		/CMakeLists.txt.user
		/doc/_build
		/Build

		# Eclipse project stuff

AUTHORS

deleted100644 → 0

+0 −11

Original line number	Diff line number	Diff line
		Oberhuber Tomas <tomas.oberhuber@fjfi.cvut.cz>
		Zabka Vitezslav <zabkav@gmail.com>
		Vladimir Klement <wlada@post.cz>
		Tomáš Sobotík <sobotik.tomas@gmail.com>
		Ondřej Székely <ondra.szekely@gmail.com>
		Libor Bakajsa
		Jakub Klinkovský <klinkjak@fjfi.cvut.cz>
		Vacata Jan
		Heller Martin
		Novotny Matej

CMakeLists.txt

+21 −71

Original line number	Diff line number	Diff line
		@@ -6,11 +6,6 @@
		# email : tomas.oberhuber@fjfi.cvut.cz
		#
		###############################################################################
		#
		# Authors:
		# Tomas Oberhuber
		# Vladimir Klement
		# Jakub Klinkovsky

		cmake_minimum_required( VERSION 3.5.1 )

		@@ -32,6 +27,7 @@ option(WITH_EXAMPLES "Compile the 'examples' directory" ON)
		option(WITH_TOOLS "Compile the 'src/Tools' directory" ON)
		option(WITH_BENCHMARKS "Compile the 'src/Benchmarks' directory" ON)
		option(WITH_PYTHON "Compile the Python bindings" ON)
		option(WITH_DOC "Generate documentation" ON)
		option(WITH_TEMPLATES_INSTANTIATION "Enable explicit template instantiation" OFF)

		# install paths relative to the cmake's prefix
		@@ -188,9 +184,9 @@ if( ${WITH_CUDA} )
		endif()
		set(CUDA_NVCC_FLAGS ${CUDA_NVCC_FLAGS} ;-DHAVE_CUDA)
		# disable false compiler warnings
		# reference for the -Xcudafe flag: http://stackoverflow.com/questions/14831051/how-to-disable-compiler-warnings-with-nvcc/17095910#17095910
		# list of possible tokens: http://www.ssl.berkeley.edu/~jimm/grizzly_docs/SSL/opt/intel/cc/9.0/lib/locale/en_US/mcpcom.msg
		set(CUDA_NVCC_FLAGS ${CUDA_NVCC_FLAGS} ; -Wno-deprecated-gpu-targets --expt-relaxed-constexpr --expt-extended-lambda -Xcudafe "\"--diag_suppress=code_is_unreachable --diag_suppress=implicit_return_from_non_void_function\"")
		# reference for the -Xcudafe --diag_suppress and --display_error_number flags: https://stackoverflow.com/a/54142937
		# incomplete list of tokens: http://www.ssl.berkeley.edu/~jimm/grizzly_docs/SSL/opt/intel/cc/9.0/lib/locale/en_US/mcpcom.msg
		set(CUDA_NVCC_FLAGS ${CUDA_NVCC_FLAGS} ; -Wno-deprecated-gpu-targets --expt-relaxed-constexpr --expt-extended-lambda -Xcudafe "\"--diag_suppress=code_is_unreachable --diag_suppress=implicit_return_from_non_void_function --diag_suppress=2906 --display_error_number\"")
		set( ALL_CUDA_ARCHS -gencode arch=compute_20,code=sm_20
		-gencode arch=compute_30,code=sm_30
		-gencode arch=compute_32,code=sm_32
		@@ -255,33 +251,20 @@ endif()

		find_package( DCMTK )
		if( DCMTK_FOUND )
		set( HAVE_DCMTK_H "#define HAVE_DCMTK_H 1" )
		set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DHAVE_DCMTK_H" )
		include_directories( ${DCMTK_INCLUDE_DIRS} )
		set( HAVE_DCMTK TRUE)
		set( DCMTK_LD_FLAGS "" )
		foreach( arg ${DCMTK_LIBRARIES} )
		set( DCMTK_LD_FLAGS "${DCMTK_LD_FLAGS} ${arg}" )
		endforeach( arg ${DCMTK_LIBRARIES} )
		else()
		set( HAVE_DCMTK_H "//#define HAVE_DCMTK_H 1" )
		endif()

		find_package( PNG )
		if( PNG_FOUND )
		set( HAVE_PNG_H "#define HAVE_PNG_H 1" )
		set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DHAVE_PNG_H" )
		include_directories( ${PNG_INCLUDE_DIRS} )
		else()
		set( HAVE_PNG_H "//#define HAVE_PNG_H 1" )
		set( PNG_LIBRARIES "" )
		endif()

		find_package( JPEG )
		if( JPEG_FOUND )
		set( HAVE_JPEG_H "#define HAVE_JPEG_H 1" )
		set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DHAVE_JPEG_H" )
		include_directories( ${JPEG_INCLUDE_DIRS} )
		else()
		set( HAVE_JPEG_H "//#define HAVE_JPEG_H 1" )
		set( JPEG_LIBRARIES "" )
		endif()

		####
		@@ -315,45 +298,6 @@ if( ${WITH_GMP} )
		endif()
		endif()

		####
		# Check for some system header
		#
		find_path( SYS_TIME_INCLUDE_DIR sys/time.h
		/usr/include/x86_64-linux-gnu
		/usr/include
		DOC "System timer headers." )
		if( ${SYS_TIME_INCLUDE_DIR} STREQUAL "SYS_TIME_INCLUDE_DIR-NOTFOUND" )
		message( "Missing header file sys/time.h" )
		set( HAVE_SYS_TIME_H "//#define HAVE_SYS_TIME_H 1" )
		else()
		#include_directories( ${SYS_TIME_INCLUDE_DIR} )
		set( HAVE_SYS_TIME_H "#define HAVE_SYS_TIME_H 1" )
		endif()

		find_path( SYS_RESOURCE_INCLUDE_DIR sys/resource.h
		/usr/include/x86_64-linux-gnu
		/usr/include
		DOC "System resources headers." )
		if( ${SYS_RESOURCE_INCLUDE_DIR} STREQUAL "SYS_RESOURCE_INCLUDE_DIR-NOTFOUND" )
		message( "Missing header file sys/time.h" )
		set( HAVE_SYS_RESOURCE_H "//#define HAVE_SYS_RESOURCE_H 1" )
		else()
		#include_directories( ${SYS_RESOURCE_INCLUDE_DIR} )
		set( HAVE_SYS_RESOURCE_H "#define HAVE_SYS_RESOURCE_H 1" )
		endif()

		find_path( SYS_IOCTL_INCLUDE_DIR sys/ioctl.h
		/usr/include/x86_64-linux-gnu
		/usr/include
		DOC "System ioctl headers." )
		if( ${SYS_IOCTL_INCLUDE_DIR} STREQUAL "SYS_IOCTL_INCLUDE_DIR-NOTFOUND" )
		message( "Missing header file sys/time.h" )
		set( HAVE_SYS_IOCTL_H "//#define HAVE_SYS_IOCTL_H 1" )
		else()
		#include_directories( ${SYS_IOCTL_INCLUDE_DIR} )
		set( HAVE_SYS_IOCTL_H "#define HAVE_SYS_IOCTL_H 1" )
		endif()

		if( ${WITH_TESTS} )
		enable_testing()

		@@ -418,21 +362,27 @@ endif()
		# endif()
		#endif()

		CONFIGURE_FILE( "tnlConfig.h.in" "${PROJECT_BUILD_PATH}/TNL/tnlConfig.h" )
		INSTALL( FILES ${PROJECT_BUILD_PATH}/TNL/tnlConfig.h DESTINATION ${TNL_TARGET_INCLUDE_DIRECTORY} )

		#Nastavime cesty k hlavickovym souborum a knihovnam
		INCLUDE_DIRECTORIES( src )
		INCLUDE_DIRECTORIES( ${PROJECT_BUILD_PATH} )
		LINK_DIRECTORIES( ${LIBRARY_OUTPUT_PATH} )

		# Add all subdirectories
		if( ${WITH_TESTS} )
		add_subdirectory( tests )
		endif()
		add_subdirectory( src )
		add_subdirectory( share )

		#Check for Doxygen
		if( ${WITH_DOC} )
		find_package(Doxygen)
		if( DOXYGEN_FOUND )
		if( CMAKE_BUILD_TYPE MATCHES "Release" )
		add_subdirectory( Documentation )
		endif( CMAKE_BUILD_TYPE MATCHES "Release" )
		else( DOXYGEN_FOUND )
		message("Doxygen need to be installed to generate the doxygen documentation")
		endif( DOXYGEN_FOUND )
		endif( ${WITH_DOC} )

		set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Template Numerical Library")
		set(CPACK_PACKAGE_VENDOR "MMG")
		#set(CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_CURRENT_SOURCE_DIR}/ReadMe.txt")

Documentation/CMakeLists.txt

0 → 100644

+18 −0

Original line number	Diff line number	Diff line
		add_subdirectory( Tutorials )

		## set input and output files
		#set(DOXYGEN_IN ${CMAKE_CURRENT_SOURCE_DIR}/Doxyfile.in)
		#set(DOXYGEN_OUT ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile)
		#
		## request to configure the file
		#configure_file(${DOXYGEN_IN} ${DOXYGEN_OUT} @ONLY)
		#
		## note the option ALL which allows to build the docs together with the application
		#add_custom_target( doc_doxygen ALL
		# COMMAND ${DOXYGEN_EXECUTABLE} ${DOXYGEN_OUT}
		# WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
		# COMMENT "Generating API documentation with Doxygen"
		# VERBATIM )
		#
		#INSTALL( DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/html DESTINATION ${CMAKE_INSTALL_PREFIX}/share/doc/tnl )
		#

Doxyfile→Documentation/Doxyfile

+22 −27

Original line number	Diff line number	Diff line
		@@ -58,7 +58,7 @@ PROJECT_LOGO =
		# entered, it will be relative to the location where doxygen was started. If
		# left blank the current directory will be used.

		OUTPUT_DIRECTORY = Documentation
		OUTPUT_DIRECTORY =

		# If the CREATE_SUBDIRS tag is set to YES then doxygen will create 4096 sub-
		# directories (in 2 levels) under the output directory of each output format and
		@@ -162,7 +162,7 @@ FULL_PATH_NAMES = YES
		# will be relative from the directory where doxygen is started.
		# This tag requires that the tag FULL_PATH_NAMES is set to YES.

		STRIP_FROM_PATH =
		STRIP_FROM_PATH = ../

		# The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of the
		# path mentioned in the documentation of a class, which tells the reader which
		@@ -318,7 +318,7 @@ TOC_INCLUDE_HEADINGS = 0
		# globally by setting AUTOLINK_SUPPORT to NO.
		# The default value is: YES.

		AUTOLINK_SUPPORT = YES
		AUTOLINK_SUPPORT = NO

		# If you use STL classes (i.e. std::string, std::vector, etc.) but do not want
		# to include (a tag file for) the STL sources as input, then you should set this
		@@ -328,7 +328,7 @@ AUTOLINK_SUPPORT = YES
		# diagrams that involve STL classes more complete and accurate.
		# The default value is: NO.

		BUILTIN_STL_SUPPORT = NO
		BUILTIN_STL_SUPPORT = YES

		# If you use Microsoft's C++/CLI language, you should set this option to YES to
		# enable parsing support.
		@@ -607,7 +607,7 @@ SORT_GROUP_NAMES = NO
		# list.
		# The default value is: NO.

		SORT_BY_SCOPE_NAME = NO
		SORT_BY_SCOPE_NAME = YES

		# If the STRICT_PROTO_MATCHING option is enabled and doxygen fails to do proper
		# type resolution of all parameters of a function it will reject a match between
		@@ -790,7 +790,8 @@ WARN_LOGFILE =
		# spaces. See also FILE_PATTERNS and EXTENSION_MAPPING
		# Note: If this tag is empty the current directory is searched.

		INPUT = src/TNL
		INPUT = main-page.md
		INPUT += ../src/TNL

		# This tag can be used to specify the character encoding of the source files
		# that doxygen parses. Internally doxygen uses the UTF-8 encoding. Doxygen uses
		@@ -889,21 +890,11 @@ EXCLUDE_SYMLINKS = NO
		# Note that the wildcards are matched against the file with absolute path, so to
		# exclude all test directories for example use the pattern /test/

		EXCLUDE_PATTERNS = /Communicators/ \
		/Config/ \
		/Debugging/ \
		/Devices/ \
		/DistributedContainers/ \
		/Exceptions/ \
		EXCLUDE_PATTERNS = /Debugging/ \
		/Experimental/ \
		/Functions/ \
		/Images/ \
		/Matrices/ \
		/Meshes/ \
		/Operators/ \
		/Pointers/ \
		/Problems/ \
		/Solvers/
		/Meshes/GridDetails/ \
		/Meshes/MeshDetails/ \
		/Problems/


		# The EXCLUDE_SYMBOLS tag can be used to specify one or more symbol names
		@@ -915,13 +906,15 @@ EXCLUDE_PATTERNS = /Communicators/ \
		# Note that the wildcards are matched against the file with absolute path, so to
		# exclude all test directories use the pattern /test/

		EXCLUDE_SYMBOLS =
		EXCLUDE_SYMBOLS = detail::,::detail::* # internal namespaces
		EXCLUDE_SYMBOLS += ::__impl # internal namespaces
		EXCLUDE_SYMBOLS += TNL::Assert::* # internal namespace

		# The EXAMPLE_PATH tag can be used to specify one or more files or directories
		# that contain example code fragments that are included (see the \include
		# command).

		EXAMPLE_PATH = src/Examples
		EXAMPLE_PATH = ../src/Examples

		# If the value of the EXAMPLE_PATH tag contains directories, you can use the
		# EXAMPLE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp and
		@@ -997,7 +990,7 @@ FILTER_SOURCE_PATTERNS =
		# (index.html). This can be useful if you have a project on for instance GitHub
		# and want to reuse the introduction page also for the doxygen output.

		USE_MDFILE_AS_MAINPAGE =
		USE_MDFILE_AS_MAINPAGE = main-page.md

		#---------------------------------------------------------------------------
		# Configuration options related to source browsing
		@@ -1083,7 +1076,7 @@ USE_HTAGS = NO
		# See also: Section \class.
		# The default value is: YES.

		VERBATIM_HEADERS = YES
		VERBATIM_HEADERS = NO

		# If the CLANG_ASSISTED_PARSING tag is set to YES then doxygen will use the
		# clang parser (see: http://clang.llvm.org/) for more accurate parsing at the
		@@ -1217,7 +1210,7 @@ HTML_EXTRA_STYLESHEET =
		# files will be copied as-is; there are no commands or markers available.
		# This tag requires that the tag GENERATE_HTML is set to YES.

		HTML_EXTRA_FILES =
		HTML_EXTRA_FILES = tnl-logo.jpg

		# The HTML_COLORSTYLE_HUE tag controls the color of the HTML output. Doxygen
		# will adjust the colors in the style sheet and background images according to
		@@ -1681,7 +1674,7 @@ EXTRA_SEARCH_MAPPINGS =
		# If the GENERATE_LATEX tag is set to YES, doxygen will generate LaTeX output.
		# The default value is: YES.

		GENERATE_LATEX = YES
		GENERATE_LATEX = NO

		# The LATEX_OUTPUT tag is used to specify where the LaTeX docs will be put. If a
		# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
		@@ -2152,7 +2145,9 @@ SKIP_FUNCTION_MACROS = YES
		# the path). If a tag file is not located in the directory in which doxygen is
		# run, you must also specify the path to the tagfile here.

		TAGFILES =
		# archive for cppreference.com can be found here:
		# https://en.cppreference.com/w/Cppreference:Archives#Doxygen_tag_file
		TAGFILES = "cppreference-doxygen-web.tag.xml=https://en.cppreference.com/w/"

		# When a file name is specified after GENERATE_TAGFILE, doxygen will create a
		# tag file that is based on the input files it reads. See section "Linking to