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

qthreads package: make hwloc dependency optional and add version 1.14 (#11780)

Browse source
This commit is contained in:
Carson Woods 2019-06-28 12:43:06 -06:00 committed by Peter Scheibel
parent 5e9437866b
commit 5873beb83f
1 changed files with 15 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
var/spack/repos/builtin/packages/qthreads/package.py
View file

@ -20,6 +20,7 @@ class Qthreads(AutotoolsPackage):
homepage = "http://www.cs.sandia.gov/qthreads/" homepage = "http://www.cs.sandia.gov/qthreads/"
url = "https://github.com/Qthreads/qthreads/releases/download/1.10/qthread-1.10.tar.bz2" url = "https://github.com/Qthreads/qthreads/releases/download/1.10/qthread-1.10.tar.bz2"
version("1.14", "3e6eb58baf78dc961b19a37b2dc4f9a5")
version("1.12", "c857d175f8135eaa669f3f8fa0fb0c09") version("1.12", "c857d175f8135eaa669f3f8fa0fb0c09")
version("1.11", "68b5f9a41cfd1a2ac112cc4db0612326") version("1.11", "68b5f9a41cfd1a2ac112cc4db0612326")
version("1.10", "d1cf3cf3f30586921359f7840171e551") version("1.10", "d1cf3cf3f30586921359f7840171e551")
@ -27,12 +28,21 @@ class Qthreads(AutotoolsPackage):
patch("restrict.patch", when="@:1.10") patch("restrict.patch", when="@:1.10")
patch("trap.patch", when="@:1.10") patch("trap.patch", when="@:1.10")
depends_on("hwloc") variant(
'hwloc',
default=True,
description='hwloc support'
)
depends_on("hwloc@1.0:1.99", when="+hwloc")
def configure_args(self): def configure_args(self):
spec = self.spec spec = self.spec
args = [ if "+hwloc" in self.spec:
"--enable-guard-pages", args = [
"--with-topology=hwloc", "--enable-guard-pages",
"--with-hwloc=%s" % spec["hwloc"].prefix] "--with-topology=hwloc",
"--with-hwloc=%s" % spec["hwloc"].prefix]
else:
args = ["--with-topology=no"]
return args return args