Support custom installed path for get,geekbench

Author: amd-arsuresh

script/README.md

@@ -1,6 +1,6 @@
 # MLCommons Automation Scripts
 
-*Last updated: 2026-03-20 04:08:41*
+*Last updated: 2026-03-20 16:46:03*
 
 This directory contains automation scripts for MLPerf benchmarks, AI/ML workflows, and development operations.
 

script/get-geekbench/customize.py

@@ -32,6 +32,10 @@ def preprocess(i):
         package_name = f"Geekbench-{need_version}-WindowsSetup.exe"
         env['MLC_GEEKBENCH_NEED_EXTRACT'] = 'no'
     elif os_info['platform'] == 'linux':
+        if env.get('MLC_GEEKBENCH_INSTALLED_PATH', '') != '':
+            build_path = os.path.join(env['MLC_GEEKBENCH_INSTALLED_PATH'], f"build.{host_os_machine}")
+            if os.path.exists(build_path):
+                env['MLC_GEEKBENCH_INSTALLED_PATH'] = build_path
         if host_os_machine in ('aarch64', 'arm64'):
             arch_suffix = 'LinuxARMPreview'
         else:
@@ -84,13 +88,13 @@ def postprocess(i):
         # Windows: run.bat ran the installer and exported paths via tmp-run-env.out
         # MLC_GEEKBENCH_BIN_WITH_PATH is set from tmp-run-env.out
         geekbench_bin = env.get('MLC_GEEKBENCH_BIN_WITH_PATH', '')
-        install_dir = env.get('MLC_GEEKBENCH_WINDOWS_INSTALL_DIR', '')
+        install_dir = env.get('MLC_GEEKBENCH_INSTALLED_PATH', '')
 
         if geekbench_bin == '' or not os.path.isfile(geekbench_bin):
             # Fallback: try to find in the install dir
             if install_dir and os.path.isdir(install_dir):
                 for f in os.listdir(install_dir):
-                    if f.lower().startswith('geekbench6') and f.lower().endswith('.exe'):
+                    if f.lower().startswith(f'geekbench{env["MLC_GEEKBENCH_VERSION_MAJOR"]}') and f.lower().endswith('.exe'):
                         geekbench_bin = os.path.join(install_dir, f)
                         break
 
@@ -103,24 +107,23 @@ def postprocess(i):
 
     else:
         # Linux / macOS: extracted archive
-        extracted_path = env.get('MLC_GEEKBENCH_EXTRACTED_PATH', '')
-        if extracted_path == '':
+        geekbench_dir = env.get('MLC_GEEKBENCH_INSTALLED_PATH', env.get('MLC_GEEKBENCH_EXTRACTED_PATH', ''))
+        if geekbench_dir == '' and env.get('MLC_GEEKBENCH_INSTALLED_PATH', '') == '':
             return {'return': 1,
                     'error': 'MLC_GEEKBENCH_EXTRACTED_PATH not set - download-and-extract may have failed'}
 
         # Find the Geekbench directory inside the extracted path
-        geekbench_dir = extracted_path
-        if os.path.isdir(extracted_path):
-            for d in sorted(os.listdir(extracted_path)):
-                full = os.path.join(extracted_path, d)
+        if os.path.isdir(geekbench_dir):
+            for d in sorted(os.listdir(geekbench_dir)):
+                full = os.path.join(geekbench_dir, d)
                 if os.path.isdir(full) and d.lower().startswith('geekbench'):
                     geekbench_dir = full
                     break
 
         if os_info['platform'] == 'darwin':
             # macOS: binary is inside the .app bundle
             # e.g. Geekbench 6.app/Contents/MacOS/Geekbench 6
-            app_pattern = os.path.join(extracted_path, 'Geekbench*.app')
+            app_pattern = os.path.join(geekbench_dir, 'Geekbench*.app')
             app_matches = glob.glob(app_pattern)
             if app_matches:
                 app_dir = app_matches[0]
@@ -147,6 +150,9 @@ def postprocess(i):
         if os.path.isfile(geekbench_bin):
             os.chmod(geekbench_bin, 0o755)
 
+    if not os.path.exists(geekbench_dir):
+        return {'return': 1, 'error': f'{geekbench_dir} is not existing'}
+
     env['MLC_GEEKBENCH_BIN_WITH_PATH'] = geekbench_bin
     env['MLC_GEEKBENCH_INSTALLED_PATH'] = geekbench_dir
     env['MLC_GEEKBENCH_VERSION'] = need_version

script/get-geekbench/meta.yaml

@@ -21,6 +21,9 @@ prehook_deps:
 - enable_if_env:
     MLC_GEEKBENCH_NEED_EXTRACT:
     - 'yes'
+  skip_if_env:
+    MLC_GEEKBENCH_INSTALLED_PATH:
+      - on
   env:
     MLC_DAE_EXTRACT_DOWNLOADED: 'yes'
     MLC_DOWNLOAD_FINAL_ENV_NAME: MLC_GEEKBENCH_DOWNLOAD_PATH
@@ -37,6 +40,9 @@ prehook_deps:
 - enable_if_env:
     MLC_GEEKBENCH_NEED_EXTRACT:
     - 'no'
+  skip_if_env:
+    MLC_GEEKBENCH_INSTALLED_PATH:
+      - on
   env:
     MLC_DOWNLOAD_FINAL_ENV_NAME: MLC_GEEKBENCH_DOWNLOAD_PATH
   extra_cache_tags: geekbench
@@ -65,3 +71,8 @@ versions:
   6.6.0:
     env:
       MLC_GEEKBENCH_VERSION_MAJOR: '6'
+variations:
+  path.#:
+    env:
+      MLC_GEEKBENCH_INSTALLED_PATH: '#'
+    default_version: ''

script/get-geekbench/run.sh

@@ -4,4 +4,3 @@
 # Download and extraction is handled by the download-and-extract prehook dependency.
 # Path setup is handled in postprocess() of customize.py.
 
-echo "Geekbench download and extraction completed via download-and-extract dependency."