diff --git a/bin/CMakeLists.txt b/bin/CMakeLists.txt index 78f3d8fe02..0f2c9d52df 100644 --- a/bin/CMakeLists.txt +++ b/bin/CMakeLists.txt @@ -98,6 +98,7 @@ target_link_libraries(triton-llvm-opt PRIVATE ) export_executable_symbols_for_plugins(triton-llvm-opt) + add_llvm_executable(triton-tensor-layout triton-tensor-layout.cpp PARTIAL_SOURCES_INTENDED) target_link_libraries(triton-tensor-layout PRIVATE TritonGPUIR diff --git a/docs/conf.py b/docs/conf.py index 45d6972839..9ef6d72837 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -73,7 +73,7 @@ def setup_generated_mlir_docs(): rst_string = f""" Triton MLIR Dialects and Ops -============================ +===================== .. toctree:: :maxdepth: 1 diff --git a/docs/index.rst b/docs/index.rst index 75463f483c..9dde349dee 100644 --- a/docs/index.rst +++ b/docs/index.rst @@ -61,7 +61,7 @@ Python API Triton MLIR Dialects and Ops ----------------------------- +-------------------- - :doc:`Triton MLIR Dialects and Ops ` diff --git a/include/triton/Conversion/TritonToTritonGPU/Passes.td b/include/triton/Conversion/TritonToTritonGPU/Passes.td index 19a3e72ac8..f20c360409 100644 --- a/include/triton/Conversion/TritonToTritonGPU/Passes.td +++ b/include/triton/Conversion/TritonToTritonGPU/Passes.td @@ -40,5 +40,4 @@ def ConvertTritonToTritonGPU: Pass<"convert-triton-to-tritongpu", "mlir::ModuleO ]; } - #endif diff --git a/third_party/nvidia/CMakeLists.txt b/third_party/nvidia/CMakeLists.txt index 92864208a7..d36a88272c 100644 --- a/third_party/nvidia/CMakeLists.txt +++ b/third_party/nvidia/CMakeLists.txt @@ -2,6 +2,6 @@ include_directories(${CMAKE_CURRENT_SOURCE_DIR}/include) include_directories(${CMAKE_CURRENT_BINARY_DIR}/include) add_subdirectory(include) add_subdirectory(lib) -if(TRITON_BUILD_PYTHON_MODULE AND NOT DEFINED NVIDIA_DIALECTS_ONLY) +if(TRITON_BUILD_PYTHON_MODULE) add_triton_plugin(TritonNVIDIA ${CMAKE_CURRENT_SOURCE_DIR}/triton_nvidia.cc LINK_LIBS TritonNVIDIAGPUToLLVM NVGPUToLLVM) endif() diff --git a/unittest/Conversion/TritonGPUToLLVM/PTXAsmFormatTest.cpp b/unittest/Conversion/TritonGPUToLLVM/PTXAsmFormatTest.cpp index 783bdcb7f2..4fd6cefbd5 100644 --- a/unittest/Conversion/TritonGPUToLLVM/PTXAsmFormatTest.cpp +++ b/unittest/Conversion/TritonGPUToLLVM/PTXAsmFormatTest.cpp @@ -1,4 +1,4 @@ -#include "intel/include/TritonIntelGPUToLLVM/PTXAsmFormat.h" +#include "nvidia/include/TritonNVIDIAGPUToLLVM/PTXAsmFormat.h" #include "mlir/Dialect/Arith/IR/Arith.h" #include "mlir/IR/Builders.h" #include "triton/Dialect/Triton/IR/Dialect.h" @@ -6,8 +6,6 @@ #include -using ::mlir::triton::intel::PTXBuilder; - namespace mlir { namespace triton { class PTXAsmFormatTest : public ::testing::Test {