From 319f20d94ff68f781b4913d236e0587dfa0195ba Mon Sep 17 00:00:00 2001
From: arjun-raj-kuppala <60718144+arjun-raj-kuppala@users.noreply.github.com>
Date: Tue, 18 May 2021 06:53:53 -0700
Subject: AMD ROCm release 4.2: core components part-1 (#23613)

---
 var/spack/repos/builtin/packages/hsakmt-roct/package.py  | 9 +++++----
 var/spack/repos/builtin/packages/rocm-cmake/package.py   | 8 ++++++--
 var/spack/repos/builtin/packages/rocm-smi-lib/package.py | 9 ++++++++-
 3 files changed, 19 insertions(+), 7 deletions(-)

(limited to 'var')

diff --git a/var/spack/repos/builtin/packages/hsakmt-roct/package.py b/var/spack/repos/builtin/packages/hsakmt-roct/package.py
index 3366f987b5..a46e9f767e 100644
--- a/var/spack/repos/builtin/packages/hsakmt-roct/package.py
+++ b/var/spack/repos/builtin/packages/hsakmt-roct/package.py
@@ -14,11 +14,12 @@ class HsakmtRoct(CMakePackage):
 
     homepage = "https://github.com/RadeonOpenCompute/ROCT-Thunk-Interface"
     git      = "https://github.com/RadeonOpenCompute/ROCT-Thunk-Interface.git"
-    url      = "https://github.com/RadeonOpenCompute/ROCT-Thunk-Interface/archive/rocm-4.1.0.tar.gz"
+    url      = "https://github.com/RadeonOpenCompute/ROCT-Thunk-Interface/archive/rocm-4.2.0.tar.gz"
 
     maintainers = ['srekolam', 'arjun-raj-kuppala']
 
     version('master', branch='master')
+    version('4.2.0', sha256='cc325d4b9a96062f2ad0515fce724a8c64ba56a7d7f1ac4a0753941b8599c52e')
     version('4.1.0', sha256='8443ed5907a7ba9ad4003a49d90ff7b8886e1b2a5e90f14e4035765a7f64d7ca')
     version('4.0.0', sha256='a6960fffc8388731ee18953faae12d1449c582e3b3594418845a544455895f42')
     version('3.10.0', sha256='a3d629247a763cc36f5d48e9122cee8498574af628e14e3c38686c05f66e3e06')
@@ -28,6 +29,7 @@ class HsakmtRoct(CMakePackage):
     version('3.5.0', sha256='d9f458c16cb62c3c611328fd2f2ba3615da81e45f3b526e45ff43ab4a67ee4aa')
 
     variant('build_type', default='Release', values=("Release", "Debug"), description='CMake build type')
+    variant('shared', default=True, description='Build shared or static library')
 
     depends_on('cmake@3:', type='build')
     depends_on('numactl')
@@ -40,7 +42,6 @@ class HsakmtRoct(CMakePackage):
             return ['install']
 
     def cmake_args(self):
-        args = [
-            '-DBUILD_SHARED_LIBS="on"',
+        return [
+            self.define_from_variant('BUILD_SHARED_LIBS', 'shared')
         ]
-        return args
diff --git a/var/spack/repos/builtin/packages/rocm-cmake/package.py b/var/spack/repos/builtin/packages/rocm-cmake/package.py
index 2cf525090a..4b8657a064 100644
--- a/var/spack/repos/builtin/packages/rocm-cmake/package.py
+++ b/var/spack/repos/builtin/packages/rocm-cmake/package.py
@@ -13,11 +13,12 @@ class RocmCmake(CMakePackage):
 
     homepage = "https://github.com/RadeonOpenCompute/rocm-cmake"
     git      = "https://github.com/RadeonOpenCompute/rocm-cmake.git"
-    url      = "https://github.com/RadeonOpenCompute/rocm-cmake/archive/rocm-4.1.0.tar.gz"
+    url      = "https://github.com/RadeonOpenCompute/rocm-cmake/archive/rocm-4.2.0.tar.gz"
 
     maintainers = ['srekolam', 'arjun-raj-kuppala']
 
     version('master', branch='master')
+    version('4.2.0', sha256='299e190ec3d38c2279d9aec762469628f0b2b1867adc082edc5708d1ac785c3b')
     version('4.1.0', sha256='a4521d119fa07954e529d5e717ad1b338992c0694690dbce00fee26c01129c8c')
     version('4.0.0', sha256='4577487acaa6e041a1316145867584f31caaf0d4aa2dd8fd7f82f81c269cada6')
     version('3.10.0', sha256='751be4484efdcf0d5fa675480db6e2cddab897de4708c7c7b9fa7adb430b52d7')
@@ -27,8 +28,11 @@ class RocmCmake(CMakePackage):
     version('3.5.0', sha256='5fc09e168879823160f5fdf4fd1ace2702d36545bf733e8005ed4ca18c3e910f')
 
     variant('build_type', default='Release', values=("Release", "Debug"), description='CMake build type')
+    variant('ldconfig', default=True, description='ROCm ldconfig')
 
     depends_on('cmake@3:', type='build')
 
     def cmake_args(self):
-        return ['-DROCM_DISABLE_LDCONFIG=ON']
+        return [
+            self.define_from_variant('ROCM_DISABLE_LDCONFIG', 'ldconfig')
+        ]
diff --git a/var/spack/repos/builtin/packages/rocm-smi-lib/package.py b/var/spack/repos/builtin/packages/rocm-smi-lib/package.py
index 4ef306bef3..8fdcd21edb 100644
--- a/var/spack/repos/builtin/packages/rocm-smi-lib/package.py
+++ b/var/spack/repos/builtin/packages/rocm-smi-lib/package.py
@@ -14,11 +14,12 @@ class RocmSmiLib(CMakePackage):
 
     homepage = "https://github.com/RadeonOpenCompute/rocm_smi_lib"
     git      = "https://github.com/RadeonOpenCompute/rocm_smi_lib.git"
-    url      = "https://github.com/RadeonOpenCompute/rocm_smi_lib/archive/rocm-4.1.0.tar.gz"
+    url      = "https://github.com/RadeonOpenCompute/rocm_smi_lib/archive/rocm-4.2.0.tar.gz"
 
     maintainers = ['srekolam', 'arjun-raj-kuppala']
 
     version('master', branch='master')
+    version('4.2.0', sha256='c31bf91c492f00d0c5ab21e45afbd7baa990e4a8d7ce9b01e3b988e5fdd53f50')
     version('4.1.0', sha256='0c1d2152e40e14bb385071ae16e7573290fb9f74afa5ab887c54f4dd75849a6b')
     version('4.0.0', sha256='93d19229b5a511021bf836ddc2a9922e744bf8ee52ee0e2829645064301320f4')
     version('3.10.0', sha256='8bb2142640d1c6bf141f19accf809e61377a6e0c0222e47ac4daa5da2c85ddac')
@@ -28,9 +29,15 @@ class RocmSmiLib(CMakePackage):
     version('3.5.0', sha256='a5d2ec3570d018b60524f0e589c4917f03d26578443f94bde27a170c7bb21e6e')
 
     variant('build_type', default='Release', values=("Release", "Debug"), description='CMake build type')
+    variant('shared', default=True, description='Build shared or static library')
 
     depends_on('cmake@3:', type='build')
 
+    def cmake_args(self):
+        return [
+            self.define_from_variant('BUILD_SHARED_LIBS', 'shared')
+        ]
+
     @run_after('install')
     def post_install(self):
         shutil.rmtree(self.prefix.lib)
-- 
cgit v1.2.3-60-g2f50