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

changes scotch package to make he coverage test pass

Browse Source
This commit is contained in:
Nicolas Richart 2016-05-20 00:42:34 +02:00
parent a51566ec6e
commit a233ed2de7
1 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -23,7 +23,6 @@
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
############################################################################## ##############################################################################
import os import os
import re
from spack import * from spack import *
@ -60,11 +59,9 @@ 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(":6.0.0")
def url_for_version(self, version): def url_for_version(self, version):
if version <= Version('6.0.0'): return '%s/scotch_%s_esmumps.tar.gz' % (Scotch.base_url, version)
return '%s/scotch_%s_esmumps.tar.gz' % (Scotch.base_url, version)
else:
return super(Scotch, self).url_for_version(version)
def patch(self): def patch(self):
self.configure() self.configure()
@ -168,15 +165,16 @@ def install(self, spec, prefix):
# version prior to 6.0.0 there is no separated targets force # version prior to 6.0.0 there is no separated targets force
# ptesmumps, this library is built by the ptscotch target. This # ptesmumps, this library is built by the ptscotch target. This
# should explain the test for the can_make_parallel variable # should explain the test for the can_make_parallel variable
can_make_parallel = not (target == 'ptesmumps' can_make_parallel = \
or (self.spec.version < Version('6.0.0') not (target == 'ptesmumps' or
and target == 'ptscotch')) (self.spec.version < Version('6.0.0') and
target == 'ptscotch'))
make(target, parallel=can_make_parallel) make(target, parallel=can_make_parallel)
# todo change this to take into account darwin systems # todo change this to take into account darwin systems
lib_ext = '.so' if '+shared' in self.spec else '.a' 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
# to tweak the Makefiles # installed than 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'