From 4b3b0232847157f3ab1939bb46ba41961053a2b3 Mon Sep 17 00:00:00 2001 From: Jean-Paul Pelteret Date: Sun, 29 Mar 2020 17:56:15 +0200 Subject: deal.II: Update dependencies and fix target for vectorisation (#15731) * Update ADOL-C homepage url * Update SymEngine to v0.6 * deal.II: Add code to add target vectorisation flags --- var/spack/repos/builtin/packages/adol-c/package.py | 2 +- var/spack/repos/builtin/packages/dealii/package.py | 9 +++++++++ var/spack/repos/builtin/packages/symengine/package.py | 3 ++- 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/var/spack/repos/builtin/packages/adol-c/package.py b/var/spack/repos/builtin/packages/adol-c/package.py index 741b57773b..def99d8a4e 100644 --- a/var/spack/repos/builtin/packages/adol-c/package.py +++ b/var/spack/repos/builtin/packages/adol-c/package.py @@ -11,7 +11,7 @@ class AdolC(AutotoolsPackage): derivatives of vector functions in C and C++ programs by operator overloading.""" - homepage = "https://projects.coin-or.org/ADOL-C" + homepage = "https://github.com/coin-or/ADOL-C" url = "https://github.com/coin-or/ADOL-C/archive/releases/2.7.2.tar.gz" git = "https://github.com/coin-or/ADOL-C.git" version('master', branch='master') diff --git a/var/spack/repos/builtin/packages/dealii/package.py b/var/spack/repos/builtin/packages/dealii/package.py index 1b9e02c044..d3a58cb835 100644 --- a/var/spack/repos/builtin/packages/dealii/package.py +++ b/var/spack/repos/builtin/packages/dealii/package.py @@ -5,6 +5,8 @@ from spack import * +import os + class Dealii(CMakePackage, CudaPackage): """C++ software library providing well-documented tools to build finite @@ -459,6 +461,13 @@ class Dealii(CMakePackage, CudaPackage): ' '.join(cxx_flags)) ]) + # Add flags for machine vectorization, used when tutorials + # and user code is built. + # See https://github.com/dealii/dealii/issues/9164 + options.extend([ + '-DDEAL_II_CXX_FLAGS=%s' % os.environ['SPACK_TARGET_ARGS'] + ]) + return options def setup_run_environment(self, env): diff --git a/var/spack/repos/builtin/packages/symengine/package.py b/var/spack/repos/builtin/packages/symengine/package.py index ceb1b9a5ed..a9c866edb7 100644 --- a/var/spack/repos/builtin/packages/symengine/package.py +++ b/var/spack/repos/builtin/packages/symengine/package.py @@ -14,7 +14,8 @@ class Symengine(CMakePackage): url = "https://github.com/symengine/symengine/archive/v0.2.0.tar.gz" git = "https://github.com/symengine/symengine.git" - version('develop', branch='master') + version('master', branch='master') + version('0.6.0', sha256='4d2caa86c03eaaa8ed004084d02f87b5c51b6229f8ba70d161227e22d6302f0a') version('0.5.0', sha256='5d02002f00d16a0928d1056e6ecb8f34fd59f3bfd8ed0009a55700334dbae29b') version('0.4.0', sha256='dd755901a9e2a49e53ba3bbe3f565f94265af05299e57a7b592186dd35916a1b') version('0.3.0', sha256='591463cb9e741d59f6dfd39a7943e3865d3afe9eac47d1a9cbf5ca74b9c49476') -- cgit v1.2.3-60-g2f50