Clean up get-llvm

cm-mlops/script/get-gcc/customize.py

@@ -10,8 +10,7 @@ def preprocess(i):
     recursion_spaces = i['recursion_spaces']
 
     file_name_c = 'gcc.exe' if os_info['platform'] == 'windows' else 'gcc'
-    file_name_cpp = 'g++.exe' if os_info['platform'] == 'windows' else 'g++'
-    if 'CM_GCC_INSTALLED_PATH' not in env:
+    if 'CM_GCC_BIN_WITH_PATH' not in env:
         r = i['automation'].find_artifact({'file_name': file_name_c,
                                        'env': env,
                                        'os_info':os_info,

cm-mlops/script/get-llvm/customize.py

@@ -10,10 +10,8 @@ def preprocess(i):
     recursion_spaces = i['recursion_spaces']
 
     file_name_c = 'clang.exe' if os_info['platform'] == 'windows' else 'clang'
-    file_name_cpp = 'clang++.exe' if os_info['platform'] == 'windows' else 'clang++'
     env['FILE_NAME_C'] = file_name_c
-    env['FILE_NAME_CPP'] = file_name_cpp
-    if 'CM_LLVM_INSTALLED_PATH' not in env:
+    if 'CM_LLVM_CLANG_BIN_WITH_PATH' not in env:
 
         r = i['automation'].find_artifact({'file_name': file_name_c,
                                        'env': env,
@@ -30,8 +28,6 @@ def preprocess(i):
             else:
                 return r
 
-        env['CM_LLVM_INSTALLED_PATH'] =  r['found_path']
-
     return {'return':0}
 
 def detect_version(i):
@@ -53,21 +49,24 @@ def postprocess(i):
     env = i['env']
     r = detect_version(i)
     if r['return'] >0: return r
+
     version = env['CM_LLVM_CLANG_VERSION']
     env['CM_LLVM_CLANG_CACHE_TAGS'] = 'version-'+version
     env['CM_COMPILER_CACHE_TAGS'] = 'version-'+version+',family-llvm'
     env['CM_COMPILER_FAMILY'] = 'LLVM'
     env['CM_COMPILER_VERSION'] = env['CM_LLVM_CLANG_VERSION']
 
-    file_name_c = env['FILE_NAME_C']
-    file_name_cpp = env['FILE_NAME_CPP']
-    found_path = env['CM_LLVM_INSTALLED_PATH']
+    found_file_path = env['CM_LLVM_CLANG_BIN_WITH_PATH']
+
+    found_path = os.path.dirname(found_file_path)
+    file_name_c = os.path.basename(found_file_path)
+    file_name_cpp = file_name_c.replace("clang", "clang++")
+
     env['CM_LLVM_CLANG_BIN']=file_name_c
-    env['CM_LLVM_CLANG_BIN_WITH_PATH']=os.path.join(found_path, file_name_c)
 
     # General compiler for general program compilation
     env['CM_C_COMPILER_BIN']=file_name_c
-    env['CM_C_COMPILER_WITH_PATH']=os.path.join(found_path, file_name_c)
+    env['CM_C_COMPILER_WITH_PATH']=found_file_path
 
     env['CM_CXX_COMPILER_BIN']=file_name_cpp
     env['CM_CXX_COMPILER_WITH_PATH']=os.path.join(found_path, file_name_cpp)

cm-mlops/script/get-llvm/run.sh

@@ -1,5 +1,4 @@
 #!/bin/bash
-clang_bin=${CM_LLVM_INSTALLED_PATH}/${FILE_NAME_C}
-clang_bin=${CM_LLVM_CLANG_BIN_WITH_PATH:-$clang_bin}
+clang_bin=${CM_LLVM_CLANG_BIN_WITH_PATH}
 ${clang_bin} --version > tmp-ver.out
 test $? -eq 0 || exit 1

cm-mlops/script/get-python3/customize.py

@@ -9,7 +9,7 @@ def preprocess(i):
 
     recursion_spaces = i['recursion_spaces']
 
-    if env.get('CM_PYTHON_INSTALLED_PATH','') == '':
+    if 'CM_PYTHON_BIN_WITH_PATH' not in env:
         file_name = 'python.exe' if os_info['platform'] == 'windows' else 'python3'
 
         r = i['automation'].find_artifact({'file_name': file_name,
@@ -52,7 +52,6 @@ def postprocess(i):
 
     version = r['version']
 
-    # Depends if we come directly from install, or we use get first and then 
     found_file_path = env['CM_PYTHON_BIN_WITH_PATH']
 
     found_path = os.path.dirname(found_file_path)

cm-mlops/script/install-llvm-prebuilt/customize.py

@@ -12,6 +12,7 @@ def preprocess(i):
     recursion_spaces = i['recursion_spaces']
 
     need_version = env.get('CM_VERSION','')
+    clang_file_name = "clang"
     if need_version == '':
         return {'return':1, 'error':'internal problem - CM_VERSION is not defined in env'}
 
@@ -28,6 +29,7 @@ def preprocess(i):
 
     elif os_info['platform'] == 'windows':
         package_name = 'LLVM-' + need_version + '-win' + host_os_bits + '.exe'
+        clang_file_name = "clang.exe"
 
         print('')
         print('WARNING: Please copy the following path and then paste it')
@@ -108,6 +110,7 @@ def preprocess(i):
     env['CM_LLVM_PACKAGE'] = filename
 
     env['CM_LLVM_INSTALLED_PATH'] = os.path.join(os.getcwd(), 'bin')
+    env['CM_LLVM_CLANG_BIN_WITH_PATH'] = os.path.join(os.getcwd(), 'bin', clang_file_name)
     env['CM_TMP_GET_DEPENDENT_CACHED_PATH'] = os.getcwd()
 
     return {'return':0}

cm-mlops/script/install-llvm-src/_cm.json

@@ -17,7 +17,10 @@
   "cache": true,
   "post_deps": [
     {
-      "tags": "get,llvm"
+      "tags": "get,llvm",
+      "skip_if_env": {
+        "CM_TMP_REQUIRE_INSTALL": [ "yes" ]
+      }
     }
   ],
   "tags": [

cm-mlops/script/install-llvm-src/customize.py

@@ -19,10 +19,11 @@ def preprocess(i):
         return {'return':1, 'error':'internal problem - CM_VERSION is not defined in env'}
 
     print (recursion_spaces + '    # Requested version: {}'.format(need_version))
-
+    clang_file_name = "clang"
     env['CM_GIT_CHECKOUT'] = 'llvmorg-' + need_version
 
     env['CM_LLVM_INSTALLED_PATH'] = os.path.join(os.getcwd(), 'install', 'bin')
-    env['CM_TMP_FAIL_IF_NOT_FOUND'] = 'yes'
+    env['CM_LLVM_CLANG_BIN_WITH_PATH'] = os.path.join(os.getcwd(), 'bin', clang_file_name)
+    env['CM_TMP_GET_DEPENDENT_CACHED_PATH'] = os.getcwd()
 
     return {'return':0}