TensorFlow: add new version (#16494)

1 files changed, 15 insertions, 8 deletions

diff --git a/var/spack/repos/builtin/packages/py-tensorflow/package.py b/var/spack/repos/builtin/packages/py-tensorflow/package.py
index b46cfbb4ce..78138b1e8b 100644
--- a/var/spack/repos/builtin/packages/py-tensorflow/package.py
+++ b/var/spack/repos/builtin/packages/py-tensorflow/package.py
@@ -11,11 +11,12 @@ class PyTensorflow(Package, CudaPackage):
     """
 
     homepage = "https://www.tensorflow.org"
-    url      = "https://github.com/tensorflow/tensorflow/archive/v2.1.0.tar.gz"
+    url      = "https://github.com/tensorflow/tensorflow/archive/v2.2.0.tar.gz"
 
     maintainers = ['adamjstewart']
     import_modules = ['tensorflow']
 
+    version('2.2.0',  sha256='69cd836f87b8c53506c4f706f655d423270f5a563b76dc1cfa60fbc3184185a3')
     version('2.1.0',  sha256='638e541a4981f52c69da4a311815f1e7989bf1d67a41d204511966e1daed14f7')
     version('2.0.1',  sha256='29197d30923b9670992ee4b9c6161f50c7452e9a4158c720746e846080ac245a')
     version('2.0.0',  sha256='49b5f0495cd681cbcb5296a4476853d4aea19a43bdd9f179c928a977308a0617')
@@ -82,6 +83,7 @@ class PyTensorflow(Package, CudaPackage):
     variant('dynamic_kernels', default=False, description='Build kernels into separate shared objects')
 
     extends('python')
+    depends_on('python@3:', type=('build', 'run'), when='@2.1:')
 
     # TODO: Older versions of TensorFlow don't list the viable version range,
     # just the minimum version of bazel that will work. The latest version of
@@ -89,7 +91,8 @@ class PyTensorflow(Package, CudaPackage):
     # Need to investigate further.
 
     # See _TF_MIN_BAZEL_VERSION and _TF_MAX_BAZEL_VERSION in configure.py
-    depends_on('bazel@0.27.1:0.29.1', type='build', when='@2.1:')
+    depends_on('bazel@2.0.0',         type='build', when='@2.2:')
+    depends_on('bazel@0.27.1:0.29.1', type='build', when='@2.1.0:2.1.999')
     depends_on('bazel@0.24.1:0.26.1', type='build', when='@1.15:2.0')
     # See call to check_bazel_version in configure.py
     depends_on('bazel@0.24.1:0.25.2', type='build', when='@1.14.0')
@@ -116,18 +119,22 @@ class PyTensorflow(Package, CudaPackage):
     # Listed under REQUIRED_PACKAGES in tensorflow/tools/pip_package/setup.py
     depends_on('py-absl-py@0.7.0:', type=('build', 'run'), when='@1.12.1,1.14:')
     depends_on('py-absl-py@0.1.6:', type=('build', 'run'), when='@1.5:')
-    depends_on('py-astor@0.6.0:', type=('build', 'run'), when='@1.6:')
+    depends_on('py-astunparse@1.6.3', type=('build', 'run'), when='@2.2:')
+    depends_on('py-astor@0.6.0:', type=('build', 'run'), when='@1.6:2.1')
     depends_on('py-backports-weakref@1.0:', type=('build', 'run'), when='@1.3: ^python@:3.3')
     depends_on('py-backports-weakref@1.0rc1', type=('build', 'run'), when='@1.2.0:1.2.1')
     depends_on('py-enum34@1.1.6:', type=('build', 'run'), when='@1.5: ^python@:3.3')
     depends_on('py-enum34@1.1.6:', type=('build', 'run'), when='@1.4.0:1.4.1')
-    depends_on('py-gast@0.2.2', type=('build', 'run'), when='@1.15:')
-    depends_on('py-gast@0.2.0:', type=('build', 'run'), when='@1.6:')
+    depends_on('py-gast@0.3.3', type=('build', 'run'), when='@2.2:')
+    depends_on('py-gast@0.2.2', type=('build', 'run'), when='@1.15:2.1')
+    depends_on('py-gast@0.2.0:', type=('build', 'run'), when='@1.6:1.14')
+    depends_on('py-google-pasta@0.1.8:', type=('build', 'run'), when='@2.1:')
     depends_on('py-google-pasta@0.1.6:', type=('build', 'run'), when='@1.14:')
     depends_on('py-google-pasta@0.1.2:', type=('build', 'run'), when='@1.12.1')
-    depends_on('py-keras-applications@1.0.8:', type=('build', 'run'), when='@1.15:')
-    depends_on('py-keras-applications@1.0.6:', type=('build', 'run'), when='@1.12:')
-    depends_on('py-keras-applications@1.0.5:', type=('build', 'run'), when='@1.11:')
+    depends_on('py-h5py@2.10.0:2.10.999', type=('build', 'run'), when='@2.2:')
+    depends_on('py-keras-applications@1.0.8:', type=('build', 'run'), when='@1.15:2.1')
+    depends_on('py-keras-applications@1.0.6:', type=('build', 'run'), when='@1.12:1.14')
+    depends_on('py-keras-applications@1.0.5:', type=('build', 'run'), when='@1.11.0:1.11.999')
     depends_on('py-keras-preprocessing@1.1.0:', type=('build', 'run'), when='@2.1:')
     depends_on('py-keras-preprocessing@1.0.5:', type=('build', 'run'), when='@1.12:')
     depends_on('py-keras-preprocessing@1.0.3:', type=('build', 'run'), when='@1.11:')