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

Add int64 variant to pumi and zoltan (#12630)

Browse Source 
* pumi and zoltan: add int64 variant

* typo
This commit is contained in:
Cameron Smith 2019-08-31 15:28:56 -04:00 committed by Adam J. Stewart
parent 7a60be5154
commit 9ce9d45aa7
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
var/spack/repos/builtin/packages/pumi/package.py
View File

@ -32,6 +32,7 @@ class Pumi(CMakePackage):
version('2.2.0', commit='8c7e6f13943893b2bc1ece15003e4869a0e9634f') # tag 2.2.0 version('2.2.0', commit='8c7e6f13943893b2bc1ece15003e4869a0e9634f') # tag 2.2.0
version('2.1.0', commit='840fbf6ec49a63aeaa3945f11ddb224f6055ac9f') version('2.1.0', commit='840fbf6ec49a63aeaa3945f11ddb224f6055ac9f')
variant('int64', default=False, description='Enable 64bit mesh entity ids')
variant('shared', default=False, description='Build shared libraries') variant('shared', default=False, description='Build shared libraries')
variant('zoltan', default=False, description='Enable Zoltan Features') variant('zoltan', default=False, description='Enable Zoltan Features')
variant('fortran', default=False, description='Enable FORTRAN interface') variant('fortran', default=False, description='Enable FORTRAN interface')
@ -44,6 +45,7 @@ class Pumi(CMakePackage):
depends_on('mpi') depends_on('mpi')
depends_on('cmake@3:', type='build') depends_on('cmake@3:', type='build')
depends_on('zoltan', when='+zoltan') depends_on('zoltan', when='+zoltan')
depends_on('zoltan+int64', when='+zoltan+int64')
simbase = "+base" simbase = "+base"
simkernels = simbase + "+parasolid+acis+discrete" simkernels = simbase + "+parasolid+acis+discrete"
simfull = simkernels + "+abstract+adv+advmodel\ simfull = simkernels + "+abstract+adv+advmodel\
@ -66,7 +68,8 @@ def cmake_args(self):
'-DBUILD_SHARED_LIBS=%s' % ('ON' if '+shared' in spec else 'OFF'), '-DBUILD_SHARED_LIBS=%s' % ('ON' if '+shared' in spec else 'OFF'),
'-DCMAKE_Fortran_COMPILER=%s' % spec['mpi'].mpifc, '-DCMAKE_Fortran_COMPILER=%s' % spec['mpi'].mpifc,
'-DPUMI_FORTRAN_INTERFACE=%s' % '-DPUMI_FORTRAN_INTERFACE=%s' %
('ON' if '+fortran' in spec else 'OFF') ('ON' if '+fortran' in spec else 'OFF'),
'-DMDS_ID_TYPE=%s' % ('long' if '+int64' in spec else 'int')
] ]
if self.spec.satisfies('simmodsuite=base'): if self.spec.satisfies('simmodsuite=base'):
args.append('-DENABLE_SIMMETRIX=ON') args.append('-DENABLE_SIMMETRIX=ON')

5
var/spack/repos/builtin/packages/zoltan/package.py
View File

@ -35,10 +35,12 @@ class Zoltan(AutotoolsPackage):
variant('fortran', default=True, description='Enable Fortran support.') variant('fortran', default=True, description='Enable Fortran support.')
variant('mpi', default=True, description='Enable MPI support.') variant('mpi', default=True, description='Enable MPI support.')
variant('parmetis', default=False, description='Enable ParMETIS support.') variant('parmetis', default=False, description='Enable ParMETIS support.')
variant('int64', default=False, description='Enable 64bit indices.')
depends_on('mpi', when='+mpi') depends_on('mpi', when='+mpi')
depends_on('parmetis@4:', when='+parmetis') depends_on('parmetis@4:', when='+parmetis')
depends_on('metis+int64', when='+parmetis+int64')
depends_on('metis', when='+parmetis') depends_on('metis', when='+parmetis')
depends_on('perl@:5.21', type='build', when='@:3.6') depends_on('perl@:5.21', type='build', when='@:3.6')
@ -99,6 +101,9 @@ def configure_args(self):
if spec.satisfies('%intel'): if spec.satisfies('%intel'):
config_args.append('--with-libs=-lifcore') config_args.append('--with-libs=-lifcore')
if '+int64' in spec:
config_args.append('--with-id-type=ulong')
if '+parmetis' in spec: if '+parmetis' in spec:
parmetis_prefix = spec['parmetis'].prefix parmetis_prefix = spec['parmetis'].prefix
config_args.extend([ config_args.extend([