From a18700a86a59412e4a4e5f3c401e532faca19213 Mon Sep 17 00:00:00 2001
From: Ganesh Kumar <46193450+gkathirv@users.noreply.github.com>
Date: Wed, 9 Sep 2020 18:52:40 +0530
Subject: Rocm 3.7 rocm smi (#18522)

* ROCm 3.5 miopen recipe

* fixing flake8 issues

* cmake variant fix

* min support fix

* variant possible values

* ROCm 3.7 support for rocm-smi

* review comments change

* miopen merge conflict resolve

* reverting back from copy_tree to install_tree
---
 .../repos/builtin/packages/rocm-smi-lib/package.py |  4 ++-
 .../repos/builtin/packages/rocm-smi/package.py     | 31 +++++++++++-----------
 2 files changed, 18 insertions(+), 17 deletions(-)

(limited to 'var')

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 c774d68cd5..d45818c071 100644
--- a/var/spack/repos/builtin/packages/rocm-smi-lib/package.py
+++ b/var/spack/repos/builtin/packages/rocm-smi-lib/package.py
@@ -13,13 +13,15 @@ class RocmSmiLib(CMakePackage):
        for applications to monitor and control GPU applications."""
 
     homepage = "https://github.com/RadeonOpenCompute/rocm_smi_lib"
-    url      = "https://github.com/RadeonOpenCompute/rocm_smi_lib/archive/rocm-3.5.0.tar.gz"
+    url      = "https://github.com/RadeonOpenCompute/rocm_smi_lib/archive/rocm-3.7.0.tar.gz"
 
     maintainers = ['srekolam', 'arjun-raj-kuppala']
 
+    version('3.7.0', sha256='72d2a3deda0b55a2d92833cd648f50c7cb64f8341b254a0badac0152b26f1391')
     version('3.5.0', sha256='a5d2ec3570d018b60524f0e589c4917f03d26578443f94bde27a170c7bb21e6e')
 
     variant('build_type', default='Release', values=("Release", "Debug"), description='CMake build type')
+
     depends_on('cmake@3:', type='build')
 
     @run_after('install')
diff --git a/var/spack/repos/builtin/packages/rocm-smi/package.py b/var/spack/repos/builtin/packages/rocm-smi/package.py
index bbd0210172..f4c6fc596e 100644
--- a/var/spack/repos/builtin/packages/rocm-smi/package.py
+++ b/var/spack/repos/builtin/packages/rocm-smi/package.py
@@ -5,7 +5,7 @@
 
 
 from spack import *
-from os import popen
+import os
 
 
 class RocmSmi(MakefilePackage):
@@ -13,22 +13,21 @@ class RocmSmi(MakefilePackage):
        management of your ROCm enabled system"""
 
     homepage = "https://github.com/RadeonOpenCompute/ROC-smi"
-    url      = "https://github.com/RadeonOpenCompute/ROC-smi/archive/rocm-3.5.0.tar.gz"
+    url      = "https://github.com/RadeonOpenCompute/ROC-smi/archive/rocm-3.7.0.tar.gz"
 
     maintainers = ['srekolam', 'arjun-raj-kuppala']
-    version('3.5.0', sha256='4f46e947c415a4ac12b9f6989f15a42afe32551706b4f48476fba3abf92e8e7c')
-
-    variant('build_type', default='Release', values=("Release", "Debug"), description='CMake build type')
 
-    phases = ['edit', 'build']
-
-    @run_after('build')
-    def post_build(self):
-        popen('cp -R {0}/rocm_smi.py {1}'.format(self.build_directory, prefix))
-        popen('ln -srf {0}/rocm_smi.py {1}/rocm-smi'.format(prefix, prefix))
+    version('3.7.0', sha256='4e34b3b4e409bb89677882f47d9988d56bc2d9bb9893f0712c22a4b73789e06a')
+    version('3.5.0', sha256='4f46e947c415a4ac12b9f6989f15a42afe32551706b4f48476fba3abf92e8e7c')
 
-        popen('mkdir -p {0}/smi-test/tests'.format(prefix))
-        popen('cp -R {0}/tests/ {1}/smi-test/'.format(self.build_directory,
-                                                      prefix))
-        popen('cp -R {0}/test-rocm-smi.sh {1}/smi-test'.format(
-              self.build_directory, prefix))
+    depends_on('python@3:', type='run')
+
+    def install(self, spec, prefix):
+        filter_file(
+            '^#!/usr/bin/python3',
+            '#!/usr/bin/env {0}'.format(
+                os.path.basename(self.spec['python'].command.path)),
+            'rocm_smi.py'
+        )
+        copy('rocm_smi.py', prefix)
+        symlink('rocm_smi.py', prefix.rocm_smi)
-- 
cgit v1.2.3-70-g09d2