hlrs-software-stack/spack
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Add latest version of eigen (#7530)

Browse source 
* Add latest version of eigen

* Fix bug in ptscotch detection
This commit is contained in:
Adam J. Stewart 2018-03-22 07:25:26 -05:00 committed by GitHub
parent e71681458b
commit aa84ddffed
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 31 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
var/spack/repos/builtin/packages/eigen/find-ptscotch.patch Normal file
View file

@ -0,0 +1,27 @@
Version 3.3.4 contained a bug that prevented it from finding scotch~mpi.
diff --git a/tmp/FindPTSCOTCH.cmake b/cmake/FindPTSCOTCH.cmake
index 1396d05..23451b1 100644
--- a/tmp/FindPTSCOTCH.cmake
+++ b/cmake/FindPTSCOTCH.cmake
@@ -167,11 +167,11 @@ endif()
# If found, add path to cmake variable
# ------------------------------------
+unset(PTSCOTCH_INCLUDE_DIRS)
foreach(ptscotch_hdr ${PTSCOTCH_hdrs_to_find})
if (PTSCOTCH_${ptscotch_hdr}_DIRS)
list(APPEND PTSCOTCH_INCLUDE_DIRS "${PTSCOTCH_${ptscotch_hdr}_DIRS}")
else ()
- set(PTSCOTCH_INCLUDE_DIRS "PTSCOTCH_INCLUDE_DIRS-NOTFOUND")
if (NOT PTSCOTCH_FIND_QUIETLY)
message(STATUS "Looking for ptscotch -- ${ptscotch_hdr} not found")
endif()
@@ -255,7 +255,6 @@ foreach(ptscotch_lib ${PTSCOTCH_libs_to_find})
list(APPEND PTSCOTCH_LIBRARIES "${PTSCOTCH_${ptscotch_lib}_LIBRARY}")
list(APPEND PTSCOTCH_LIBRARY_DIRS "${${ptscotch_lib}_lib_path}")
else ()
- list(APPEND PTSCOTCH_LIBRARIES "${PTSCOTCH_${ptscotch_lib}_LIBRARY}")
if (NOT PTSCOTCH_FIND_QUIETLY)
message(STATUS "Looking for ptscotch -- lib ${ptscotch_lib} not found")
endif()

5
var/spack/repos/builtin/packages/eigen/package.py
View file

@ -31,8 +31,9 @@ class Eigen(CMakePackage):
""" """
homepage = 'http://eigen.tuxfamily.org/' homepage = 'http://eigen.tuxfamily.org/'
url = 'https://bitbucket.org/eigen/eigen/get/3.3.3.tar.bz2' url = 'https://bitbucket.org/eigen/eigen/get/3.3.4.tar.bz2'
version('3.3.4', 'a7aab9f758249b86c93221ad417fbe18')
version('3.3.3', 'b2ddade41040d9cf73b39b4b51e8775b') version('3.3.3', 'b2ddade41040d9cf73b39b4b51e8775b')
version('3.3.1', 'edb6799ef413b0868aace20d2403864c') version('3.3.1', 'edb6799ef413b0868aace20d2403864c')
version('3.2.10', 'a85bb68c82988648c3d53ba9768d7dcbcfe105f8') version('3.2.10', 'a85bb68c82988648c3d53ba9768d7dcbcfe105f8')
@ -58,3 +59,5 @@ class Eigen(CMakePackage):
depends_on('suite-sparse', when='+suitesparse') depends_on('suite-sparse', when='+suitesparse')
depends_on('mpfr@2.3.0:', when='+mpfr') depends_on('mpfr@2.3.0:', when='+mpfr')
depends_on('gmp', when='+mpfr') depends_on('gmp', when='+mpfr')
patch('find-ptscotch.patch', when='@3.3.4')