From 487b1c369098c050aa04f8fd99bf3a6e578847c1 Mon Sep 17 00:00:00 2001 From: Matthew Archer <36638242+ma595@users.noreply.github.com> Date: Wed, 23 Mar 2022 09:22:27 +0000 Subject: kahip: add v3.12, v3.13 and v3.14 (#29648) Co-authored-by: cleathart --- var/spack/repos/builtin/packages/kahip/package.py | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/var/spack/repos/builtin/packages/kahip/package.py b/var/spack/repos/builtin/packages/kahip/package.py index f1def0ce86..ecedfb5412 100644 --- a/var/spack/repos/builtin/packages/kahip/package.py +++ b/var/spack/repos/builtin/packages/kahip/package.py @@ -23,17 +23,24 @@ class Kahip(CMakePackage): """ homepage = 'http://algo2.iti.kit.edu/documents/kahip/index.html' - url = 'https://github.com/KaHIP/KaHIP/archive/v3.11.tar.gz' + url = 'https://github.com/KaHIP/KaHIP/archive/v3.14.tar.gz' git = 'https://github.com/KaHIP/KaHIP.git' maintainers = ["ma595"] version('develop', branch='master') + version('3.14', sha256='9da04f3b0ea53b50eae670d6014ff54c0df2cb40f6679b2f6a96840c1217f242') + version('3.13', sha256='fae21778a4ce8e59ccb98e5cbb6c01f0af7e594657d21f6c0eb2c6e74398deb1') + version('3.12', sha256='df923b94b552772d58b4c1f359b3f2e4a05f7f26ab4ebd00a0ab7d2579f4c257') version('3.11', sha256='347575d48c306b92ab6e47c13fa570e1af1e210255f470e6aa12c2509a8c13e3') version('2.00', sha256='1cc9e5b12fea559288d377e8b8b701af1b2b707de8e550d0bda18b36be29d21d', url='https://algo2.iti.kit.edu/schulz/software_releases/KaHIP_2.00.tar.gz', deprecated=True) + variant('deterministic', default=False, when='@3.13:', description='Compile with the deterministic seed') + variant('metis', default=False, description='metis support') + depends_on('scons', type='build', when='@2:2.10') depends_on('argtable') depends_on('mpi') # Note: upstream package only tested on openmpi + depends_on("metis", when="@3.12: +metis") conflicts('%apple-clang') conflicts('%clang') @@ -62,8 +69,12 @@ class Kahip(CMakePackage): for f in files: filter_file('NCORES=.*', 'NCORES={0}'.format(make_jobs), f) + @when("@3.13:") + def cmake_args(self): + return [self.define_from_variant('DETERMINISTIC_PARHIP', 'deterministic')] + @when("@:2.10") - def cmake(self, spac, prefix): + def cmake(self, spec, prefix): pass @when("@:2.10") -- cgit v1.2.3-60-g2f50