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

changes to simplify the esmumps variant for version < 6.0.0 + typos corrections, according to the remarks on PR #979

Browse Source
This commit is contained in:
Nicolas Richart 2016-05-20 00:31:12 +02:00
parent 1bf306bbbd
commit a51566ec6e
1 changed files with 21 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
var/spack/repos/builtin/packages/scotch/package.py
View File

@ -32,23 +32,19 @@ class Scotch(Package):
partitioning, graph clustering, and sparse matrix ordering.""" partitioning, graph clustering, and sparse matrix ordering."""
homepage = "http://www.labri.fr/perso/pelegrin/scotch/" homepage = "http://www.labri.fr/perso/pelegrin/scotch/"
url = "http://gforge.inria.fr/frs/download.php/latestfile/298/scotch_6.0.3.tar.gz" url = "http://gforge.inria.fr/frs/download.php/latestfile/298/scotch_6.0.3.tar.gz"
base_url = "http://gforge.inria.fr/frs/download.php/latestfile/298" base_url = "http://gforge.inria.fr/frs/download.php/latestfile/298"
list_url = "http://gforge.inria.fr/frs/?group_id=248" list_url = "http://gforge.inria.fr/frs/?group_id=248"
version('6.0.3', '10b0cc0f184de2de99859eafaca83cfc') version('6.0.3', '10b0cc0f184de2de99859eafaca83cfc')
version('6.0.0', 'ba117428c0a6cd97d0c93e8b872bb3fe') version('6.0.0', 'c50d6187462ba801f9a82133ee666e8e')
version('5.1.10b', '9b8622b39c141ecaca4a46298486fd99') version('5.1.10b', 'f587201d6cf5cf63527182fbfba70753')
# This must be set for version <= 6.0.0
md5_esmumps = { Version('5.1.10b'): 'f587201d6cf5cf63527182fbfba70753',
Version('6.0.0'): 'c50d6187462ba801f9a82133ee666e8e' }
variant('mpi', default=False, description='Activate the compilation of parallel libraries') variant('mpi', default=False, description='Activate the compilation of parallel libraries')
variant('compression', default=True, description='Activate the posibility to use compressed files') variant('compression', default=True, description='Activate the posibility to use compressed files')
variant('esmumps', default=False, description='Activate the compilation of esmumps needed by mumps') variant('esmumps', default=False, description='Activate the compilation of esmumps needed by mumps')
variant('shared', default=True, description='Build a shared version of the library') variant('shared', default=True, description='Build a shared version of the library')
variant('metis', default=True, description='Build a metis wrapper library library') variant('metis', default=True, description='Build metis and parmetis wrapper libraries')
depends_on('flex') depends_on('flex')
depends_on('bison') depends_on('bison')
@ -64,10 +60,8 @@ class Scotch(Package):
def url_for_version(self, version): def url_for_version(self, version):
return super(Scotch, self).url_for_version(version) return super(Scotch, self).url_for_version(version)
@when('+esmumps')
def url_for_version(self, version): def url_for_version(self, version):
if version <= Version('6.0.0'): if version <= Version('6.0.0'):
self.versions[version]['md5'] = self.md5_esmumps[version]
return '%s/scotch_%s_esmumps.tar.gz' % (Scotch.base_url, version) return '%s/scotch_%s_esmumps.tar.gz' % (Scotch.base_url, version)
else: else:
return super(Scotch, self).url_for_version(version) return super(Scotch, self).url_for_version(version)
@ -96,7 +90,7 @@ def configure(self):
'LIB = .so', 'LIB = .so',
'CLIBFLAGS = -shared -fPIC', 'CLIBFLAGS = -shared -fPIC',
'RANLIB = echo', 'RANLIB = echo',
'AR = $(CC)', 'AR = $(CC)',
'ARFLAGS = -shared $(LDFLAGS) -o' 'ARFLAGS = -shared $(LDFLAGS) -o'
]) ])
cflags.append('-fPIC') cflags.append('-fPIC')
@ -105,7 +99,7 @@ def configure(self):
'LIB = .a', 'LIB = .a',
'CLIBFLAGS = ', 'CLIBFLAGS = ',
'RANLIB = ranlib', 'RANLIB = ranlib',
'AR = ar', 'AR = ar',
'ARFLAGS = -ruv ' 'ARFLAGS = -ruv '
]) ])
@ -170,13 +164,19 @@ def install(self, spec, prefix):
with working_dir('src'): with working_dir('src'):
for target in targets: for target in targets:
# It seams that building ptesmumps in parallel fails, for
# version prior to 6.0.0 there is no separated targets force
# ptesmumps, this library is built by the ptscotch target. This
# should explain the test for the can_make_parallel variable
can_make_parallel = not (target == 'ptesmumps' can_make_parallel = not (target == 'ptesmumps'
or (self.spec.version < Version('6.0.0') or (self.spec.version < Version('6.0.0')
and target == 'ptscotch')) and target == 'ptscotch'))
make(target, parallel=can_make_parallel) make(target, parallel=can_make_parallel)
# todo change this to take into account darwin systems
lib_ext = '.so' if '+shared' in self.spec else '.a'
# It seams easier to remove metis wrappers from the folder that will be installed than # It seams easier to remove metis wrappers from the folder that will be installed than
# to tweak their Makefiles # to tweak the Makefiles
if '+metis' not in self.spec: if '+metis' not in self.spec:
with working_dir('lib'): with working_dir('lib'):
lib_ext = '.so' if '+shared' in self.spec else '.a' lib_ext = '.so' if '+shared' in self.spec else '.a'
@ -187,6 +187,14 @@ def install(self, spec, prefix):
force_remove('metis.h') force_remove('metis.h')
force_remove('parmetis.h') force_remove('parmetis.h')
if '~esmumps' in self.spec and self.spec.version < Version('6.0.0'):
with working_dir('lib'):
force_remove('libesmumps{0}'.format(lib_ext))
force_remove('libptesmumps{0}'.format(lib_ext))
with working_dir('include'):
force_remove('esmumps.h')
install_tree('bin', prefix.bin) install_tree('bin', prefix.bin)
install_tree('lib', prefix.lib) install_tree('lib', prefix.lib)
install_tree('include', prefix.include) install_tree('include', prefix.include)