@@ -49,11 +49,12 @@ else()
4949
5050 # If not downloaded, Fallback: Build from source
5151 if (NOT AITER_PREBUILT_DOWNLOAD_SUCCESS)
52- # Generate aiter_embedded_hsa.h and pass it into AITER compile.py via env vars.
53- # This avoids invasive changes in AITER's JIT build system .
52+ # Generate the embedded HSA header and pass it into AITER compile.py via env vars.
53+ # This avoids needing to set AITER_ASM_DIR (thread-unsafe) .
5454 set (AITER_HSA_DIR "${__AITER_SOURCE_DIR} /hsa" )
5555 set (AITER_EMBEDDED_HSA_INCLUDE_DIR "${CMAKE_CURRENT_BINARY_DIR} /aiter_embedded_hsa" )
5656 set (AITER_EMBEDDED_HSA_HEADER "aiter_embedded_hsa.h" )
57+ set (AITER_EMBEDDED_HSA_HEADER_PATH "${AITER_EMBEDDED_HSA_INCLUDE_DIR} /${AITER_EMBEDDED_HSA_HEADER} " )
5758
5859 set (AITER_EMBEDDED_HSA_SUBDIRS)
5960 foreach (ARCH IN LISTS V3_ASM_ARCHS)
@@ -67,16 +68,14 @@ else()
6768 execute_process (
6869 COMMAND python3 "${CMAKE_CURRENT_LIST_DIR} /generate_aiter_embedded_hsa.py"
6970 --hsa-dir ${AITER_HSA_DIR}
70- --output " ${AITER_EMBEDDED_HSA_INCLUDE_DIR} / ${AITER_EMBEDDED_HSA_HEADER} "
71+ --output ${AITER_EMBEDDED_HSA_HEADER_PATH}
7172 --subdirs ${AITER_EMBEDDED_HSA_SUBDIRS}
7273 RESULT_VARIABLE AITER_MAKE_HSA_RET
7374 )
7475 if (AITER_MAKE_HSA_RET AND NOT AITER_MAKE_HSA_RET EQUAL 0)
75- message (FATAL_ERROR "Failed to generate aiter_embedded_hsa.h " )
76+ message (FATAL_ERROR "Failed to generate ${AITER_EMBEDDED_HSA_HEADER} " )
7677 endif ()
77- list (APPEND AITER_BUILD_ENV_ARGS
78- AITER_EMBEDDED_HSA_HEADER=${AITER_EMBEDDED_HSA_HEADER}
79- AITER_EMBEDDED_HSA_INCLUDE_DIR=${AITER_EMBEDDED_HSA_INCLUDE_DIR} )
78+ list (APPEND AITER_BUILD_ENV_ARGS AITER_EMBEDDED_HSA_HEADER_PATH=${AITER_EMBEDDED_HSA_HEADER_PATH} )
8079 else ()
8180 message (STATUS "[AITER-BUILD] No supported V3 ASM arch selected; skipping embedded HSA generation." )
8281 endif ()
0 commit comments