From 9ed15823bcaa8ad31959f9c260071b2d411c5ad6 Mon Sep 17 00:00:00 2001 From: Olli Lupton Date: Fri, 14 Jun 2024 10:41:28 +0200 Subject: [PATCH] Fix Triton build again (#899) AMD headers are included unconditionally; the simplest approach is to make sure they exist. --- .github/container/Dockerfile.triton | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/container/Dockerfile.triton b/.github/container/Dockerfile.triton index 6916650fb..11536594a 100644 --- a/.github/container/Dockerfile.triton +++ b/.github/container/Dockerfile.triton @@ -61,9 +61,9 @@ sed -i -e 's|-Werror||g' CMakeLists.txt sed -i -e 's|\(LLVMAMDGPU.*\)|# \1|g' CMakeLists.txt # Do not build tests sed -i -e 's|^\s*add_subdirectory(unittest)|# unit tests disabled|' CMakeLists.txt -# Do not build the AMD GPU backend -sed -i -e 's|BackendInstaller.copy(\["nvidia", "amd"\])|BackendInstaller.copy(["nvidia"])|g' python/setup.py # Google has patches that mess with include paths in source files +sed -i -e '/include_directories(${PROJECT_SOURCE_DIR}\/third_party)/a include_directories(${PROJECT_SOURCE_DIR}/third_party/amd/include)' CMakeLists.txt +sed -i -e '/include_directories(${PROJECT_BINARY_DIR}\/third_party)/a include_directories(${PROJECT_BINARY_DIR}/third_party/amd/include)' CMakeLists.txt sed -i -e '/include_directories(${PROJECT_SOURCE_DIR}\/third_party)/a include_directories(${PROJECT_SOURCE_DIR}/third_party/nvidia/include)' CMakeLists.txt sed -i -e '/include_directories(${PROJECT_BINARY_DIR}\/third_party)/a include_directories(${PROJECT_BINARY_DIR}/third_party/nvidia/include)' CMakeLists.txt # Extra patches to Triton maintained in XLA. These are already applied in the working directory.