From 303790da88a41d343fefd92c5568770d63170ee9 Mon Sep 17 00:00:00 2001 From: Ian Bearman Date: Tue, 8 Nov 2022 09:44:19 -0800 Subject: [PATCH] [BUILD] use Python Var In Tests (#859) --- CMakeLists.txt | 8 +++++--- test/Target/tritongpu_to_llvmir.mlir | 2 +- test/Target/tritongpu_to_ptx.mlir | 2 +- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index b02044001..582361b6c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -15,6 +15,10 @@ endif() option(TRITON_BUILD_TUTORIALS "Build C++ Triton tutorials" ON) option(TRITON_BUILD_PYTHON_MODULE "Build Python Triton bindings" OFF) +# Ensure Python3 vars are set correctly +# used conditionally in this file and by lit tests +find_package(Python3 REQUIRED COMPONENTS Development Interpreter) + # Default build type if(NOT CMAKE_BUILD_TYPE) message(STATUS "Default build type: Release") @@ -133,24 +137,22 @@ endif() if(TRITON_BUILD_PYTHON_MODULE) message(STATUS "Adding Python module") set(PYTHON_SRC_PATH ${CMAKE_CURRENT_SOURCE_DIR}/python/src) + set(PYTHON_SRC ${PYTHON_SRC_PATH}/main.cc ${PYTHON_SRC_PATH}/triton.cc) include_directories("." ${PYTHON_SRC_PATH}) if (PYTHON_INCLUDE_DIRS) include_directories(${PYTHON_INCLUDE_DIRS}) else() - find_package(Python3 REQUIRED COMPONENTS Development) include_directories(${Python3_INCLUDE_DIRS}) link_directories(${Python3_LIBRARY_DIRS}) link_libraries(${Python3_LIBRARIES}) add_link_options(${Python3_LINK_OPTIONS}) endif() - set(PYTHON_SRC ${PYTHON_SRC_PATH}/main.cc ${PYTHON_SRC_PATH}/triton.cc) endif() # # Triton # file(GLOB_RECURSE LIBTRITON_SRC lib/*.cc) # if (WIN32 AND TRITON_BUILD_PYTHON_MODULE) -# find_package(Python3 REQUIRED COMPONENTS Development) # Python3_add_library(triton SHARED ${LIBTRITON_SRC} ${PYTHON_SRC}) # set_target_properties(triton PROPERTIES SUFFIX ".pyd") # set_target_properties(triton PROPERTIES PREFIX "lib") diff --git a/test/Target/tritongpu_to_llvmir.mlir b/test/Target/tritongpu_to_llvmir.mlir index 7e203b1f9..b852a1ad6 100644 --- a/test/Target/tritongpu_to_llvmir.mlir +++ b/test/Target/tritongpu_to_llvmir.mlir @@ -1,4 +1,4 @@ -// RUN: python3 -m triton.tools.aot %s --target=llvm-ir | FileCheck %s +// RUN: %PYTHON -m triton.tools.aot %s --target=llvm-ir | FileCheck %s // == LLVM IR check begin == // CHECK-LABEL: ; ModuleID = 'LLVMDialectModule' diff --git a/test/Target/tritongpu_to_ptx.mlir b/test/Target/tritongpu_to_ptx.mlir index c652e1b08..404e970a2 100644 --- a/test/Target/tritongpu_to_ptx.mlir +++ b/test/Target/tritongpu_to_ptx.mlir @@ -1,4 +1,4 @@ -// RUN: python3 -m triton.tools.aot %s --target=ptx --sm=80 --ptx-version=63 | FileCheck %s +// RUN: %PYTHON -m triton.tools.aot %s --target=ptx --sm=80 --ptx-version=63 | FileCheck %s // CHECK-LABEL: // Generated by LLVM NVPTX Back-End // CHECK: .version 6.3 // CHECK: .target sm_80