zhangyiss/spack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1. raise an exception if the multithreaded and singlethreaded options are both

Browse Source 
disabled
2. invoke the b2 installation once for each enabled threading option (apparently
the install fails if a single call has both options enabled for mpi)
This commit is contained in:
Peter Scheibel 2016-01-15 18:07:41 -08:00
parent 50727527bc
commit d22cf1aed1
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
var/spack/packages/boost/package.py
View File

@ -138,19 +138,21 @@ def determine_b2_options(self, spec, options):
if '+shared' in spec:
linkTypes.append('shared')
#TODO: at least one of these two options must be active
threadingOpts = []
if '+multithreaded' in spec:
threadingOpts.append('multi')
if '+singlethreaded' in spec:
threadingOpts.append('single')
if not threadingOpts:
raise RuntimeError("At least one of {singlethreaded, multithreaded} must be enabled")
options.extend([
'toolset=%s' % self.determine_toolset(spec),
'link=%s' % ','.join(linkTypes),
'threading=%s' % ','.join(threadingOpts),
'--layout=tagged'])
return threadingOpts
def install(self, spec, prefix):
withLibs = list()
for lib in Boost.libs:
@ -181,6 +183,10 @@ def install(self, spec, prefix):
b2 = Executable(b2name)
b2_options = ['-j', '%s' % make_jobs]
self.determine_b2_options(spec, b2_options)
threadingOpts = self.determine_b2_options(spec, b2_options)
# In theory it could be done on one call but it fails on
# Boost.MPI if the threading options are not separated.
for threadingOpt in threadingOpts:
b2('install', 'threading=%s' % threadingOpt, *b2_options)
b2('install', *b2_options)