py-tensorflow: add patch releases, remove v0.X (#33963)

3 files changed, 7 insertions, 100 deletions

diff --git a/var/spack/repos/builtin/packages/py-tensorflow/crosstool.patch b/var/spack/repos/builtin/packages/py-tensorflow/crosstool.patch
deleted file mode 100644
index 3583211cab..0000000000
--- a/var/spack/repos/builtin/packages/py-tensorflow/crosstool.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-+++ tensorflow-1.0.0-rc2/third_party/gpus/crosstool/clang/bin/crosstool_wrapper_driver_is_not_gcc.tpl        2017-02-15 20:40:47.633496842 +0100
---- tensorflow-1.0.0-rc2/third_party/gpus/crosstool/clang/bin/crosstool_wrapper_driver_is_not_gcc.tpl        2017-02-08 19:32:14.000000000 +0100
-@@ -46,13 +46,13 @@ import sys
- import pipes
- 
- # Template values set by cuda_autoconf.
--CPU_COMPILER = ('%{cpu_compiler}')
--GCC_HOST_COMPILER_PATH = ('%{gcc_host_compiler_path}')
-+CPU_COMPILER = os.environ['SPACK_CC']
-+GCC_HOST_COMPILER_PATH = CPU_COMPILER
- 
- CURRENT_DIR = os.path.dirname(sys.argv[0])
- NVCC_PATH = CURRENT_DIR + '/../../../cuda/bin/nvcc'
--LLVM_HOST_COMPILER_PATH = ('/usr/bin/gcc')
--PREFIX_DIR = os.path.dirname(GCC_HOST_COMPILER_PATH)
-+LLVM_HOST_COMPILER_PATH = os.environ['SPACK_CC']
-+PREFIX_DIR = os.path.dirname(os.environ['SPACK_CC'])
- NVCC_VERSION = '%{cuda_version}'
- 
- def Log(s):
-
diff --git a/var/spack/repos/builtin/packages/py-tensorflow/package.py b/var/spack/repos/builtin/packages/py-tensorflow/package.py
index 8247cd1ceb..2933f80cb6 100644
--- a/var/spack/repos/builtin/packages/py-tensorflow/package.py
+++ b/var/spack/repos/builtin/packages/py-tensorflow/package.py
@@ -30,10 +30,13 @@ class PyTensorflow(Package, CudaPackage, ROCmPackage):
     maintainers = ["adamjstewart", "aweits"]
     import_modules = ["tensorflow"]
 
+    version("2.10.1", sha256="622a92e22e6f3f4300ea43b3025a0b6122f1cc0e2d9233235e4c628c331a94a3")
     version("2.10.0", sha256="b5a1bb04c84b6fe1538377e5a1f649bb5d5f0b2e3625a3c526ff3a8af88633e8")
+    version("2.9.3", sha256="59d09bd00eef6f07477eea2f50778582edd4b7b2850a396f1fd0c646b357a573")
     version("2.9.2", sha256="8cd7ed82b096dc349764c3369331751e870d39c86e73bbb5374e1664a59dcdf7")
     version("2.9.1", sha256="6eaf86ead73e23988fe192da1db68f4d3828bcdd0f3a9dc195935e339c95dbdc")
     version("2.9.0", sha256="8087cb0c529f04a4bfe480e49925cd64a904ad16d8ec66b98e2aacdfd53c80ff")
+    version("2.8.4", sha256="c08a222792bdbff9da299c7885561ee27b95d414d1111c426efac4ccdce92cde")
     version("2.8.3", sha256="4b7ecbe50b36887e1615bc2a582cb86df1250004d8bb540e18336d539803b5a7")
     version("2.8.2", sha256="b3f860c02c22a30e9787e2548ca252ab289a76b7778af6e9fa763d4aafd904c7")
     version("2.8.1", sha256="4b487a63d6f0c1ca46a2ac37ba4687eabdc3a260c222616fa414f6df73228cec")
@@ -115,46 +118,6 @@ class PyTensorflow(Package, CudaPackage, ROCmPackage):
     version("1.1.0", sha256="aad4470f52fa59f54de7b9a2da727429e6755d91d756f245f952698c42a60027")
     version("1.0.1", sha256="deea3c65e0703da96d9c3f1162e464c51d37659dd129396af134e9e8f1ea8c05")
     version("1.0.0", sha256="db8b3b8f4134b7c9c1b4165492ad5d5bb78889fcd99ffdffc325e97da3e8c677")
-    version(
-        "0.12.0",
-        sha256="13a1d4e98c82eae7e26fe75384de1517d6126f63ba5d302392ec02ac3ae4b1b9",
-        deprecated=True,
-    )
-    version(
-        "0.11.0",
-        sha256="24242ff696234bb1e58d09d45169b148525ccb706f980a4a92ddd3b82c7546dc",
-        deprecated=True,
-    )
-    version(
-        "0.10.0",
-        sha256="f32df04e8f7186aaf6723fc5396733b2f6c2fd6fe4a53a54a68b80f3ec855680",
-        deprecated=True,
-    )
-    version(
-        "0.9.0",
-        sha256="3128c396af19518c642d3e590212291e1d93c5b047472a10cf3245b53adac9c9",
-        deprecated=True,
-    )
-    version(
-        "0.8.0",
-        sha256="f201ba7fb7609a6416968d4e1920d87d67be693b5bc7d34b6b4a79860a9a8a4e",
-        deprecated=True,
-    )
-    version(
-        "0.7.1",
-        sha256="ef34121432f7a522cf9f99a56cdd86e370cc5fa3ee31255ca7cb17f36b8dfc0d",
-        deprecated=True,
-    )
-    version(
-        "0.7.0",
-        sha256="43dd3051f947aa66e6fc09dac2f86a2efe2e019736bbd091c138544b86d717ce",
-        deprecated=True,
-    )
-    version(
-        "0.6.0",
-        sha256="f86ace45e99053b09749cd55ab79c57274d8c7460ae763c5e808d81ffbc3b657",
-        deprecated=True,
-    )
 
     variant("mkl", default=False, description="Build with MKL support")
     variant("jemalloc", default=False, description="Build with jemalloc as malloc support")
@@ -211,11 +174,6 @@ class PyTensorflow(Package, CudaPackage, ROCmPackage):
     depends_on("bazel@0.4.5", type="build", when="@1.2:1.3")
     # See call to check_version in WORKSPACE
     depends_on("bazel@0.4.2", type="build", when="@1.0:1.1")
-    depends_on("bazel@0.3.2", type="build", when="@0.12")
-    depends_on("bazel@0.3.0", type="build", when="@0.11")
-    depends_on("bazel@0.2.0", type="build", when="@0.9:0.10")
-    depends_on("bazel@0.1.4", type="build", when="@0.7:0.8")
-    depends_on("bazel@0.1.1", type="build", when="@0.5:0.6")
 
     depends_on("swig", type="build")
     depends_on("py-pip", type="build")
@@ -277,9 +235,7 @@ class PyTensorflow(Package, CudaPackage, ROCmPackage):
     )
     depends_on("py-numpy@1.13.3:1.14.5", type=("build", "run"), when="@1.10")
     depends_on("py-numpy@1.12.1:1.14.5", type=("build", "run"), when="@1.4:1.5")
-    depends_on("py-numpy@1.11.0:1.14.5", type=("build", "run"), when="@0.11:1.3")
-    depends_on("py-numpy@1.10.1:1.14.5", type=("build", "run"), when="@0.7.1:0.10 platform=darwin")
-    depends_on("py-numpy@1.8.2:1.14.5", type=("build", "run"), when="@0.5:0.10")
+    depends_on("py-numpy@1.11.0:1.14.5", type=("build", "run"), when="@:1.3")
     depends_on("py-opt-einsum@2.3.2:", type=("build", "run"), when="@1.15:2.3,2.7:")
     depends_on("py-opt-einsum@3.3", type=("build", "run"), when="@2.4:2.6")
     depends_on("py-packaging", type=("build", "run"), when="@2.9:")
@@ -290,11 +246,7 @@ class PyTensorflow(Package, CudaPackage, ROCmPackage):
     depends_on("py-protobuf@3.4.0:", type=("build", "run"), when="@1.5:1.9")
     depends_on("py-protobuf@3.3.0:", type=("build", "run"), when="@1.3:1.4")
     depends_on("py-protobuf@3.2.0:", type=("build", "run"), when="@1.1:1.2")
-    depends_on("py-protobuf@3.1.0:", type=("build", "run"), when="@0.12.1:1.0")
-    depends_on("py-protobuf@3.1.0", type=("build", "run"), when="@0.12.0")
-    depends_on("py-protobuf@3.0.0", type=("build", "run"), when="@0.11.0")
-    depends_on("py-protobuf@3.0.0b2", type=("build", "run"), when="@0.7.1:0.10")
-    depends_on("py-protobuf@3.0.0a3", type=("build", "run"), when="@0.6:0.7.0")
+    depends_on("py-protobuf@3.1.0:", type=("build", "run"), when="@:1.0")
     depends_on("protobuf@:3.12", when="@:2.4")
     depends_on("protobuf@:3.17")
     # https://github.com/protocolbuffers/protobuf/issues/10051
@@ -367,7 +319,7 @@ class PyTensorflow(Package, CudaPackage, ROCmPackage):
     depends_on("py-scipy@1.2.2", type=("build", "run"), when="@2.1.0:2.1.1,2.2.0,2.3.0 ^python@:2")
     depends_on("py-wheel@0.32:0", type=("build", "run"), when="@2.7")
     depends_on("py-wheel@0.35:0", type=("build", "run"), when="@2.4:2.6 ^python@3:")
-    depends_on("py-wheel@0.26:", type=("build", "run"), when="@0.6:2.3 ^python@3:")
+    depends_on("py-wheel@0.26:", type=("build", "run"), when="@:2.3 ^python@3:")
 
     # TODO: add packages for some of these dependencies
     depends_on("mkl", when="+mkl")
@@ -377,8 +329,7 @@ class PyTensorflow(Package, CudaPackage, ROCmPackage):
     depends_on("cuda@:10.2", when="+cuda @:2.3")
     depends_on("cuda@:11.4", when="+cuda @2.4:2.7")
     depends_on("cudnn", when="+cuda")
-    depends_on("cudnn@:6", when="@0.5:0.6 +cuda")
-    depends_on("cudnn@:7", when="@0.7:2.2 +cuda")
+    depends_on("cudnn@:7", when="@:2.2 +cuda")
     # depends_on('tensorrt', when='+tensorrt')
     depends_on("nccl", when="+nccl+cuda")
     depends_on("mpi", when="+mpi")
@@ -388,7 +339,6 @@ class PyTensorflow(Package, CudaPackage, ROCmPackage):
     # Check configure and configure.py to see when these variants are supported
     conflicts("+mkl", when="@:1.0")
     conflicts("+mkl", when="platform=darwin", msg="Darwin is not yet supported")
-    conflicts("+jemalloc", when="@:0")
     conflicts(
         "+jemalloc",
         when="platform=darwin",
@@ -399,17 +349,12 @@ class PyTensorflow(Package, CudaPackage, ROCmPackage):
         when="platform=cray",
         msg="Currently jemalloc is only support on Linux platform",
     )
-    conflicts("+gcp", when="@:0.8")
-    conflicts("+hdfs", when="@:0.10")
     conflicts("+aws", when="@:1.3")
     conflicts("+kafka", when="@:1.5,2.1:")
     conflicts("+ignite", when="@:1.11,2.1:")
-    conflicts("+xla", when="@:0")
     conflicts("+gdr", when="@:1.3")
     conflicts("+verbs", when="@:1.1")
     conflicts("+ngraph", when="@:1.10")
-    conflicts("+opencl", when="@:0.11")
-    conflicts("+computecpp", when="@:0.11")
     conflicts("+computecpp", when="~opencl")
     conflicts("+cuda", when="platform=darwin", msg="There is no GPU support for macOS")
     conflicts(
@@ -475,15 +420,11 @@ class PyTensorflow(Package, CudaPackage, ROCmPackage):
     # zlib is vendored and downloaded directly from zlib.org (or mirrors), but
     # old downloads are removed from that site immediately after a new release.
     # If the tf mirrors don't work, make sure the fallback is to something existing.
-    patch("url-zlib.patch", when="@0.10.0")
-    # bump to zlib 1.2.13
     patch(
         "https://github.com/tensorflow/tensorflow/commit/76b9fa22857148a562f3d9b5af6843402a93c15b.patch?full_index=1",
         sha256="f9e26c544da729cfd376dbd3b096030e3777d3592459add1f3c78b1b9828d493",
         when="@2.9:2.10.0",
     )
-    # TODO: why is this needed?
-    patch("crosstool.patch", when="@0.10.0+cuda")
     # Avoid build error: "no such package '@io_bazel_rules_docker..."
     patch("io_bazel_rules_docker2.patch", when="@1.15:2.0")
     # Avoide build error: "name 'new_http_archive' is not defined"
diff --git a/var/spack/repos/builtin/packages/py-tensorflow/url-zlib.patch b/var/spack/repos/builtin/packages/py-tensorflow/url-zlib.patch
deleted file mode 100644
index 9c4fdba09c..0000000000
--- a/var/spack/repos/builtin/packages/py-tensorflow/url-zlib.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- tensorflow-0.10.0/tensorflow/workspace.bzl       2016-09-08 23:49:36.000000000 +0200
-+++ tensorflow-0.10.0/tensorflow/workspace.bzl       2017-01-31 09:11:07.391869277 +0100
-@@ -198,7 +198,7 @@ def tf_workspace(path_prefix = "", tf_re
-
-   native.new_http_archive(
-     name = "zlib_archive",
--    url = "http://zlib.net/zlib-1.2.8.tar.gz",
--    sha256 = "36658cb768a54c1d4dec43c3116c27ed893e88b02ecfcb44f2166f9c0b7f2a0d",
-+    url = "http://zlib.net/zlib-1.2.11.tar.gz",
-+    sha256 = "c3e5e9fdd5004dcb542feda5ee4f0ff0744628baf8ed2dd5d66f8ca1197cb1a1",
-     build_file = path_prefix + "zlib.BUILD",
-   )
-