provider versions of all libs

packages/bake/package.py

@@ -8,9 +8,10 @@ class Bake(AutotoolsPackage):
     url      = "https://xgitlab.cels.anl.gov/sds/bake"
 
     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')
-    depends_on('mercury@pre-scalable-ep')
+    depends_on('margo', when='@master')
+    depends_on('margo@provider', when='@provider')
     depends_on('libuuid')
     depends_on('pmem')
 #    depends_on('pandoc', type=("build") );

packages/margo/package.py

@@ -36,7 +36,11 @@ class Margo(AutotoolsPackage):
             git='https://xgitlab.cels.anl.gov/sds/margo.git',
             branch='margo-registered-data')
 
-    depends_on('mercury@pre-scalable-ep', type=("build", "link", "run"))
+    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('abtsnoozer')
     depends_on('libev')

packages/mdcs/package.py

@@ -6,8 +6,7 @@ class Mdcs(CMakePackage):
     url = "https://xgitlab.cels.anl.gov/sds/mdcs"
 
     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('boost')
-    depends_on('mercury@pre-scalable-ep')
-    depends_on('argobots')
-    depends_on('margo')
+    depends_on('margo', when='@master')
+    depends_on('margo@provider', when='@provider')

packages/mercury/package.py

@@ -36,6 +36,9 @@ class Mercury(CMakePackage):
     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('bmi', default=False, description="Use BMI for network transport")
     variant('fabric',default=True, description="Use libfabric for net transport")

packages/mobject/package.py

@@ -32,19 +32,20 @@ class Mobject(AutotoolsPackage):
     url = "https://xgitlab.cels.anl.gov/sds/mobject-store"
 
     version('master', git='https://xgitlab.cels.anl.gov/sds/mobject-store.git')
-    depends_on('margo')
+    version('provider', git='https://xgitlab.cels.anl.gov/sds/mobject-store.git', branch='dev-provider-id')
+
+    depends_on('margo', when='@master')
+    depends_on('margo@provider', when='@provider')
     depends_on('mpi')
     depends_on('ssg+mpi')
     depends_on('ch-placement')
     depends_on('autoconf')
     depends_on('automake')
     depends_on('libtool')
-    depends_on('sdskeyval')
-    depends_on('bake')
-    # '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@pre-scalable-ep')
+    depends_on('sdskeyval', when='@master')
+    depends_on('bake', when='@master')
+    depends_on('sdskeyval@provider', when='@provider')
+    depends_on('bake@provider', when='@provider')
 
     def configure_args(self):
         extra_args = ['CC=%s' % self.spec['mpi'].mpicc]

packages/poesie/package.py

@@ -32,11 +32,13 @@ class Poesie(AutotoolsPackage):
     url = "https://xgitlab.cels.anl.gov/sds/poesie"
 
     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('python', default=True, description="Enable Python interpreters")
 
-    depends_on('margo', type=("build", "link", "run"))
+    depends_on('margo', type=("build", "link", "run"), when='@master')
+    depends_on('margo@provider', type=("build", "link", "run"), when='@provider')
     # variable dependencies
     depends_on('lua', when="+lua")
     depends_on('python', when="+python")
@@ -53,6 +55,10 @@ class Poesie(AutotoolsPackage):
             extra_args.extend([
                 "--enable-python"
                 ])
+	if '~python' in spec:
+	    extra_args.extend([
+                "--disable-python"
+		])
 
         return extra_args
 

packages/py-bake/package.py

@@ -36,6 +36,9 @@ class PyBake(PythonPackage):
     url      = "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')
-    depends_on('py-margo')
+    depends_on('bake', when='@master')
+    depends_on('py-margo', when='@master')
+    depends_on('bake@provider', when='@provider')
+    depends_on('py-margo@provider', when='@provider')

packages/py-margo/package.py

@@ -37,6 +37,8 @@ class PyMargo(PythonPackage):
     url      = "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')
+    depends_on('margo', when='@master')
+    depends_on('margo@provider', when='@provider')
     depends_on('boost+python')

packages/py-mobject/package.py

@@ -36,12 +36,17 @@ class PyMobject(PythonPackage):
     url      = "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')
-    depends_on('py-sdskv')
-    depends_on('py-margo')
+    depends_on('py-bake',  when='@master')
+    depends_on('py-sdskv', when='@master')
+    depends_on('py-margo', when='@master')
     depends_on('py-ssg')
+    depends_on('mobject',  when='@master')
+    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('mobject')
     depends_on('mpi')
     depends_on('py-pkgconfig')

packages/py-sdskv/package.py

@@ -36,7 +36,10 @@ class PySdskv(PythonPackage):
     url      = "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')
 
-    depends_on('sdskeyval')
-    depends_on('py-margo')
+    depends_on('sdskeyval', when='@master')
+    depends_on('py-margo', when='@master')
     depends_on('py-pkgconfig')
+    depends_on('sdskeyval@provider', when='@provider')
+    depends_on('py-margo@provider', when='@provider')

packages/sdskeyval/package.py

@@ -33,23 +33,18 @@ class Sdskeyval(AutotoolsPackage):
 
     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('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('bdb', default=True, description="Enable Berkely DB keyval backend")
     variant('leveldb', default=True, description="Enable LevelDB keyval backend")
     variant('lmdb', default=False, description="Enable lmdb keyval backend")
 
-    depends_on('margo', type=("build", "link", "run"))
-    depends_on('mercury+selfforward@pre-scalable-ep',
-            type=("build", "link", "run"))
-    depends_on('argobots')
-    depends_on('abtsnoozer')
-    depends_on('libev')
+    depends_on('margo', type=("build", "link", "run"), when='@master')
+    depends_on('margo@provider', type=("build", "link", "run"), when='@provider')
     depends_on('autoconf@2.65:')
     depends_on('automake@1.13.4:')
     depends_on('libtool', type=("build"))
-    depends_on('pkg-config', type=("build"))
     depends_on('ch-placement')
     depends_on('ssg+mpi')
     depends_on('boost+system+filesystem')

packages/ssg/package.py

@@ -16,11 +16,7 @@ class Ssg(AutotoolsPackage):
     variant('mpi', default=False, description='Build with MPI support')
 
     depends_on('mpi', when='+mpi')
-    depends_on('mercury@pre-scalable-ep')
-    depends_on('argobots')
     depends_on('margo')
-    depends_on('abtsnoozer')
-    depends_on('libev')
 
     def configure_args(self):
         spec = self.spec

packages/thallium/package.py

@@ -6,7 +6,7 @@ class Thallium(CMakePackage):
     url = "https://xgitlab.cels.anl.gov/sds/thallium"
 
     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('mercury')
-#depends_on('argobots')
-    depends_on('margo')
+    depends_on('margo', when='@master')
+    depends_on('margo@provider', when='@provider')