Swift/T Release 1.3 (#4641)

New release of Swift/T along with turbine, adlbx, and exmcutils
dependencies. Update URLs for archive downloads.

4 files changed, 42 insertions, 10 deletions

diff --git a/var/spack/repos/builtin/packages/adlbx/package.py b/var/spack/repos/builtin/packages/adlbx/package.py
index fbbde8a996..0b0d3cd3bb 100644
--- a/var/spack/repos/builtin/packages/adlbx/package.py
+++ b/var/spack/repos/builtin/packages/adlbx/package.py
@@ -30,12 +30,21 @@ class Adlbx(AutotoolsPackage):
     """ADLB/X: Master-worker library + work stealing and data dependencies"""
 
     homepage = 'http://swift-lang.org/Swift-T'
-    url      = 'http://swift-lang.github.io/swift-t-downloads/adlbx-0.8.0.tar.gz'
+    url      = 'http://swift-lang.github.io/swift-t-downloads/spack/adlbx-0.0.0.tar.gz'
+
+    version('0.9.1', '07151ddef5fb83d8f4b40700013d9daf')
     version('0.8.0', '34ade59ce3be5bc296955231d47a27dd')
 
-    depends_on('exmcutils')
+    depends_on('exmcutils@:0.5.3', when='@:0.8.0')
+    depends_on('exmcutils', when='@0.9.1:')
     depends_on('mpi')
 
+    def setup_environment(self, spack_env, run_env):
+        spec = self.spec
+        spack_env.set('CC', spec['mpi'].mpicc)
+        spack_env.set('CXX', spec['mpi'].mpicxx)
+        spack_env.set('CXXLD', spec['mpi'].mpicxx)
+
     def configure_args(self):
         args = ['--with-c-utils=' + self.spec['exmcutils'].prefix]
         return args
diff --git a/var/spack/repos/builtin/packages/exmcutils/package.py b/var/spack/repos/builtin/packages/exmcutils/package.py
index fbccd6cfd3..48d3d8afef 100644
--- a/var/spack/repos/builtin/packages/exmcutils/package.py
+++ b/var/spack/repos/builtin/packages/exmcutils/package.py
@@ -30,8 +30,8 @@ class Exmcutils(AutotoolsPackage):
     """ExM C-Utils: Generic C utility library for ADLB/X and Swift/T"""
 
     homepage = 'http://swift-lang.org/Swift-T'
-    url      = 'http://swift-lang.github.io/swift-t-downloads/exmcutils-0.5.3.tar.gz'
+    url      = 'http://swift-lang.github.io/swift-t-downloads/spack/exmcutils-0.0.0.tar.gz'
 
-    version('0.5.3', '0e3ed6cc2991c684cd8f08db45c99a39')
+    version('0.5.6', 'b12a8dc163e3369492ec7c1403fe86e4')
 
     # This package has no dependencies.
diff --git a/var/spack/repos/builtin/packages/stc/package.py b/var/spack/repos/builtin/packages/stc/package.py
index b1f62b0fbf..2227b50c31 100644
--- a/var/spack/repos/builtin/packages/stc/package.py
+++ b/var/spack/repos/builtin/packages/stc/package.py
@@ -30,14 +30,14 @@ class Stc(AutotoolsPackage):
     """STC: The Swift-Turbine Compiler"""
 
     homepage = 'http://swift-lang.org/Swift-T'
-    url      = 'http://swift-lang.github.io/swift-t-downloads/stc-0.7.3.tar.gz'
+    url      = 'http://swift-lang.github.io/swift-t-downloads/spack/stc-0.0.0.tar.gz'
 
-    version('0.7.3', '6bf769f406f6c33d1c134521373718d3')
+    version('0.8.2', '883b0657f1aac9b81158ef0a8989be4c')
 
     depends_on('java')
     depends_on('ant')
     depends_on('turbine')
-    depends_on('zsh', type='run')
+    depends_on('zsh')
 
     def configure_args(self):
         args = ['--with-turbine=' + self.spec['turbine'].prefix]
diff --git a/var/spack/repos/builtin/packages/turbine/package.py b/var/spack/repos/builtin/packages/turbine/package.py
index 2289424f14..75e3f67a7a 100644
--- a/var/spack/repos/builtin/packages/turbine/package.py
+++ b/var/spack/repos/builtin/packages/turbine/package.py
@@ -30,18 +30,41 @@ class Turbine(AutotoolsPackage):
     """Turbine: The Swift/T runtime"""
 
     homepage = 'http://swift-lang.org/Swift-T'
-    url      = 'http://swift-lang.github.io/swift-t-downloads/turbine-1.0.0.tar.gz'
+    url      = 'http://swift-lang.github.io/swift-t-downloads/spack/turbine-0.0.0.tar.gz'
 
-    version('1.0.0', '7ed56d65d6db0bfe15a439d818b4259e')
+    version('1.2.3', 'f2e393c292c4248b4e77a19f8272ae88')
+    version('1.2.1', 'c8976b22849aafe02a8fb4259dfed434')
+    version('1.1.0', '9a347cf16df02707cb529f96c265a082')
 
+    variant('python', default=False,
+            description='Enable calling python')
+    variant('r', default=False,
+            description='Enable calling R')
+    depends_on('adlbx@:0.8.0', when='@:1.1.0')
+    depends_on('adlbx', when='@1.2.1:')
     depends_on('adlbx')
     depends_on('tcl')
     depends_on('zsh')
-    depends_on('swig')
+    depends_on('swig', type='build')
+    depends_on('python', when='+python')
+    depends_on('r', when='+r')
+
+    def setup_environment(self, spack_env, run_env):
+        spec = self.spec
+
+        spack_env.set('CC', spec['mpi'].mpicc)
+        spack_env.set('CXX', spec['mpi'].mpicxx)
+        spack_env.set('CXXLD', spec['mpi'].mpicxx)
 
     def configure_args(self):
         args = ['--with-c-utils=' + self.spec['exmcutils'].prefix,
                 '--with-adlb='    + self.spec['adlbx'].prefix,
                 '--with-tcl='     + self.spec['tcl'].prefix,
                 '--with-mpi='     + self.spec['mpi'].prefix]
+        if '+python' in self.spec:
+            args.append('--with-python-exe={0}'.format(
+                        self.spec['python'].command.path))
+        if '+r' in self.spec:
+            args.append('--with-r={0}/rlib/R'.format(
+                        self.spec['r'].prefix))
         return args