From 266a3593ce17b3baabf2708fbf52b3ea927ccdf9 Mon Sep 17 00:00:00 2001 From: Axel Huebl Date: Sun, 11 Feb 2018 17:56:08 +0100 Subject: [PATCH] Xtensor 0.15.1 (#7215) Add the latest xtensor release and its dependencies. --- var/spack/repos/builtin/packages/xsimd/package.py | 3 ++- var/spack/repos/builtin/packages/xtensor/package.py | 8 +++++--- var/spack/repos/builtin/packages/xtl/package.py | 1 + 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/var/spack/repos/builtin/packages/xsimd/package.py b/var/spack/repos/builtin/packages/xsimd/package.py index ec177fe4a0..883f15d441 100644 --- a/var/spack/repos/builtin/packages/xsimd/package.py +++ b/var/spack/repos/builtin/packages/xsimd/package.py @@ -34,9 +34,10 @@ class Xsimd(CMakePackage): version('develop', branch='master', git='https://github.com/QuantStack/xsimd.git') + version('4.0.0', '4186ec94985daa3fc284d9d0d4aa03e8') version('3.1.0', '29c1c525116cbda28f610e2bf24a827e') - depends_on('googletest') + depends_on('googletest', type='build') # C++14 support conflicts('%gcc@:4.8') diff --git a/var/spack/repos/builtin/packages/xtensor/package.py b/var/spack/repos/builtin/packages/xtensor/package.py index b8a0a2b75c..4cb2a9c5ca 100644 --- a/var/spack/repos/builtin/packages/xtensor/package.py +++ b/var/spack/repos/builtin/packages/xtensor/package.py @@ -34,15 +34,17 @@ class Xtensor(CMakePackage): version('develop', branch='master', git='https://github.com/QuantStack/xtensor.git') + version('0.15.1', 'c24ecc406003bd1ac22291f1f7cac29a') version('0.13.1', '80e7e33f05066d17552bf0f8b582dcc5') variant('xsimd', default=True, description='Enable SIMD intrinsics') depends_on('xtl') - depends_on('xtl@0.3.4:', when='@develop') - depends_on('xtl@0.3.3:', when='@0.13.1') - depends_on('xsimd@3.1.0', when='+xsimd') + depends_on('xtl@0.4.0:0.4.99', when='@0.15.1:') + depends_on('xtl@0.3.3:0.3.99', when='@0.13.1') + depends_on('xsimd@4.0.0', when='@0.15.1 +xsimd') + depends_on('xsimd@3.1.0', when='@0.13.1 +xsimd') # C++14 support conflicts('%gcc@:4.8') diff --git a/var/spack/repos/builtin/packages/xtl/package.py b/var/spack/repos/builtin/packages/xtl/package.py index 77661865a1..ed6f93d84b 100644 --- a/var/spack/repos/builtin/packages/xtl/package.py +++ b/var/spack/repos/builtin/packages/xtl/package.py @@ -34,6 +34,7 @@ class Xtl(CMakePackage): version('develop', branch='master', git='https://github.com/QuantStack/xtl.git') + version('0.4.0', '48c76b63ab12e497a53fb147c41ae747') version('0.3.4', 'b76548a55f1e171a9c849e5ed543e8b3') version('0.3.3', '09b6d9611e460d9280bf1156bcca20f5')