hlrs-software-stack/spack
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Flecsi: updated version semantic (#29780)

Browse source 
Updated flecsi spackage to better support changes in control variables
in post 2.1.0 releases while also making legacy versions clearer as to
what is a tagged release and what is a rolling-ish development branch
This commit is contained in:
Robert Pavel 2022-03-30 00:21:17 -07:00 committed by GitHub
parent e58ac0705d
commit 54d738ff9c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
var/spack/repos/builtin/packages/flecsi/package.py
View file

@ -22,9 +22,8 @@ class Flecsi(CMakePackage, CudaPackage):
tags = ['e4s']
version('develop', branch='devel', submodules=False)
version('1', git="https://github.com/laristra/flecsi.git", branch='1', submodules=False, preferred=False)
version('1.4', git="https://github.com/laristra/flecsi.git", branch='1.4', submodules=False, preferred=False)
version('develop', branch='develop', submodules=False)
version('1.4.develop', git="https://github.com/laristra/flecsi.git", branch='1.4', submodules=False, preferred=False)
version('1.4.2', git="https://github.com/laristra/flecsi.git", tag='v1.4.2', submodules=False, preferred=True)
version('2.1.0', tag='v2.1.0', submodules=False, preferred=False)
version('flecsph', git="https://github.com/laristra/flecsi.git", branch="stable/flecsph", submodules=True, preferred=False)
@ -151,21 +150,27 @@ def cmake_args(self):
if '+external_cinch' in spec:
options.append('-DCINCH_SOURCE_DIR=' + spec['cinch'].prefix)
backend_flag = ''
if spec.satisfies('@2.1.1:'):
backend_flag = 'FLECSI_BACKEND'
else:
backend_flag = 'FLECSI_RUNTIME_MODEL'
if spec.variants['backend'].value == 'legion':
options.append('-DFLECSI_RUNTIME_MODEL=legion')
options.append('-D' + backend_flag + '=legion')
options.append('-DENABLE_MPI=ON')
elif spec.variants['backend'].value == 'mpi':
options.append('-DFLECSI_RUNTIME_MODEL=mpi')
options.append('-D' + backend_flag + '=mpi')
options.append('-DENABLE_MPI=ON')
elif spec.variants['backend'].value == 'hpx':
options.append('-DFLECSI_RUNTIME_MODEL=hpx')
options.append('-D' + backend_flag + '=hpx')
options.append('-DENABLE_MPI=ON')
options.append('-DHPX_IGNORE_CMAKE_BUILD_TYPE_COMPATIBILITY=ON')
elif spec.variants['backend'].value == 'charmpp':
options.append('-DFLECSI_RUNTIME_MODEL=charmpp')
options.append('-D' + backend_flag + '=charmpp')
options.append('-DENABLE_MPI=ON')
else:
options.append('-DFLECSI_RUNTIME_MODEL=serial')
options.append('-D' + backend_flag + '=serial')
options.append('-DENABLE_MPI=OFF')
if '+shared' in spec: