@@ -51,35 +51,50 @@ if(NOT WIN32) # Linux
5151 endif ()
5252else () # Windows
5353 # AMD64, IA64, ARM64, EM64T, X86
54- set (BATCH_MANAGER_TARGET_ARCH "${CMAKE_SYSTEM_PROCESSOR} -WINDOWS" )
55- string (TOLOWER ${BATCH_MANAGER_TARGET_ARCH} ${BATCH_MANAGER_TARGET_ARCH} )
54+ if (CMAKE_SYSTEM_PROCESSOR MATCHES "AMD64" )
55+ set (BATCH_MANAGER_TARGET_ARCH "x86_64-windows-msvc" )
56+ else ()
57+ message (
58+ FATAL_ERROR
59+ "The system processor type is unsupported: ${CMAKE_SYSTEM_PROCESSOR} " )
60+ endif ()
5661endif ()
5762
5863if (BUILD_BATCH_MANAGER)
5964 add_subdirectory (batch_manager)
6065else ()
6166 add_library (${BATCH_MANAGER_TARGET} STATIC IMPORTED )
62- execute_process (
63- COMMAND ${Python3_EXECUTABLE} "-c"
64- "import torch; print(torch.compiled_with_cxx11_abi(),end='');"
65- RESULT_VARIABLE _PYTHON_SUCCESS
66- OUTPUT_VARIABLE USE_CXX11_ABI)
67-
68- message (STATUS "USE_CXX11_ABI: ${USE_CXX11_ABI} " )
69-
70- if (USE_CXX11_ABI)
71- set_property (
72- TARGET ${BATCH_MANAGER_TARGET}
73- PROPERTY
74- IMPORTED_LOCATION
75- "${CMAKE_CURRENT_SOURCE_DIR} /batch_manager/${BATCH_MANAGER_TARGET_ARCH} /libtensorrt_llm_batch_manager_static.a"
76- )
77- else ()
67+ if (NOT WIN32 ) # Linux
68+ add_library (${BATCH_MANAGER_TARGET} STATIC IMPORTED )
69+ execute_process (
70+ COMMAND ${Python3_EXECUTABLE} "-c"
71+ "import torch; print(torch.compiled_with_cxx11_abi(),end='');"
72+ RESULT_VARIABLE _PYTHON_SUCCESS
73+ OUTPUT_VARIABLE USE_CXX11_ABI)
74+
75+ message (STATUS "USE_CXX11_ABI: ${USE_CXX11_ABI} " )
76+
77+ if (USE_CXX11_ABI)
78+ set_property (
79+ TARGET ${BATCH_MANAGER_TARGET}
80+ PROPERTY
81+ IMPORTED_LOCATION
82+ "${CMAKE_CURRENT_SOURCE_DIR} /batch_manager/${BATCH_MANAGER_TARGET_ARCH} /libtensorrt_llm_batch_manager_static.a"
83+ )
84+ else ()
85+ set_property (
86+ TARGET ${BATCH_MANAGER_TARGET}
87+ PROPERTY
88+ IMPORTED_LOCATION
89+ "${CMAKE_CURRENT_SOURCE_DIR} /batch_manager/${BATCH_MANAGER_TARGET_ARCH} /libtensorrt_llm_batch_manager_static.pre_cxx11.a"
90+ )
91+ endif ()
92+ else () # Windows
7893 set_property (
7994 TARGET ${BATCH_MANAGER_TARGET}
8095 PROPERTY
8196 IMPORTED_LOCATION
82- "${CMAKE_CURRENT_SOURCE_DIR} /batch_manager/${BATCH_MANAGER_TARGET_ARCH} /libtensorrt_llm_batch_manager_static.pre_cxx11.a "
97+ "${CMAKE_CURRENT_SOURCE_DIR} /batch_manager/${BATCH_MANAGER_TARGET_ARCH} /tensorrt_llm_batch_manager_static.lib "
8398 )
8499 endif ()
85100endif ()
0 commit comments