First commit

This commit is contained in:
Gauthier Folzan
2020-03-30 22:22:34 +02:00
parent 22271042cf
commit dbeea6ff98
21 changed files with 1616 additions and 1 deletions

View File

@ -0,0 +1,31 @@
--- a/cmake/modules/AddQuadMathFlags.cmake 2020-03-24 07:54:22.548925006 +0100
+++ b/cmake/modules/AddQuadMathFlags.cmake.patched 2020-03-24 22:53:43.127262894 +0100
@@ -0,0 +1,28 @@
+# Defines the functions to use QuadMath
+#
+# .. cmake_function:: add_dune_quadmath_flags
+#
+# .. cmake_param:: targets
+# :positional:
+# :single:
+# :required:
+#
+# A list of targets to use QuadMath with.
+#
+
+
+function(add_dune_quadmath_flags _targets)
+ if(QUADMATH_FOUND)
+ foreach(_target ${_targets})
+ target_link_libraries(${_target} "quadmath")
+ set_property(TARGET ${_target}
+ APPEND_STRING
+ PROPERTY COMPILE_FLAGS "-DENABLE_QUADMATH=1 -D_GLIBCXX_USE_FLOAT128=1 ")
+ if(${CMAKE_CXX_COMPILER_ID} STREQUAL GNU)
+ set_property(TARGET ${_target}
+ APPEND_STRING
+ PROPERTY COMPILE_FLAGS "-fext-numeric-literals ")
+ endif()
+ endforeach(_target ${_targets})
+ endif(QUADMATH_FOUND)
+endfunction(add_dune_quadmath_flags)

View File

@ -0,0 +1,62 @@
--- a/cmake/modules/FindQuadMath.cmake 2020-03-24 07:54:22.548925006 +0100
+++ b/cmake/modules/FindQuadMath.cmake.patched 2020-03-24 22:53:43.127262894 +0100
@@ -0,0 +1,59 @@
+# .. cmake_module::
+#
+# Find the GCC Quad-Precision library
+#
+# Sets the following variables:
+#
+# :code:`QUADMATH_FOUND`
+# True if the Quad-Precision library was found.
+#
+#
+
+
+# search for the header quadmath.h
+include(CheckIncludeFile)
+check_include_file(quadmath.h QUADMATH_HEADER)
+
+include(CheckCSourceCompiles)
+include(CMakePushCheckState)
+
+cmake_push_check_state() # Save variables
+set(CMAKE_REQUIRED_LIBRARIES quadmath)
+check_c_source_compiles("
+#include <quadmath.h>
+
+int main ()
+{
+ __float128 r = 1.0q;
+ r = strtoflt128(\"1.2345678\", NULL);
+ return 0;
+}" QUADMATH_COMPILES)
+cmake_pop_check_state()
+
+
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(
+ "QuadMath"
+ DEFAULT_MSG
+ QUADMATH_HEADER
+ QUADMATH_COMPILES
+)
+
+# text for feature summary
+set_package_properties("QuadMath" PROPERTIES
+ DESCRIPTION "GCC Quad-Precision library")
+
+# set HAVE_QUADMATH for config.h
+set(HAVE_QUADMATH ${QUADMATH_FOUND})
+
+# -fext-numeric-literals is a GCC extension not available in other compilers like clang
+if(${CMAKE_CXX_COMPILER_ID} STREQUAL GNU)
+ set(_QUADMATH_EXT_NUMERIC_LITERALS "-fext-numeric-literals")
+endif()
+
+# register all QuadMath related flags
+if(HAVE_QUADMATH)
+ dune_register_package_flags(COMPILE_DEFINITIONS "ENABLE_QUADMATH=1" "_GLIBCXX_USE_FLOAT128=1"
+ COMPILE_OPTIONS ${_QUADMATH_EXT_NUMERIC_LITERALS}
+ LIBRARIES "quadmath")
+endif()

View File

@ -0,0 +1,114 @@
# Copyright 2013-2020 Lawrence Livermore National Security, LLC and other
# Spack Project Developers. See the top-level COPYRIGHT file for details.
#
# SPDX-License-Identifier: (Apache-2.0 OR MIT)
# ----------------------------------------------------------------------------
# If you submit this package back to Spack as a pull request,
# please first remove this boilerplate and all FIXME comments.
#
# This is a template package file for Spack. We've put "FIXME"
# next to all the things you'll want to change. Once you've handled
# them, you can save this file and test your package like this:
#
# spack install dune-uggrid
#
# You can edit this file again by typing:
#
# spack edit dune-uggrid
#
# See the Spack documentation for more information on packaging.
# ----------------------------------------------------------------------------
from spack import *
class DuneUggrid(CMakePackage):
"""
dune-uggrid is a fork of the old UG finite element software, wrapped
as a Dune module, and stripped of everything but the grid data
structure.
You need this module if you want to use the UGGrid grid
implementation from dune-grid.
"""
homepage = "https://www.dune-project.org"
url = "https://github.com/dune-mirrors/dune-uggrid/archive/v2.6.0.tar.gz"
# FIXME: Add a list of GitHub accounts to
# notify when the package is updated.
# maintainers = ['github_user1', 'github_user2']
version('2.7.0', sha256='bcf4afd386f23cdb7f7ba16cc2fec4918c4afb516761ef7905af8378ea86eb4c')
version('2.6.0', sha256='3da75c672c151ca711526f2c0619d6f1ebf8f489c972066ee3b43252ea8daed4')
version('2.5.2', sha256='3a484376e625fff880ff9db6be53ccca0080c5ce7229ed31c09e09fa4a4a4afa')
version('2.5.1', sha256='55ccb3a4b4aad0c22c2cda6fa2b50325caf5c4493a9e033562fc03cf5a3b3f61')
version('2.5.0', sha256='b7f5ac061b6d5f30e22a2acfff205a3fc4751f57f1e301db83c66da2b9105bc9')
#option
variant('blas', default=True, description='Build with BLAS support')
variant('lapack', default=True, description='Build with LAPACK support')
variant('gmp', default=True, description='Build with GNU multi-precision library support')
variant('tbb', default=True, description='Build with Threading Building Blocks library support')
variant('mkl', default=True, description='Build with Threading Building Blocks library support')
variant('doxygen', default=True, description='Create Doxygen documentation')
variant('sphinx', default=True, description='Create Sphinx documentation')
variant('vc', default=True, description='Build C++ Vectorization library support')
variant('imagemagick', default=False, description='Imagemagick support')
variant('2d', default=True, description='Build library for 2d')
variant('3d', default=True, description='Build library for 3d')
variant('threads', default=True, description='Activate pThread support')
variant('shared', default=False, description='Enables the build of shared libraries.')
variant('python', default=True, description='Build with Python')
variant('extrautils', default=True, description='Enable compilation and installation of extra utilities from the src subdirectory')
variant('selector', default=True, description='Grid selector definition added to config.h')
#dependencies
depends_on('dune-common')
depends_on('cmake@3.1:', type='build')
depends_on('cmake@2.8.12:', when='@2.6', type='build')
depends_on('mpi')
depends_on('blas', when='+blas')
depends_on('lapack', when='+lapack')
depends_on('doxygen', type='build', when='+doxygen')
depends_on('gmp', when='+gmp')
depends_on('intel-tbb', when='+tbb')
depends_on('intel-mkl', when='+mkl')
depends_on('python@3.0:')
depends_on('py-sphinx', type='build', when='+sphinx')
depends_on('vc', when='+vc')
depends_on('pkg-config', type='build')
depends_on('imagemagick', type='build', when='+imagemagick')
patch('parallel_CMakeList.patch', when='@2.6')
patch('AddQuadMathFlags.cmake.patch')
patch('FindQuadMath.cmake.patch')
def cmake_args(self):
"""Populate cmake arguments."""
spec = self.spec
def variant_bool(feature, on='ON', off='OFF'):
"""Ternary for spec variant to ON/OFF string"""
if feature in spec:
return on
return off
def nvariant_bool(feature):
"""Negated ternary for spec variant to OFF/ON string"""
return variant_bool(feature, on='OFF', off='ON')
cmake_args = [
# '-DDUNE_BUILD_BOTH_LIBS=%s' % variant_bool('+shared'),
'-DBUILD_SHARED_LIBS:BOOL=%s' % variant_bool('+shared'),
'-DDUNE_GRID_EXTRA_UTILS:BOOL=%s' % variant_bool('+extrautils'),
'-DDUNE_GRID_GRIDTYPE_SELECTOR:BOOL=%s' % variant_bool('+selector'),
'-DUSE_PTHREADS:BOOL=%s' % variant_bool('+threads'),
]
if 'python' in spec:
cmake_args.append('-DPYTHON_INSTALL_LOCATION:STRING="system"')
if self.spec.variants['build_type'].value == 'Debug':
cmake_args.append('UG_ENABLE_DEBUGGING:BOOL=True')
cmake_args.append('-DUG_ENABLE_2D:BOOL=%s' % variant_bool('+2d'))
cmake_args.append('-DUG_ENABLE_3D:BOOL=%s' % variant_bool('+3d'))
return cmake_args

View File

@ -0,0 +1,12 @@
--- a/parallel/CMakeLists.txt 2020-03-24 23:00:09.873941559 +0100
+++ b/parallel/CMakeLists.txt.patched 2020-03-24 23:11:41.287296340 +0100
@@ -3,7 +3,8 @@
# Maybe dune-common should export them?
add_definitions(-DENABLE_MPI=1 -DMPICH_SKIP_MPICXX -DMPIPP_H)
include_directories("${MPI_DUNE_INCLUDE_PATH}")
- set_property(DIRECTORY APPEND PROPERTY COMPILE_OPTIONS "${MPI_DUNE_COMPILE_FLAGS}")
+ separate_arguments(MPI_DUNE_COMPILE_FLAGS UNIX_COMMAND "${MPI_DUNE_COMPILE_FLAGS}")
+ set_property(DIRECTORY APPEND PROPERTY COMPILE_OPTIONS ${MPI_DUNE_COMPILE_FLAGS})
ug_add_dim_libs(parallel OBJECT initparallel.cc) # OBJECT_DIM_LIBS ddd dddif)
endif()