Commit f5afec71 authored by Matthieu Dorier's avatar Matthieu Dorier
Browse files

Merge branch 'master' of xgitlab.cels.anl.gov:sds/sds-repo

parents 3c3d66c0 911dc5dc
......@@ -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") );
......@@ -38,8 +38,8 @@ class Bmi(AutotoolsPackage):
# need to override 'autoreconf' so we can run BMI's 'prepare' script
def autoreconf(self, spec, prefix):
with working_dir(self.configure_directory):
call("./prepare");
call("./prepare");
def configure_args(self):
args = ["--enable-shared", "--enable-bmi-only"]
return args;
args = ["--enable-shared", "--enable-bmi-only"]
return args;
......@@ -46,14 +46,14 @@ class Cci(AutotoolsPackage):
version('master', git='https://github.com/CCI/cci.git')
version('2.0', '070b2ba4eca92a846c093f2cd000d3b2')
def configure_args(self):
# TODO: need variants for verbs and ugni
args = ['--without-gni',
'--without-verbs',
'--disable-picky'
# TODO: need variants for verbs and ugni
args = ['--without-gni',
'--without-verbs',
'--disable-picky'
]
return args
return args
# need to override 'autoreconf' so we can run CCI's 'autogen.pl' script
def autoreconf(self, spec, prefix):
with working_dir(self.configure_directory):
call("./autogen.pl");
with working_dir(self.configure_directory):
call("./autogen.pl");
......@@ -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")
......@@ -46,15 +48,14 @@ class Mercury(CMakePackage):
depends_on('boost')
def cmake_args(self):
args = ["-DNA_CCI_USE_POLL:BOOL=ON",
"-DMERCURY_USE_BOOST_PP:BOOL=ON",
"-DBUILD_SHARED_LIBS=ON" ]
if (self.spec.variants['cci'].value):
args.extend(["-DNA_USE_CCI:BOOL=ON"])
if (self.spec.variants['bmi'].value):
args.extend(["-DNA_USE_BMI:BOOL=ON"])
if (self.spec.variants['fabric'].value):
args.extend(["-DNA_USE_OFI:BOOL=ON"])
args = ["-DMERCURY_USE_BOOST_PP:BOOL=ON",
"-DBUILD_SHARED_LIBS=ON" ]
if (self.spec.variants['cci'].value):
args.extend(["-DNA_USE_CCI:BOOL=ON"])
if (self.spec.variants['bmi'].value):
args.extend(["-DNA_USE_BMI:BOOL=ON"])
if (self.spec.variants['fabric'].value):
args.extend(["-DNA_USE_OFI:BOOL=ON"])
if (self.spec.variants['selfforward'].value):
args.extend(["-DMERCURY_USE_SELF_FORWARD=ON"])
......
......@@ -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