From 17cec3b10156f1e307677170dfd27781a6281779 Mon Sep 17 00:00:00 2001 From: Miroslav Stoyanov <30537612+mkstoyanov@users.noreply.github.com> Date: Fri, 31 Mar 2023 06:48:48 -0400 Subject: Deprecate old tasmanian (#36534) * deprecated old versions and deps * syntax fix --------- Co-authored-by: Tamara Dahlgren <35777542+tldahlgren@users.noreply.github.com> --- .../repos/builtin/packages/tasmanian/package.py | 29 +++++++++++++++++----- 1 file changed, 23 insertions(+), 6 deletions(-) diff --git a/var/spack/repos/builtin/packages/tasmanian/package.py b/var/spack/repos/builtin/packages/tasmanian/package.py index 02f971b13a..8018807972 100644 --- a/var/spack/repos/builtin/packages/tasmanian/package.py +++ b/var/spack/repos/builtin/packages/tasmanian/package.py @@ -16,7 +16,7 @@ class Tasmanian(CMakePackage, CudaPackage, ROCmPackage): interpolation as well as parameter calibration.""" homepage = "https://ornl.github.io/TASMANIAN/stable/" - url = "https://github.com/ORNL/TASMANIAN/archive/v7.5.tar.gz" + url = "https://github.com/ORNL/TASMANIAN/archive/v7.9.tar.gz" git = "https://github.com/ORNL/TASMANIAN.git" tags = ["e4s"] @@ -28,19 +28,35 @@ class Tasmanian(CMakePackage, CudaPackage, ROCmPackage): version("7.7", sha256="85fb3a7b302ea21a3b700712767a59a623d9ab93da03308fa47d4413654c3878") version("7.5", sha256="d621bd36dced4db86ef638693ba89b336762e7a3d7fedb3b5bcefb03390712b3") version("7.3", sha256="5bd1dd89cc5c84506f6900b6569b17e50becd73eb31ec85cfa11d6f1f912c4fa") - version("7.1", sha256="9c24a591506a478745b802f1fa5c557da7bc80b12d8070855de6bc7aaca7547a") + + # API is very stable since 7.0, but the refactoring made 7.0 and 7.1 rocky + version( + "7.1", + sha256="9c24a591506a478745b802f1fa5c557da7bc80b12d8070855de6bc7aaca7547a", + deprecated=True, + ) version( - "7.0", sha256="4094ba4ee2f1831c575d00368c8471d3038f813398be2e500739cef5c7c4a47b" + "7.0", + sha256="4094ba4ee2f1831c575d00368c8471d3038f813398be2e500739cef5c7c4a47b", + deprecated=True, ) # use for xsdk-0.5.0 + # 5.0, 5.1 and 6.0 use older API from 2018, all users have moved up by now version( - "6.0", sha256="ceab842e9fbce2f2de971ba6226967caaf1627b3e5d10799c3bd2e7c3285ba8b" + "6.0", + sha256="ceab842e9fbce2f2de971ba6226967caaf1627b3e5d10799c3bd2e7c3285ba8b", + deprecated=True, ) # use for xsdk-0.4.0 - version("5.1", sha256="b0c1be505ce5f8041984c63edca9100d81df655733681858f5cc10e8c0c72711") + version( + "5.1", + sha256="b0c1be505ce5f8041984c63edca9100d81df655733681858f5cc10e8c0c72711", + deprecated=True, + ) version( "5.0", sha256="2540bb63dea987ab205f7b375aff41f320b1de9bd7f1d1064ef96b22eeda1251", url="https://tasmanian.ornl.gov/documents/Tasmanian_v5.0.zip", + deprecated=True, ) variant("xsdkflags", default=False, description="enable XSDK defaults for Tasmanian") @@ -71,6 +87,7 @@ class Tasmanian(CMakePackage, CudaPackage, ROCmPackage): depends_on("cmake@2.8:", type="build") depends_on("cmake@3.5:", type="build", when="@6.0:") depends_on("cmake@3.10:", type=("build", "run"), when="@7.0:") + depends_on("cmake@3.22:", type=("build", "run"), when="@develop") depends_on("python@2.7:", when="+python", type=("build", "run")) depends_on("py-numpy", when="+python", type=("build", "run")) @@ -93,7 +110,7 @@ class Tasmanian(CMakePackage, CudaPackage, ROCmPackage): depends_on("magma@2.4.0:", when="+magma @6.0:", type=("build", "run")) depends_on("magma@2.5.0:", when="+magma @7.0:", type=("build", "run")) - conflicts("-cuda", when="+magma") # currently MAGMA only works with CUDA + conflicts("+magma", when="~cuda~rocm") # currently MAGMA only works with CUDA conflicts("+cuda", when="+rocm") # can pick CUDA or ROCm, not both # old versions -- cgit v1.2.3-60-g2f50