Fixes oneapi detect

Author: amd-arsuresh

script/get-aocc/customize.py

@@ -72,7 +72,8 @@ def postprocess(i):
 
     found_path = os.path.dirname(found_file_path)
 
-    env['MLC_AOCC_INSTALLED_PATH'] = found_path
+    env['MLC_AOCC_BIN_PATH'] = found_path
+    env['MLC_AOCC_INSTALLED_PATH'] = os.path.dirname(found_path)
 
     file_name_c = os.path.basename(found_file_path)
     file_name_cpp = file_name_c.replace('clang', 'clang++')

script/get-aocc/meta.yaml

@@ -35,7 +35,7 @@ new_env_keys:
 - + LDFLAGS
 - +MLC_HOST_OS_DEFAULT_INCLUDE_PATH
 - +PATH
-post_depsq:
+post_deps_off:
 - tags: get,compiler-flags
 sort: 500
 tags:

script/get-one-api/customize.py

@@ -1,5 +1,6 @@
 from mlc import utils
 import os
+from utils import *
 
 
 def preprocess(i):
@@ -9,12 +10,12 @@ def preprocess(i):
     env = i['env']
 
     recursion_spaces = i['recursion_spaces']
-    file_name_c = 'oneapi.exe' if os_info['platform'] == 'windows' else 'oneapi-cli'
+    file_name_c = 'icx.exe' if os_info['platform'] == 'windows' else 'icx'
 
-    if 'MLC_ONEAPI_BIN_WITH_PATH' not in env:
+    if 'MLC_ICX_BIN_WITH_PATH' not in env:
         if env.get('MLC_ONEAPI_DIR_PATH', '') != '':
             oneapi_path = env['MLC_ONEAPI_DIR_PATH']
-            if os.path.exists(os.path.join(oneapi_path, 'bin', 'oneapi-cli')):
+            if os.path.exists(os.path.join(oneapi_path, 'bin', 'icx')):
                 env['MLC_TMP_PATH'] = os.path.join(oneapi_path, 'bin')
 
     if 'MLC_ONEAPI_BIN_WITH_PATH' not in env:
@@ -23,7 +24,7 @@ def preprocess(i):
                                            'os_info': os_info,
                                            'default_path_env_key': 'PATH',
                                            'detect_version': True,
-                                           'env_path_key': 'MLC_ONEAPI_BIN_WITH_PATH',
+                                           'env_path_key': 'MLC_ICX_BIN_WITH_PATH',
                                            'run_script_input': i['run_script_input'],
                                            'recursion_spaces': recursion_spaces})
         if r['return'] > 0:
@@ -46,8 +47,8 @@ def preprocess(i):
 
 
 def detect_version(i):
-    r = i['automation'].parse_version({'match_text': r'^.*$',
-                                       'group_number': 0,
+    r = i['automation'].parse_version({'match_text': r'oneAPI\s+.*\(([\d.]+)\)',
+                                       'group_number': 1,
                                        'env_key': 'MLC_ONEAPI_VERSION',
                                        'which_env': i['env']})
     if r['return'] > 0:
@@ -70,14 +71,14 @@ def postprocess(i):
     env['MLC_COMPILER_FAMILY'] = 'ONEAPI'
     version = r['version']
     env['MLC_COMPILER_VERSION'] = env['MLC_ONEAPI_VERSION']
-    env['MLC_GCC_CACHE_TAGS'] = 'version-' + version
+    env['MLC_ONEAPI_CACHE_TAGS'] = 'version-' + version
     env['MLC_COMPILER_CACHE_TAGS'] = 'version-' + version + ',family-oneapi'
 
-    found_file_path = env['MLC_ONEAPI_BIN_WITH_PATH']
+    found_file_path = env['MLC_ICX_BIN_WITH_PATH']
 
     found_path = os.path.dirname(found_file_path)
 
-    env['MLC_ONEAPI_INSTALLED_PATH'] = found_path
+    env['MLC_ONEAPI_INSTALLED_PATH'] = os.path.dirname(found_path)
 
     file_name_c = os.path.basename(found_file_path)
 

script/get-one-api/meta.yaml

@@ -12,7 +12,11 @@ new_env_keys:
 - MLC_ONEAPI_COMPILER_*
 - MLC_COMPILER_*
 - MLC_LINKER_*
-post_deps:
+
+input_mapping:
+  oneapi_dir: MLC_ONEAPI_DIR_PATH
+ 
+post_deps_off:
 - tags: get,compiler-flags
 sort: 500
 tags:
@@ -24,4 +28,4 @@ uid: 1af872e81ef54742
 variations:
   _path.#:
     env:
-      MLC_ONEAPI_DIR_PATH: null
+      MLC_ONEAPI_DIR_PATH: "#"

script/get-one-api/run.sh

@@ -1,8 +1,6 @@
 #!/bin/bash
-oneapi_bin=${MLC_ONEAPI_BIN_WITH_PATH}
-echo "${oneapi_bin} version"
+icx_bin=${MLC_ICX_BIN_WITH_PATH}
+echo "${icx_bin} --version"
 
-${oneapi_bin} version > tmp-ver.out
-test $? -eq 0 || exit 1
-
-cat tmp-ver.out
+${icx_bin} --version > tmp-ver.out
+test $? -eq 0 || exit $?