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

Correcting branch used for FleCSPH (#12865)

Browse Source
This commit is contained in:
Julien Loiseau 2019-09-18 14:00:47 -06:00 committed by Christoph Junghans
parent ec11574a02
commit cacbb4ff7a
2 changed files with 1 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
var/spack/repos/builtin/packages/flecsi/package.py
View File

@ -21,7 +21,6 @@ class Flecsi(CMakePackage):
git = 'https://github.com/laristra/flecsi.git' git = 'https://github.com/laristra/flecsi.git'
version('develop', branch='master', submodules=False, preferred=True) version('develop', branch='master', submodules=False, preferred=True)
version('flecsph', branch='feature/flecsph', submodules=False)
variant('backend', default='mpi', values=('serial', 'mpi', 'legion'), variant('backend', default='mpi', values=('serial', 'mpi', 'legion'),
description='Backend to use for distributed memory') description='Backend to use for distributed memory')
@ -53,16 +52,6 @@ def cmake_args(self):
options = ['-DCMAKE_BUILD_TYPE=debug'] options = ['-DCMAKE_BUILD_TYPE=debug']
options.append('-DCINCH_SOURCE_DIR=' + self.spec['cinch'].prefix) options.append('-DCINCH_SOURCE_DIR=' + self.spec['cinch'].prefix)
# FleCSI for FleCSPH flags
if self.spec.satisfies('@flecsph:'):
options.append('-DENABLE_MPI=ON')
options.append('-DENABLE_OPENMP=ON')
options.append('-DCXX_CONFORMANCE_STANDARD=c++17')
options.append('-DFLECSI_RUNTIME_MODEL=mpi')
options.append('-DENABLE_FLECSIT=OFF')
options.append('-DENABLE_FLECSI_TUTORIAL=OFF')
return options
if self.spec.variants['backend'].value == 'legion': if self.spec.variants['backend'].value == 'legion':
options.append('-DFLECSI_RUNTIME_MODEL=legion') options.append('-DFLECSI_RUNTIME_MODEL=legion')
elif self.spec.variants['backend'].value == 'mpi': elif self.spec.variants['backend'].value == 'mpi':

2
var/spack/repos/builtin/packages/flecsph/package.py
View File

@ -23,7 +23,7 @@ class Flecsph(CMakePackage):
depends_on('boost@1.59.0: cxxstd=11 +program_options') depends_on('boost@1.59.0: cxxstd=11 +program_options')
depends_on('mpi') depends_on('mpi')
depends_on('hdf5@1.10.5 +mpi') depends_on('hdf5@1.10.5 +mpi')
depends_on('flecsi@flecsph backend=mpi') depends_on('flecsi backend=mpi')
depends_on('gsl') depends_on('gsl')
def cmake_args(self): def cmake_args(self):