diff options
| author | ktsai7 <35276356+ktsai7@users.noreply.github.com> | 2020-03-18 15:46:29 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-18 15:46:29 -0600 |
| commit | 77b11433b3eecbb0c3555da08d434e8e638536e8 (patch) | |
| tree | daf29a258c92069bd647db8162d84efc5301c4ba | |
| parent | ff29599578b669231fad263e7b2e919bfcb974b6 (diff) | |
| download | spack-77b11433b3eecbb0c3555da08d434e8e638536e8.tar.gz spack-77b11433b3eecbb0c3555da08d434e8e638536e8.tar.bz2 spack-77b11433b3eecbb0c3555da08d434e8e638536e8.tar.xz spack-77b11433b3eecbb0c3555da08d434e8e638536e8.zip | |
modified spackage for flecsi and cinch (#15555)
| -rw-r--r-- | var/spack/repos/builtin/packages/cinch/package.py | 2 | ||||
| -rw-r--r-- | var/spack/repos/builtin/packages/flecsi/package.py | 10 |
2 files changed, 7 insertions, 5 deletions
diff --git a/var/spack/repos/builtin/packages/cinch/package.py b/var/spack/repos/builtin/packages/cinch/package.py index 65281b8455..f46a801cd4 100644 --- a/var/spack/repos/builtin/packages/cinch/package.py +++ b/var/spack/repos/builtin/packages/cinch/package.py @@ -16,7 +16,7 @@ class Cinch(Package): url = "https://github.com/laristra/cinch/archive/1.0.zip" git = "https://github.com/laristra/cinch.git" - version('develop', branch='master', submodules=False) + version('master', branch='master', submodules=False) version('1.0', sha256='98b73473829b478191481621d84c3d63c662da6e951321f858a032eae3ca07b7') def install(self, spec, prefix): diff --git a/var/spack/repos/builtin/packages/flecsi/package.py b/var/spack/repos/builtin/packages/flecsi/package.py index 59c62e6352..fccdd686b0 100644 --- a/var/spack/repos/builtin/packages/flecsi/package.py +++ b/var/spack/repos/builtin/packages/flecsi/package.py @@ -20,12 +20,14 @@ class Flecsi(CMakePackage): homepage = 'http://flecsi.org/' git = 'https://github.com/laristra/flecsi.git' - version('master', branch='master', submodules=False, preferred=True) + version('devel', branch='devel', submodules=False, preferred=False) + version('1', branch='1', submodules=False, preferred=True) + version('1.4', branch='1.4', submodules=False, preferred=False) variant('build_type', default='Release', values=('Debug', 'Release', 'RelWithDebInfo', 'MinSizeRel'), description='The build type to build', multi=False) - variant('backend', default='mpi', values=('serial', 'mpi', 'legion', 'hpx'), + variant('backend', default='mpi', values=('serial', 'mpi', 'legion', 'hpx', 'charmpp'), description='Backend to use for distributed memory', multi=False) variant('debug_backend', default=False, description='Build Backend with Debug Mode') @@ -64,8 +66,8 @@ class Flecsi(CMakePackage): depends_on('legion@ctrl-rep+shared+mpi build_type=Debug', when='backend=legion +debug_backend ~hdf5') depends_on('legion@ctrl-rep+shared+mpi+hdf5 build_type=Release', when='backend=legion ~debug_backend +hdf5') depends_on('legion@ctrl-rep+shared+mpi build_type=Release', when='backend=legion ~debug_backend ~hdf5') - depends_on('hpx@1.3.0 cxxstd=14 build_type=Debug', when='backend=hpx +debug_backend') - depends_on('hpx@1.3.0 cxxstd=14 build_type=Release', when='backend=hpx ~debug_backend') + depends_on('hpx@1.3.0 cxxstd=14 malloc=system build_type=Debug', when='backend=hpx +debug_backend') + depends_on('hpx@1.3.0 cxxstd=14 malloc=system build_type=Release', when='backend=hpx ~debug_backend') depends_on('boost@1.70.0: cxxstd=14 +program_options') depends_on('metis@5.1.0:') depends_on('parmetis@4.0.3:') |