Fixes for rocm install

Author: amd-arsuresh

script/install-rocm/customize.py

@@ -43,13 +43,14 @@ def preprocess(i):
         projects = 'clang;lld;compiler-rt;clang-tools-extra'
         runtimes = 'libcxx;libcxxabi;openmp'
 
+        q = "'"
         cmake_cmd = (
             f'cmake {os.path.join(src_path, "llvm")} -GNinja'
             f' -DCMAKE_BUILD_TYPE=Release'
             f' -DCMAKE_INSTALL_PREFIX={build_install_prefix}'
-            f' -DLLVM_ENABLE_PROJECTS=\"{projects}\"'
-            f' -DLLVM_ENABLE_RUNTIMES=\"{runtimes}\"'
-            f' -DLLVM_TARGETS_TO_BUILD={targets}'
+            f' -DLLVM_ENABLE_PROJECTS={q}{projects}{q}'
+            f' -DLLVM_ENABLE_RUNTIMES={q}{runtimes}{q}'
+            f' -DLLVM_TARGETS_TO_BUILD={q}{targets}{q}'
             f' -DLLVM_ENABLE_RTTI=ON'
             f' -DLLVM_INSTALL_UTILS=ON'
             f' -DLLVM_ENABLE_ASSERTIONS=OFF'
@@ -132,11 +133,16 @@ def postprocess(i):
 
     search_dirs = []
     for prefix in search_prefixes:
+        # Standard package installs: /opt/rocm/bin, /opt/rocm-*/bin
         prefix_opt = os.path.join(prefix, 'opt')
         if os.path.isdir(prefix_opt):
             for p in [os.path.join(prefix_opt, 'rocm', 'bin')] + sorted(glob.glob(os.path.join(prefix_opt, 'rocm-*', 'bin')), reverse=True):
                 if os.path.isdir(p) and p not in search_dirs:
                     search_dirs.append(p)
+        # Untar installs: <prefix>/rocm-*/bin (no opt/ subdirectory)
+        for p in sorted(glob.glob(os.path.join(prefix, 'rocm-*', 'bin')), reverse=True):
+            if os.path.isdir(p) and p not in search_dirs:
+                search_dirs.append(p)
 
     print(f"  install_prefix = {install_prefix}")
     print(f"  cur_dir = {cur_dir}")

script/install-rocm/run-rhel.sh

@@ -22,7 +22,9 @@ if [[ ${major_version} -ge 7 ]]; then
   if [[ "${install_prefix}" == "/" ]]; then
     sudo bash "${runfile_path}" deps=install target="/" rocm postrocm
   else
-    bash "${runfile_path}" deps=skip target="${install_prefix}" rocm postrocm
+    # Use untar for non-root installs (no sudo required)
+    # Creates ${install_prefix}/rocm-${MLC_VERSION}/ with all ROCm components
+    bash "${runfile_path}" untar "${install_prefix}"
   fi
   test $? -eq 0 || exit 1
 

script/install-rocm/run-ubuntu.sh

@@ -32,7 +32,9 @@ if [[ ${major_version} -ge 7 ]]; then
   if [[ "${install_prefix}" == "/" ]]; then
     sudo bash "${runfile_path}" deps=install target="/" rocm postrocm
   else
-    bash "${runfile_path}" deps=skip target="${install_prefix}" rocm postrocm
+    # Use untar for non-root installs (no sudo required)
+    # Creates ${install_prefix}/rocm-${MLC_VERSION}/ with all ROCm components
+    bash "${runfile_path}" untar "${install_prefix}"
   fi
   test $? -eq 0 || exit 1