Merge branch 'main' into amyachev/device

anmyachev · web-flow · commit 182576436e4e · 2024-12-01T14:53:55.000+01:00
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -221,7 +221,6 @@ if(TRITON_BUILD_PYTHON_MODULE)
   set(TRITON_LIBRARIES
     ${triton_libs}
     ${triton_plugins}
-    TritonSPIRV
 
     # mlir
     MLIRAMDGPUDialect
diff --git a/lib/Target/SPIRV/CMakeLists.txt b/lib/Target/SPIRV/CMakeLists.txt
@@ -15,3 +15,6 @@ add_mlir_translation_library(TritonSPIRV
 
 # Add SPIRV-LLVM-Translator include directory.
 target_include_directories(TritonSPIRV PRIVATE ${SPIRVToLLVMTranslator_INCLUDE_DIR})
+
+set_property(GLOBAL APPEND PROPERTY TRITON_LIBS TritonSPIRV)
+llvm_update_compile_flags(TritonSPIRV)
