address review comments

Signed-off-by: Whitney Tsang <[email protected]>

Author: whitneywhtsang

.github/workflows/build-test-reusable.yml

@@ -124,7 +124,6 @@ jobs:
           build_llvm: ${{ inputs.build_llvm }}
           use_spirv_backend: ${{ inputs.use_spirv_backend }}
           command: >
-            source ./scripts/capture-hw-details.sh &&
             DEBUG=1
             python -m build --wheel --no-isolation && pip install dist/*.whl
 

setup.py

@@ -481,6 +481,15 @@ def build_extension(self, ext):
             cmake_args.append("-DLLVM_EXTERNAL_LIT=" + lit_dir)
         cmake_args.extend(thirdparty_cmake_args)
 
+        result = subprocess.run(["bash", "./scripts/capture-hw-details.sh"], stdout=subprocess.PIPE,
+                                stderr=subprocess.PIPE, check=True, text=True, env=os.environ.copy())
+        agama_version = None
+        for line in result.stdout.splitlines():
+            if line.startswith("AGAMA_VERSION="):
+                agama_version = line.split("=", 1)[1].strip()
+                break
+        cmake_args.append(f"-DAGAMA_VERSION={agama_version}")
+
         # configuration
         cfg = get_build_type()
         build_args = ["--config", cfg]

third_party/intel/cmake/FindSPIRVToLLVMTranslator.cmake

@@ -27,7 +27,7 @@ if (NOT SPIRVToLLVMTranslator_FOUND)
             FetchContent_MakeAvailable(spirv-llvm-translator)
 
             # FIXME: Don't apply patch when LTS driver is updated.
-            if(DEFINED ENV{AGAMA_VERSION} AND "$ENV{AGAMA_VERSION}" STREQUAL "1146")
+            if(DEFINED AGAMA_VERSION AND AGAMA_VERSION STREQUAL "1146")
                 execute_process(
                     COMMAND git apply --check ${CMAKE_CURRENT_LIST_DIR}/3122.patch
                     WORKING_DIRECTORY ${spirv-llvm-translator_SOURCE_DIR}