From 1cd33e7052e00ff2d194c3635f8c9435dec48789 Mon Sep 17 00:00:00 2001 From: "Elsa Gonsiorowski, PhD" Date: Wed, 8 Aug 2018 18:40:38 -0700 Subject: ECP VELOC Package update (#8910) * update of veloc & dep versions (replace old non-working versions) * veloc doesn't work with gcc <= 4.9.3 * explicitly pass MPI to CMake for veloc build --- var/spack/repos/builtin/packages/axl/package.py | 4 ++-- var/spack/repos/builtin/packages/er/package.py | 2 +- var/spack/repos/builtin/packages/kvtree/package.py | 2 +- var/spack/repos/builtin/packages/rankstr/package.py | 2 +- var/spack/repos/builtin/packages/redset/package.py | 2 +- var/spack/repos/builtin/packages/shuffile/package.py | 2 +- var/spack/repos/builtin/packages/veloc/package.py | 7 +++++-- 7 files changed, 12 insertions(+), 9 deletions(-) diff --git a/var/spack/repos/builtin/packages/axl/package.py b/var/spack/repos/builtin/packages/axl/package.py index 21ba3f797e..32bbac6914 100644 --- a/var/spack/repos/builtin/packages/axl/package.py +++ b/var/spack/repos/builtin/packages/axl/package.py @@ -45,7 +45,7 @@ class Axl(CMakePackage): tags = ['ecp'] version('master', branch='master') - version('0.1.0', '1ff16c046c3a080c252e0bf4251b83bc') + version('0.1.1', sha256='7ec0417447c5a3cc0b6e46ff3f646984410c77e6c2081cf0c748781384be739b') variant('async_api', default='daemon', description="Set of async transfer APIs to enable", @@ -64,7 +64,7 @@ class Axl(CMakePackage): args.append("-DAXL_LINK_STATIC=ON") args.append("-DWITH_KVTREE_PREFIX=%s" % self.spec['kvtree'].prefix) - apis = self.spec.variants['async_api'].value.split(',') + apis = list(self.spec.variants['async_api'].value) if 'daemon' in apis: args.append('-DAXL_ASYNC_DAEMON=ON') apis.remove('daemon') diff --git a/var/spack/repos/builtin/packages/er/package.py b/var/spack/repos/builtin/packages/er/package.py index baf2d01db7..ea1773204d 100644 --- a/var/spack/repos/builtin/packages/er/package.py +++ b/var/spack/repos/builtin/packages/er/package.py @@ -35,7 +35,7 @@ class Er(CMakePackage): tags = ['ecp'] version('master', branch='master') - version('0.0.2', '24ad8f87bce2b6d900f1fb67452c3672') + version('0.0.3', sha256='9aa08f9fe70e42f0da27a5d90d4643b520d61f24742303bf016322823b3c4d26') depends_on('mpi') depends_on('kvtree') diff --git a/var/spack/repos/builtin/packages/kvtree/package.py b/var/spack/repos/builtin/packages/kvtree/package.py index 46392716df..1e027b498f 100644 --- a/var/spack/repos/builtin/packages/kvtree/package.py +++ b/var/spack/repos/builtin/packages/kvtree/package.py @@ -36,7 +36,7 @@ class Kvtree(CMakePackage): tags = ['ecp'] version('master', branch='master') - version('1.0.1', 'f007b4b930d12fc0eb784b4dc3af823e') + version('1.0.2', sha256='6b54f4658e5ebab747c0c2472b1505ac1905eefc8a0b2a97d8776f800ee737a3') variant('mpi', default=True, description="Build with MPI message packing") depends_on('mpi', when='+mpi') diff --git a/var/spack/repos/builtin/packages/rankstr/package.py b/var/spack/repos/builtin/packages/rankstr/package.py index 82df492092..f976744fc0 100644 --- a/var/spack/repos/builtin/packages/rankstr/package.py +++ b/var/spack/repos/builtin/packages/rankstr/package.py @@ -35,7 +35,7 @@ class Rankstr(CMakePackage): tags = ['ecp'] version('master', branch='master') - version('0.0.1', 'abe06fa6a78cfe20ec0c78717ac2f2ed') + version('0.0.2', sha256='c16d53aa9bb79934cbe2dcd8612e2db7d59de80be500c104e39e8623d4eacd8e') depends_on('mpi') diff --git a/var/spack/repos/builtin/packages/redset/package.py b/var/spack/repos/builtin/packages/redset/package.py index 0bd4ffc39f..971be198b4 100644 --- a/var/spack/repos/builtin/packages/redset/package.py +++ b/var/spack/repos/builtin/packages/redset/package.py @@ -35,7 +35,7 @@ class Redset(CMakePackage): tags = ['ecp'] version('master', branch='master') - version('0.0.2', '370d4dd477ebcfdd28dcc6375c22f731') + version('0.0.3', sha256='f110c9b42209d65f84a8478b919b27ebe2d566839cb0cd0c86ccbdb1f51598f4') depends_on('mpi') depends_on('rankstr') diff --git a/var/spack/repos/builtin/packages/shuffile/package.py b/var/spack/repos/builtin/packages/shuffile/package.py index 2026f51b28..817f5c70b5 100644 --- a/var/spack/repos/builtin/packages/shuffile/package.py +++ b/var/spack/repos/builtin/packages/shuffile/package.py @@ -35,7 +35,7 @@ class Shuffile(CMakePackage): tags = ['ecp'] version('master', branch='master') - version('0.0.2', 'eca45150d83e21ac51049133a2308d34') + version('0.0.3', sha256='6debdd9d6e6f1c4ec31015d7956e8b556acd61ce31f757e4d1fa5002029c75e2') depends_on('mpi') depends_on('kvtree') diff --git a/var/spack/repos/builtin/packages/veloc/package.py b/var/spack/repos/builtin/packages/veloc/package.py index 0db99088c6..18ba133f04 100644 --- a/var/spack/repos/builtin/packages/veloc/package.py +++ b/var/spack/repos/builtin/packages/veloc/package.py @@ -36,7 +36,7 @@ class Veloc(CMakePackage): tags = ['ecp'] version('master', branch='master') - version('1.0', '98fe2d9abd2a1b53d7a52267dab91fae') + version('1.0', '98fe2d9abd2a1b53d7a52267dab91fae', preferred=True) version('1.0rc1', 'c6db0de56b5b865183b1fa719ac74c1d') depends_on('boost~atomic~chrono~clanglibcpp~date_time~debug~exception' @@ -50,6 +50,8 @@ class Veloc(CMakePackage): depends_on('axl') depends_on('cmake@3.9:', type='build') + conflicts('%gcc@:4.9.3') + # requires C++11 def flag_handler(self, name, flags): flags = list(flags) @@ -61,7 +63,8 @@ class Veloc(CMakePackage): args = [ "-DWITH_AXL_PREFIX=%s" % self.spec['axl'].prefix, "-DWITH_ER_PREFIX=%s" % self.spec['er'].prefix, - "-DBOOST_ROOT=%s" % self.spec['boost'].prefix + "-DBOOST_ROOT=%s" % self.spec['boost'].prefix, + "-DMPI_CXX_COMPILER=%s" % self.spec['mpi'].mpicxx ] return args -- cgit v1.2.3-70-g09d2