Cleaning flake warnings in mumps package
This commit is contained in:
parent
e124c86a4f
commit
498c098d11
@ -25,7 +25,6 @@
|
|||||||
from spack import *
|
from spack import *
|
||||||
import os
|
import os
|
||||||
import sys
|
import sys
|
||||||
import glob
|
|
||||||
import subprocess
|
import subprocess
|
||||||
|
|
||||||
|
|
||||||
@ -48,7 +47,6 @@ class Mumps(Package):
|
|||||||
variant('idx64', default=False, description='Use int64_t/integer*8 as default index type')
|
variant('idx64', default=False, description='Use int64_t/integer*8 as default index type')
|
||||||
variant('shared', default=True, description='Build shared libraries')
|
variant('shared', default=True, description='Build shared libraries')
|
||||||
|
|
||||||
|
|
||||||
depends_on('scotch + esmumps', when='~ptscotch+scotch')
|
depends_on('scotch + esmumps', when='~ptscotch+scotch')
|
||||||
depends_on('scotch + esmumps + mpi', when='+ptscotch')
|
depends_on('scotch + esmumps + mpi', when='+ptscotch')
|
||||||
depends_on('metis@5:', when='+metis')
|
depends_on('metis@5:', when='+metis')
|
||||||
@ -66,43 +64,56 @@ class Mumps(Package):
|
|||||||
# end before install
|
# end before install
|
||||||
# def patch(self):
|
# def patch(self):
|
||||||
def write_makefile_inc(self):
|
def write_makefile_inc(self):
|
||||||
if ('+parmetis' in self.spec or '+ptscotch' in self.spec) and '+mpi' not in self.spec:
|
if (('+parmetis' in self.spec or
|
||||||
raise RuntimeError('You cannot use the variants parmetis or ptscotch without mpi')
|
'+ptscotch' in self.spec)) and '+mpi' not in self.spec:
|
||||||
|
raise RuntimeError('You cannot use the variants parmetis or ptscotch without mpi') # NOQA: E501
|
||||||
|
|
||||||
makefile_conf = ["LIBBLAS = -L%s -lblas" % self.spec['blas'].prefix.lib]
|
makefile_conf = [
|
||||||
|
"LIBBLAS = -L%s -lblas" % self.spec['blas'].prefix.lib
|
||||||
|
]
|
||||||
|
|
||||||
orderings = ['-Dpord']
|
orderings = ['-Dpord']
|
||||||
|
|
||||||
if '+ptscotch' in self.spec or '+scotch' in self.spec:
|
if '+ptscotch' in self.spec or '+scotch' in self.spec:
|
||||||
join_lib = ' -l%s' % ('pt' if '+ptscotch' in self.spec else '')
|
join_lib = ' -l%s' % ('pt' if '+ptscotch' in self.spec else '')
|
||||||
makefile_conf.extend(
|
makefile_conf.extend([
|
||||||
["ISCOTCH = -I%s" % self.spec['scotch'].prefix.include,
|
"ISCOTCH = -I%s" % self.spec['scotch'].prefix.include,
|
||||||
"LSCOTCH = -L%s %s%s" % (self.spec['scotch'].prefix.lib,
|
"LSCOTCH = -L%s %s%s" % (self.spec['scotch'].prefix.lib,
|
||||||
join_lib,
|
join_lib,
|
||||||
join_lib.join(['esmumps', 'scotch', 'scotcherr']))])
|
join_lib.join(['esmumps',
|
||||||
|
'scotch',
|
||||||
|
'scotcherr']))
|
||||||
|
])
|
||||||
orderings.append('-Dscotch')
|
orderings.append('-Dscotch')
|
||||||
if '+ptscotch' in self.spec:
|
if '+ptscotch' in self.spec:
|
||||||
orderings.append('-Dptscotch')
|
orderings.append('-Dptscotch')
|
||||||
|
|
||||||
if '+parmetis' in self.spec and '+metis' in self.spec:
|
if '+parmetis' in self.spec and '+metis' in self.spec:
|
||||||
libname = 'parmetis' if '+parmetis' in self.spec else 'metis'
|
makefile_conf.extend([
|
||||||
makefile_conf.extend(
|
"IMETIS = -I%s" % self.spec['parmetis'].prefix.include,
|
||||||
["IMETIS = -I%s" % self.spec['parmetis'].prefix.include,
|
"LMETIS = -L%s -l%s -L%s -l%s" % (
|
||||||
"LMETIS = -L%s -l%s -L%s -l%s" % (self.spec['parmetis'].prefix.lib, 'parmetis',self.spec['metis'].prefix.lib, 'metis')])
|
self.spec['parmetis'].prefix.lib, 'parmetis',
|
||||||
|
self.spec['metis'].prefix.lib, 'metis')
|
||||||
|
])
|
||||||
|
|
||||||
orderings.append('-Dparmetis')
|
orderings.append('-Dparmetis')
|
||||||
elif '+metis' in self.spec:
|
elif '+metis' in self.spec:
|
||||||
makefile_conf.extend(
|
makefile_conf.extend([
|
||||||
["IMETIS = -I%s" % self.spec['metis'].prefix.include,
|
"IMETIS = -I%s" % self.spec['metis'].prefix.include,
|
||||||
"LMETIS = -L%s -l%s" % (self.spec['metis'].prefix.lib, 'metis')])
|
"LMETIS = -L%s -l%s" % (self.spec['metis'].prefix.lib,
|
||||||
|
'metis')
|
||||||
|
])
|
||||||
|
|
||||||
orderings.append('-Dmetis')
|
orderings.append('-Dmetis')
|
||||||
|
|
||||||
makefile_conf.append("ORDERINGSF = %s" % (' '.join(orderings)))
|
makefile_conf.append("ORDERINGSF = %s" % (' '.join(orderings)))
|
||||||
|
|
||||||
# when building shared libs need -fPIC, otherwise
|
# when building shared libs need -fPIC, otherwise /usr/bin/ld:
|
||||||
# /usr/bin/ld: graph.o: relocation R_X86_64_32 against `.rodata.str1.1' can not be used when making a shared object; recompile with -fPIC
|
# graph.o: relocation R_X86_64_32 against `.rodata.str1.1' can
|
||||||
|
# not be used when making a shared object; recompile with
|
||||||
|
# -fPIC
|
||||||
fpic = '-fPIC' if '+shared' in self.spec else ''
|
fpic = '-fPIC' if '+shared' in self.spec else ''
|
||||||
|
|
||||||
# TODO: test this part, it needs a full blas, scalapack and
|
# TODO: test this part, it needs a full blas, scalapack and
|
||||||
# partitionning environment with 64bit integers
|
# partitionning environment with 64bit integers
|
||||||
if '+idx64' in self.spec:
|
if '+idx64' in self.spec:
|
||||||
@ -110,7 +121,7 @@ def write_makefile_inc(self):
|
|||||||
# the fortran compilation flags most probably are
|
# the fortran compilation flags most probably are
|
||||||
# working only for intel and gnu compilers this is
|
# working only for intel and gnu compilers this is
|
||||||
# perhaps something the compiler should provide
|
# perhaps something the compiler should provide
|
||||||
['OPTF = %s -O -DALLOW_NON_INIT %s' % (fpic,'-fdefault-integer-8' if self.compiler.name == "gcc" else '-i8'),
|
['OPTF = %s -O -DALLOW_NON_INIT %s' % (fpic, '-fdefault-integer-8' if self.compiler.name == "gcc" else '-i8'), # NOQA: E501
|
||||||
'OPTL = %s -O ' % fpic,
|
'OPTL = %s -O ' % fpic,
|
||||||
'OPTC = %s -O -DINTSIZE64' % fpic])
|
'OPTC = %s -O -DINTSIZE64' % fpic])
|
||||||
else:
|
else:
|
||||||
@ -119,7 +130,6 @@ def write_makefile_inc(self):
|
|||||||
'OPTL = %s -O ' % fpic,
|
'OPTL = %s -O ' % fpic,
|
||||||
'OPTC = %s -O ' % fpic])
|
'OPTC = %s -O ' % fpic])
|
||||||
|
|
||||||
|
|
||||||
if '+mpi' in self.spec:
|
if '+mpi' in self.spec:
|
||||||
makefile_conf.extend(
|
makefile_conf.extend(
|
||||||
["CC = %s" % self.spec['mpi'].mpicc,
|
["CC = %s" % self.spec['mpi'].mpicc,
|
||||||
@ -143,11 +153,13 @@ def write_makefile_inc(self):
|
|||||||
makefile_conf.append('SHLIBEXT = .%s' % dso_suffix)
|
makefile_conf.append('SHLIBEXT = .%s' % dso_suffix)
|
||||||
if sys.platform == 'darwin':
|
if sys.platform == 'darwin':
|
||||||
makefile_conf.append(
|
makefile_conf.append(
|
||||||
'LDFLAGS = -dynamiclib -Wl,-install_name -Wl,{0}/$(notdir $@) {1}{0} -undefined dynamic_lookup'.format(prefix.lib, self.compiler.fc_rpath_arg)
|
'LDFLAGS = -dynamiclib -Wl,-install_name -Wl,{0}/$(notdir $@) {1}{0} -undefined dynamic_lookup'.format(prefix.lib, self.compiler.fc_rpath_arg) # NOQA: E501
|
||||||
)
|
)
|
||||||
else:
|
else:
|
||||||
makefile_conf.append(
|
makefile_conf.append(
|
||||||
'LDFLAGS = -shared {1}{0}'.format(prefix.lib, self.compiler.fc_rpath_arg)
|
'LDFLAGS = -shared {0}{1}'.format(
|
||||||
|
self.compiler.fc_rpath_arg,
|
||||||
|
prefix.lib)
|
||||||
)
|
)
|
||||||
|
|
||||||
makefile_conf.extend([
|
makefile_conf.extend([
|
||||||
@ -156,7 +168,8 @@ def write_makefile_inc(self):
|
|||||||
'RANLIB = ranlib'
|
'RANLIB = ranlib'
|
||||||
])
|
])
|
||||||
|
|
||||||
makefile_inc_template = join_path(os.path.dirname(self.module.__file__),
|
makefile_inc_template = \
|
||||||
|
join_path(os.path.dirname(self.module.__file__),
|
||||||
'Makefile.inc')
|
'Makefile.inc')
|
||||||
with open(makefile_inc_template, "r") as fh:
|
with open(makefile_inc_template, "r") as fh:
|
||||||
makefile_conf.extend(fh.read().split('\n'))
|
makefile_conf.extend(fh.read().split('\n'))
|
||||||
@ -166,8 +179,6 @@ def write_makefile_inc(self):
|
|||||||
makefile_inc = '\n'.join(makefile_conf)
|
makefile_inc = '\n'.join(makefile_conf)
|
||||||
fh.write(makefile_inc)
|
fh.write(makefile_inc)
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
def install(self, spec, prefix):
|
def install(self, spec, prefix):
|
||||||
make_libs = []
|
make_libs = []
|
||||||
|
|
||||||
@ -198,8 +209,10 @@ def install(self, spec, prefix):
|
|||||||
install('libseq/mpi.h', prefix.include)
|
install('libseq/mpi.h', prefix.include)
|
||||||
install('libseq/mpif.h', prefix.include)
|
install('libseq/mpif.h', prefix.include)
|
||||||
|
|
||||||
# FIXME: extend the tests to mpirun -np 2 (or alike) when build with MPI
|
# FIXME: extend the tests to mpirun -np 2 (or alike) when
|
||||||
# FIXME: use something like numdiff to compare blessed output with the current
|
# build with MPI
|
||||||
|
# FIXME: use something like numdiff to compare blessed output
|
||||||
|
# with the current
|
||||||
# TODO: test the installed mumps and not the one in stage
|
# TODO: test the installed mumps and not the one in stage
|
||||||
for t in make_libs:
|
for t in make_libs:
|
||||||
make('{0}examples'.format(t))
|
make('{0}examples'.format(t))
|
||||||
|
Loading…
Reference in New Issue
Block a user