summaryrefslogtreecommitdiff
path: root/var
diff options
context:
space:
mode:
authorChristoph Junghans <christoph.junghans@gmail.com>2017-11-08 19:43:13 -0700
committerGitHub <noreply@github.com>2017-11-08 19:43:13 -0700
commitb3f678c1c058a1c24b3851b3c2ded9edd8ae9f7b (patch)
treec1c7eb0c248fd792fe5059e59e8eff477a2c8455 /var
parent877bee3cb5f506130f99c81b66a238579a30b87f (diff)
downloadspack-b3f678c1c058a1c24b3851b3c2ded9edd8ae9f7b.tar.gz
spack-b3f678c1c058a1c24b3851b3c2ded9edd8ae9f7b.tar.bz2
spack-b3f678c1c058a1c24b3851b3c2ded9edd8ae9f7b.tar.xz
spack-b3f678c1c058a1c24b3851b3c2ded9edd8ae9f7b.zip
gasnet: add 1.30.0 (#6167)
* gasnet: add 1.30.0 * gasnet: expose more options as variants * gasnet: change defaults
Diffstat (limited to 'var')
-rw-r--r--var/spack/repos/builtin/packages/gasnet/package.py23
-rw-r--r--var/spack/repos/builtin/packages/legion/package.py4
2 files changed, 20 insertions, 7 deletions
diff --git a/var/spack/repos/builtin/packages/gasnet/package.py b/var/spack/repos/builtin/packages/gasnet/package.py
index 0c8376fbe3..6b8a498671 100644
--- a/var/spack/repos/builtin/packages/gasnet/package.py
+++ b/var/spack/repos/builtin/packages/gasnet/package.py
@@ -35,12 +35,21 @@ class Gasnet(AutotoolsPackage):
homepage = "http://gasnet.lbl.gov"
url = "http://gasnet.lbl.gov/GASNet-1.24.0.tar.gz"
+ version('1.30.0', '2ddb1d8397d62acfd389095ca8da72f6')
version('1.28.2', '6ca0463dc2430570e40646c4d1e97b36')
version('1.28.0', 'b44446d951d3d8954aa1570e3556ba61')
version('1.24.0', 'c8afdf48381e8b5a7340bdb32ca0f41a')
variant('ibv', default=False, description="Support InfiniBand")
variant('mpi', default=True, description="Support MPI")
+ variant('aligned-segments', default=False,
+ description="Requirement to achieve aligned VM segments")
+ variant('pshm', default=True,
+ description="Support inter-process shared memory support")
+ variant('segment-mmap-max', default='16GB',
+ description="Upper bound for mmap-based GASNet segments")
+
+ conflicts('+aligned-segments', when='+pshm')
depends_on('mpi', when='+mpi')
@@ -53,15 +62,19 @@ class Gasnet(AutotoolsPackage):
"--enable-udp",
"--enable-smp-safe",
"--enable-segment-fast",
- "--disable-aligned-segments",
- # TODO: make option so Legion can request builds with/without this.
- # See the Legion webpage for details on when to/not to use.
- "--disable-pshm",
- "--with-segment-mmap-max=64MB",
+ "--enable-pshm" if '+pshm' in self.spec else "--disable-pshm",
+ "--with-segment-mmap-max={0}".format(
+ self.spec.variants['segment-mmap-max'].value),
# for consumers with shared libs
"CC=%s %s" % (spack_cc, self.compiler.pic_flag),
"CXX=%s %s" % (spack_cxx, self.compiler.pic_flag),
]
+
+ if '+aligned-segments' in self.spec:
+ args.append('--enable-aligned-segments')
+ else:
+ args.append('--disable-aligned-segments')
+
if '+mpi' in self.spec:
args.extend(['--enable-mpi', '--enable-mpi-compat', "MPI_CC=%s %s"
% (self.spec['mpi'].mpicc, self.compiler.pic_flag)])
diff --git a/var/spack/repos/builtin/packages/legion/package.py b/var/spack/repos/builtin/packages/legion/package.py
index 8a8d8e58b4..0ec388994f 100644
--- a/var/spack/repos/builtin/packages/legion/package.py
+++ b/var/spack/repos/builtin/packages/legion/package.py
@@ -53,8 +53,8 @@ class Legion(CMakePackage):
variant('shared', default=True, description='Build shared libraries')
depends_on("cmake@3.1:", type='build')
- depends_on("gasnet", when='~mpi')
- depends_on("gasnet+mpi", when='+mpi')
+ depends_on("gasnet~aligned-segments~pshm segment-mmap-max='16GB'", when='~mpi')
+ depends_on("gasnet~aligned-segments~pshm segment-mmap-max='16GB' +mpi", when='+mpi')
def cmake_args(self):
options = [