Commit 604f1c37 authored by Rob Latham's avatar Rob Latham

quit tracking mercury master until scalable-endpoint mess cleaned up

parent 545c9900
......@@ -10,6 +10,7 @@ class Bake(AutotoolsPackage):
version('master', git='git@xgitlab.cels.anl.gov:sds/bake.git')
depends_on('margo')
depends_on('mercury@pre-scalable-ep')
depends_on('libuuid')
depends_on('pmem')
# depends_on('pandoc', type=("build") );
......@@ -36,7 +36,7 @@ class Margo(AutotoolsPackage):
git='https://xgitlab.cels.anl.gov/sds/margo.git',
branch='margo-registered-data')
depends_on('mercury', type=("build", "link", "run"))
depends_on('mercury@pre-scalable-ep', type=("build", "link", "run"))
depends_on('argobots')
depends_on('abtsnoozer')
depends_on('libev')
......
......@@ -8,6 +8,6 @@ class Mdcs(CMakePackage):
version('master', git='https://xgitlab.cels.anl.gov/sds/mdcs.git')
depends_on('boost')
depends_on('mercury')
depends_on('mercury@pre-scalable-ep')
depends_on('argobots')
depends_on('margo')
......@@ -33,6 +33,8 @@ class Mercury(CMakePackage):
version('master', git='https://github.com/mercury-hpc/mercury.git',
submodules=True)
version('pre-scalable-ep', git='https://github.com/mercury-hpc/mercury.git',
commit='6c82baf7819a553b6b8235fbe7c180989a1e17fe', submodules=True)
variant('cci', default=False, description="Use CCI for network transport")
variant('bmi', default=False, description="Use BMI for network transport")
......
......@@ -44,7 +44,7 @@ class Mobject(AutotoolsPackage):
# 'margo' already brings in mercury, but we want to explicitly request the
# self-forward variant: we imagine sending to services on the same node
# pretty often and we can't think of a good reason not to enable it
depends_on('mercury+selfforward')
depends_on('mercury+selfforward@pre-scalable-ep')
def configure_args(self):
extra_args = ['CC=%s' % self.spec['mpi'].mpicc]
......
......@@ -41,7 +41,8 @@ class Sdskeyval(AutotoolsPackage):
variant('lmdb', default=False, description="Enable lmdb keyval backend")
depends_on('margo', type=("build", "link", "run"))
depends_on('mercury+selfforward', type=("build", "link", "run"))
depends_on('mercury+selfforward@pre-scalable-ep',
type=("build", "link", "run"))
depends_on('argobots')
depends_on('abtsnoozer')
depends_on('libev')
......
......@@ -16,7 +16,7 @@ class Ssg(AutotoolsPackage):
variant('mpi', default=False, description='Build with MPI support')
depends_on('mpi', when='+mpi')
depends_on('mercury')
depends_on('mercury@pre-scalable-ep')
depends_on('argobots')
depends_on('margo')
depends_on('abtsnoozer')
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment