remove rocm version that was causing failures due to being a weird point in BLT's develop history (#23377)

5 files changed, 4 insertions, 17 deletions

diff --git a/var/spack/repos/builtin/packages/blt/package.py b/var/spack/repos/builtin/packages/blt/package.py
index 7020a36327..372f6a92b0 100644
--- a/var/spack/repos/builtin/packages/blt/package.py
+++ b/var/spack/repos/builtin/packages/blt/package.py
@@ -23,11 +23,6 @@ class Blt(Package):
     #  projects if not handled properly. More info here:
     #  https://llnl-blt.readthedocs.io/en/develop/tutorial/exporting_targets.html
     version('0.4.0', sha256='f3bc45d28b9b2eb6df43b75d4f6f89a1557d73d012da7b75bac1be0574767193')
-
-    # 0.3.6 + a specific fix for versions of packages that rely on rocm and
-    # cannot move completely forward in BLT to the breaking change in 0.4.0
-    version('0.3.6rocm', commit='a98a5836c7a9e34b75a54eb46212812796fe5557')
-
     version('0.3.6', sha256='6276317c29e7ff8524fbea47d9288ddb40ac06e9f9da5e878bf9011e2c99bf71')
     version('0.3.5', sha256='68a1c224bb9203461ae6f5ab0ff3c50b4a58dcce6c2d2799489a1811f425fb84')
     version('0.3.0', sha256='bb917a67cb7335d6721c997ba9c5dca70506006d7bba5e0e50033dd0836481a5')
diff --git a/var/spack/repos/builtin/packages/care/package.py b/var/spack/repos/builtin/packages/care/package.py
index c470cfbc31..83abcb11d2 100644
--- a/var/spack/repos/builtin/packages/care/package.py
+++ b/var/spack/repos/builtin/packages/care/package.py
@@ -28,10 +28,8 @@ class Care(CMakePackage, CudaPackage, ROCmPackage):
     variant('tests', default=False, description='Build tests')
     variant('loop_fuser', default=False, description='Enable loop fusion capability')
 
-    depends_on('blt', type='build', when='@0.3.1:')
+    depends_on('blt@0.4.0:', type='build', when='@0.3.1:')
     depends_on('blt@:0.3.6', type='build', when='@:0.3.0')
-    # 0.3.6 + specific fix for rocm
-    depends_on('blt@0.3.6rocm', type='build', when='@:0.3.0+rocm')
 
     depends_on('camp')
     depends_on('umpire@develop')
diff --git a/var/spack/repos/builtin/packages/chai/package.py b/var/spack/repos/builtin/packages/chai/package.py
index aaf72e926b..edff6ed3b3 100644
--- a/var/spack/repos/builtin/packages/chai/package.py
+++ b/var/spack/repos/builtin/packages/chai/package.py
@@ -36,10 +36,8 @@ class Chai(CMakePackage, CudaPackage, ROCmPackage):
     depends_on('cmake@3.8:', type='build')
     depends_on('cmake@3.9:', type='build', when="+cuda")
 
-    depends_on('blt', type='build', when='@2.3.1:')
+    depends_on('blt@0.4.0:', type='build', when='@2.3.1:')
     depends_on('blt@:0.3.6', type='build', when='@:2.3.0')
-    # 0.3.6 + specific fix for rocm
-    depends_on('blt@0.3.6rocm', type='build', when='@:2.3.0+rocm')
 
     depends_on('umpire')
     depends_on('raja', when="+raja")
diff --git a/var/spack/repos/builtin/packages/raja/package.py b/var/spack/repos/builtin/packages/raja/package.py
index 4f49d5af66..49ba6996b7 100644
--- a/var/spack/repos/builtin/packages/raja/package.py
+++ b/var/spack/repos/builtin/packages/raja/package.py
@@ -37,10 +37,8 @@ class Raja(CMakePackage, CudaPackage, ROCmPackage):
     # and remove the +tests conflict below.
     variant('tests', default=False, description='Build tests')
 
-    depends_on('blt', type='build', when='@0.13.1:')
+    depends_on('blt@0.4.0:', type='build', when='@0.13.1:')
     depends_on('blt@:0.3.6', type='build', when='@:0.13.0')
-    # 0.3.6 + specific fix for rocm
-    depends_on('blt@0.3.6rocm', type='build', when='@:0.13.0+rocm')
 
     depends_on('camp')
     depends_on('camp+cuda', when='+cuda')
diff --git a/var/spack/repos/builtin/packages/umpire/package.py b/var/spack/repos/builtin/packages/umpire/package.py
index 2400733ad6..a1b242062b 100644
--- a/var/spack/repos/builtin/packages/umpire/package.py
+++ b/var/spack/repos/builtin/packages/umpire/package.py
@@ -60,10 +60,8 @@ class Umpire(CMakePackage, CudaPackage, ROCmPackage):
     depends_on('cmake@3.8:', type='build')
     depends_on('cmake@3.9:', when='+cuda', type='build')
 
-    depends_on('blt', type='build', when='@4.1.3:')
+    depends_on('blt@0.4.0:', type='build', when='@4.1.3:')
     depends_on('blt@:0.3.6', type='build', when='@:4.1.2')
-    # 0.3.6 + specific fix for rocm
-    depends_on('blt@0.3.6rocm', type='build', when='@:4.1.2+rocm')
 
     # variants +rocm and amdgpu_targets are not automatically passed to
     # dependencies, so do it manually.