Commit 415bb437 authored by Matthieu Dorier's avatar Matthieu Dorier
Browse files

removed the provider versions

parent 05433d1d
...@@ -8,10 +8,7 @@ class Bake(AutotoolsPackage): ...@@ -8,10 +8,7 @@ class Bake(AutotoolsPackage):
url = "https://xgitlab.cels.anl.gov/sds/bake" url = "https://xgitlab.cels.anl.gov/sds/bake"
version('master', git='git@xgitlab.cels.anl.gov:sds/bake.git') version('master', git='git@xgitlab.cels.anl.gov:sds/bake.git')
version('provider', git='git@xgitlab.cels.anl.gov:sds/bake.git', branch='dev-provider-id')
depends_on('margo', when='@master') depends_on('margo')
depends_on('margo@provider', when='@provider')
depends_on('libuuid') depends_on('libuuid')
depends_on('pmem') depends_on('pmem')
# depends_on('pandoc', type=("build") );
...@@ -32,15 +32,7 @@ class Margo(AutotoolsPackage): ...@@ -32,15 +32,7 @@ class Margo(AutotoolsPackage):
homepage = "https://xgitlab.cels.anl.gov/sds/margo" homepage = "https://xgitlab.cels.anl.gov/sds/margo"
version('master', git='https://xgitlab.cels.anl.gov/sds/margo.git') version('master', git='https://xgitlab.cels.anl.gov/sds/margo.git')
version('margo-registered-data', depends_on('mercury', type=("build", "link", "run"))
git='https://xgitlab.cels.anl.gov/sds/margo.git',
branch='margo-registered-data')
version('provider', git='https://xgitlab.cels.anl.gov/sds/margo.git',
branch='dev-provider-id')
depends_on('mercury@pre-scalable-ep', when='@master', type=("build", "link", "run"))
depends_on('mercury@provider', when='@provider', type=("build", "link", "run"))
depends_on('argobots') depends_on('argobots')
depends_on('abtsnoozer') depends_on('abtsnoozer')
depends_on('libev') depends_on('libev')
......
...@@ -6,7 +6,5 @@ class Mdcs(CMakePackage): ...@@ -6,7 +6,5 @@ class Mdcs(CMakePackage):
url = "https://xgitlab.cels.anl.gov/sds/mdcs" url = "https://xgitlab.cels.anl.gov/sds/mdcs"
version('master', git='https://xgitlab.cels.anl.gov/sds/mdcs.git') version('master', git='https://xgitlab.cels.anl.gov/sds/mdcs.git')
version('provider', git='https://xgitlab.cels.anl.gov/sds/mdcs.git', branch='dev-provider-id')
depends_on('margo', when='@master') depends_on('margo')
depends_on('margo@provider', when='@provider')
...@@ -33,11 +33,6 @@ class Mercury(CMakePackage): ...@@ -33,11 +33,6 @@ class Mercury(CMakePackage):
version('master', git='https://github.com/mercury-hpc/mercury.git', version('master', git='https://github.com/mercury-hpc/mercury.git',
submodules=True) submodules=True)
version('pre-scalable-ep', git='https://github.com/mercury-hpc/mercury.git',
commit='6c82baf7819a553b6b8235fbe7c180989a1e17fe', submodules=True)
version('provider', git='https://github.com/carns/mercury.git', submodules=True,
branch='dev-registered-cb')
variant('cci', default=False, description="Use CCI for network transport") variant('cci', default=False, description="Use CCI for network transport")
variant('bmi', default=False, description="Use BMI for network transport") variant('bmi', default=False, description="Use BMI for network transport")
......
...@@ -32,20 +32,16 @@ class Mobject(AutotoolsPackage): ...@@ -32,20 +32,16 @@ class Mobject(AutotoolsPackage):
url = "https://xgitlab.cels.anl.gov/sds/mobject-store" url = "https://xgitlab.cels.anl.gov/sds/mobject-store"
version('master', git='https://xgitlab.cels.anl.gov/sds/mobject-store.git') version('master', git='https://xgitlab.cels.anl.gov/sds/mobject-store.git')
version('provider', git='https://xgitlab.cels.anl.gov/sds/mobject-store.git', branch='dev-provider-id')
depends_on('margo', when='@master') depends_on('margo')
depends_on('margo@provider', when='@provider')
depends_on('mpi') depends_on('mpi')
depends_on('ssg+mpi') depends_on('ssg+mpi')
depends_on('ch-placement') depends_on('ch-placement')
depends_on('autoconf') depends_on('autoconf')
depends_on('automake') depends_on('automake')
depends_on('libtool') depends_on('libtool')
depends_on('sdskeyval', when='@master') depends_on('sdskeyval')
depends_on('bake', when='@master') depends_on('bake')
depends_on('sdskeyval@provider', when='@provider')
depends_on('bake@provider', when='@provider')
def configure_args(self): def configure_args(self):
extra_args = ['CC=%s' % self.spec['mpi'].mpicc] extra_args = ['CC=%s' % self.spec['mpi'].mpicc]
......
...@@ -32,13 +32,11 @@ class Poesie(AutotoolsPackage): ...@@ -32,13 +32,11 @@ class Poesie(AutotoolsPackage):
url = "https://xgitlab.cels.anl.gov/sds/poesie" url = "https://xgitlab.cels.anl.gov/sds/poesie"
version('master', git='https://xgitlab.cels.anl.gov/sds/poesie.git') version('master', git='https://xgitlab.cels.anl.gov/sds/poesie.git')
version('provider', git='https://xgitlab.cels.anl.gov/sds/poesie.git', branch='dev-provider-id')
variant('lua', default=True, description="Enable Lua interpreters") variant('lua', default=True, description="Enable Lua interpreters")
variant('python', default=True, description="Enable Python interpreters") variant('python', default=True, description="Enable Python interpreters")
depends_on('margo', type=("build", "link", "run"), when='@master') depends_on('margo', type=("build", "link", "run"))
depends_on('margo@provider', type=("build", "link", "run"), when='@provider')
# variable dependencies # variable dependencies
depends_on('lua', when="+lua") depends_on('lua', when="+lua")
depends_on('python', when="+python") depends_on('python', when="+python")
......
...@@ -36,9 +36,6 @@ class PyBake(PythonPackage): ...@@ -36,9 +36,6 @@ class PyBake(PythonPackage):
url = "https://xgitlab.cels.anl.gov/sds/py-bake.git" url = "https://xgitlab.cels.anl.gov/sds/py-bake.git"
version('master', git="https://xgitlab.cels.anl.gov/sds/py-bake.git") version('master', git="https://xgitlab.cels.anl.gov/sds/py-bake.git")
version('provider', git="https://xgitlab.cels.anl.gov/sds/py-bake.git", branch='dev-provider-id')
depends_on('bake', when='@master') depends_on('bake')
depends_on('py-margo', when='@master') depends_on('py-margo')
depends_on('bake@provider', when='@provider')
depends_on('py-margo@provider', when='@provider')
...@@ -37,8 +37,6 @@ class PyMargo(PythonPackage): ...@@ -37,8 +37,6 @@ class PyMargo(PythonPackage):
url = "https://xgitlab.cels.anl.gov/sds/py-margo.git" url = "https://xgitlab.cels.anl.gov/sds/py-margo.git"
version('master', git="https://xgitlab.cels.anl.gov/sds/py-margo.git") version('master', git="https://xgitlab.cels.anl.gov/sds/py-margo.git")
version('provider', git="https://xgitlab.cels.anl.gov/sds/py-margo.git", branch='dev-provider-id')
depends_on('margo', when='@master') depends_on('margo')
depends_on('margo@provider', when='@provider')
depends_on('boost+python') depends_on('boost+python')
...@@ -36,17 +36,12 @@ class PyMobject(PythonPackage): ...@@ -36,17 +36,12 @@ class PyMobject(PythonPackage):
url = "git@xgitlab.cels.anl.gov:sds/py-mobject.git" url = "git@xgitlab.cels.anl.gov:sds/py-mobject.git"
version('master', git="git@xgitlab.cels.anl.gov:sds/py-mobject.git") version('master', git="git@xgitlab.cels.anl.gov:sds/py-mobject.git")
version('provider', git="git@xgitlab.cels.anl.gov:sds/py-mobject.git", branch='dev-provider-id')
depends_on('py-bake', when='@master') depends_on('py-bake')
depends_on('py-sdskv', when='@master') depends_on('py-sdskv')
depends_on('py-margo', when='@master') depends_on('py-margo')
depends_on('py-ssg') depends_on('py-ssg')
depends_on('mobject', when='@master') depends_on('mobject')
depends_on('py-bake@provider', when='@provider')
depends_on('py-sdskv@provider', when='@provider')
depends_on('py-margo@provider', when='@provider')
depends_on('mobject@provider', when='@provider')
depends_on('py-mpi4py') depends_on('py-mpi4py')
depends_on('mpi') depends_on('mpi')
depends_on('py-pkgconfig') depends_on('py-pkgconfig')
...@@ -36,10 +36,12 @@ class PySdskv(PythonPackage): ...@@ -36,10 +36,12 @@ class PySdskv(PythonPackage):
url = "https://xgitlab.cels.anl.gov/sds/py-sdskv.git" url = "https://xgitlab.cels.anl.gov/sds/py-sdskv.git"
version('master', git="https://xgitlab.cels.anl.gov/sds/py-sdskv.git") version('master', git="https://xgitlab.cels.anl.gov/sds/py-sdskv.git")
version('provider', git="https://xgitlab.cels.anl.gov/sds/py-sdskv.git", branch='dev-provider-id') # version('provider', git="https://xgitlab.cels.anl.gov/sds/py-sdskv.git", branch='dev-provider-id')
depends_on('sdskeyval', when='@master') depends_on('sdskeyval')
depends_on('py-margo', when='@master') depends_on('py-margo')
# depends_on('sdskeyval', when='@master')
# depends_on('py-margo', when='@master')
depends_on('py-pkgconfig') depends_on('py-pkgconfig')
depends_on('sdskeyval@provider', when='@provider') # depends_on('sdskeyval@provider', when='@provider')
depends_on('py-margo@provider', when='@provider') # depends_on('py-margo@provider', when='@provider')
...@@ -33,15 +33,13 @@ class Sdskeyval(AutotoolsPackage): ...@@ -33,15 +33,13 @@ class Sdskeyval(AutotoolsPackage):
version('master', git='https://xgitlab.cels.anl.gov/sds/sds-keyval.git') version('master', git='https://xgitlab.cels.anl.gov/sds/sds-keyval.git')
version('dor-sds', git='https://xgitlab.cels.anl.gov/sds/sds-keyval.git', branch='dor-sync-review') version('dor-sds', git='https://xgitlab.cels.anl.gov/sds/sds-keyval.git', branch='dor-sync-review')
version('provider', git='https://xgitlab.cels.anl.gov/sds/sds-keyval.git', branch='dev-provider-id')
variant('bwtree', default=True, description="Enable BwTree keyval backend") variant('bwtree', default=True, description="Enable BwTree keyval backend")
variant('bdb', default=True, description="Enable Berkely DB keyval backend") variant('bdb', default=True, description="Enable Berkely DB keyval backend")
variant('leveldb', default=True, description="Enable LevelDB keyval backend") variant('leveldb', default=True, description="Enable LevelDB keyval backend")
variant('lmdb', default=False, description="Enable lmdb keyval backend") variant('lmdb', default=False, description="Enable lmdb keyval backend")
depends_on('margo', type=("build", "link", "run"), when='@master') depends_on('margo', type=("build", "link", "run"))
depends_on('margo@provider', type=("build", "link", "run"), when='@provider')
depends_on('autoconf@2.65:') depends_on('autoconf@2.65:')
depends_on('automake@1.13.4:') depends_on('automake@1.13.4:')
depends_on('libtool', type=("build")) depends_on('libtool', type=("build"))
......
...@@ -6,7 +6,5 @@ class Thallium(CMakePackage): ...@@ -6,7 +6,5 @@ class Thallium(CMakePackage):
url = "https://xgitlab.cels.anl.gov/sds/thallium" url = "https://xgitlab.cels.anl.gov/sds/thallium"
version('master', git='https://xgitlab.cels.anl.gov/sds/thallium.git') version('master', git='https://xgitlab.cels.anl.gov/sds/thallium.git')
version('provider', git='https://xgitlab.cels.anl.gov/sds/thallium.git', branch='dev-provider-id')
depends_on('margo', when='@master') depends_on('margo')
depends_on('margo@provider', when='@provider')
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