diff options
| author | Julien Loiseau <contact@julien-loiseau.fr> | 2019-09-18 14:00:47 -0600 |
|---|---|---|
| committer | Christoph Junghans <junghans@lanl.gov> | 2019-09-18 14:00:47 -0600 |
| commit | cacbb4ff7a52a1dd8cc8b894b96569dc40bf45ec (patch) | |
| tree | 32783ce8f99d26722249796a7f42c952bcd93a71 | |
| parent | ec11574a02608951c168a53d7d32eb7002f7ea16 (diff) | |
| download | spack-cacbb4ff7a52a1dd8cc8b894b96569dc40bf45ec.tar.gz spack-cacbb4ff7a52a1dd8cc8b894b96569dc40bf45ec.tar.bz2 spack-cacbb4ff7a52a1dd8cc8b894b96569dc40bf45ec.tar.xz spack-cacbb4ff7a52a1dd8cc8b894b96569dc40bf45ec.zip | |
Correcting branch used for FleCSPH (#12865)
| -rw-r--r-- | var/spack/repos/builtin/packages/flecsi/package.py | 11 | ||||
| -rw-r--r-- | var/spack/repos/builtin/packages/flecsph/package.py | 2 |
2 files changed, 1 insertions, 12 deletions
diff --git a/var/spack/repos/builtin/packages/flecsi/package.py b/var/spack/repos/builtin/packages/flecsi/package.py index 448fbd5ad9..3616de5a97 100644 --- a/var/spack/repos/builtin/packages/flecsi/package.py +++ b/var/spack/repos/builtin/packages/flecsi/package.py @@ -21,7 +21,6 @@ class Flecsi(CMakePackage): git = 'https://github.com/laristra/flecsi.git' version('develop', branch='master', submodules=False, preferred=True) - version('flecsph', branch='feature/flecsph', submodules=False) variant('backend', default='mpi', values=('serial', 'mpi', 'legion'), description='Backend to use for distributed memory') @@ -53,16 +52,6 @@ class Flecsi(CMakePackage): options = ['-DCMAKE_BUILD_TYPE=debug'] 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': options.append('-DFLECSI_RUNTIME_MODEL=legion') elif self.spec.variants['backend'].value == 'mpi': diff --git a/var/spack/repos/builtin/packages/flecsph/package.py b/var/spack/repos/builtin/packages/flecsph/package.py index 129ea3090f..705c9eaecc 100644 --- a/var/spack/repos/builtin/packages/flecsph/package.py +++ b/var/spack/repos/builtin/packages/flecsph/package.py @@ -23,7 +23,7 @@ class Flecsph(CMakePackage): depends_on('boost@1.59.0: cxxstd=11 +program_options') depends_on('mpi') depends_on('hdf5@1.10.5 +mpi') - depends_on('flecsi@flecsph backend=mpi') + depends_on('flecsi backend=mpi') depends_on('gsl') def cmake_args(self): |