Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixup third_party references #6

Merged
merged 3 commits into from
May 28, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 18 additions & 18 deletions .azure-pipelines/azure-pipelines-linux.yml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ target_platform:
- linux-64
zip_keys:
- - cxx_compiler_version
- cuda_compiler
- cuda_compiler_version
- cdt_name
- docker_image
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ target_platform:
- linux-64
zip_keys:
- - cxx_compiler_version
- cuda_compiler
- cuda_compiler_version
- cdt_name
- docker_image
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ target_platform:
- linux-64
zip_keys:
- - cxx_compiler_version
- cuda_compiler
- cuda_compiler_version
- cdt_name
- docker_image
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ target_platform:
- linux-64
zip_keys:
- - cxx_compiler_version
- cuda_compiler
- cuda_compiler_version
- cdt_name
- docker_image
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ target_platform:
- linux-64
zip_keys:
- - cxx_compiler_version
- cuda_compiler
- cuda_compiler_version
- cdt_name
- docker_image
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ target_platform:
- linux-64
zip_keys:
- - cxx_compiler_version
- cuda_compiler
- cuda_compiler_version
- cdt_name
- docker_image
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ target_platform:
- linux-64
zip_keys:
- - cxx_compiler_version
- cuda_compiler
- cuda_compiler_version
- cdt_name
- docker_image
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ target_platform:
- linux-64
zip_keys:
- - cxx_compiler_version
- cuda_compiler
- cuda_compiler_version
- cdt_name
- docker_image
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ target_platform:
- linux-64
zip_keys:
- - cxx_compiler_version
- cuda_compiler
- cuda_compiler_version
- cdt_name
- docker_image
36 changes: 18 additions & 18 deletions README.md

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

14 changes: 9 additions & 5 deletions recipe/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,17 @@ source:
url: https://github.com/openai/triton/archive/refs/tags/v{{ version }}.tar.gz
sha256: 19b6de0d0bcce86e973258d112169cd321b677146808bcc5fed7f69046775cfd
patches:
- patches/0001-do-not-package-cuda.patch
- patches/0002-fix-llvm.patch
- patches/0001-do-not-package-third_party-folder.patch
- patches/0002-Fix-error-that-FileCheck-is-already-defined.patch
- patches/0003-properly-point-to-triton-includes.patch
- patches/0004-unvendor-packages.patch
- patches/0005-fix-tablegen.patch
- patches/0004-Avoid-using-outdated-FindLLVM.patch
- patches/0005-Unvendor-third-party-libs.patch
- patches/0006-Avoid-pip-check-error-as-cmake-is-not-a-python-modul.patch
- patches/0007-Fix-TableGen-issues.patch
- patches/0008-Search-for-libs-in-CONDA_PREFIX-instead-of-third_par.patch

build:
number: 0
number: 1
# TODO: windows support should be available from next version;
# CPU-only support still under development
skip: true # [win or cuda_compiler_version == "None" or cuda_compiler_version == "10.2"]
Expand All @@ -41,6 +44,7 @@ requirements:
- filelock
- pytorch =*=cuda*
- lit
- cudatoolkit
h-vetinari marked this conversation as resolved.
Show resolved Hide resolved

test:
imports:
Expand Down
13 changes: 0 additions & 13 deletions recipe/patches/0001-do-not-package-cuda.patch

This file was deleted.

24 changes: 24 additions & 0 deletions recipe/patches/0001-do-not-package-third_party-folder.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
From 8068a28350a65c738279a6a27052513087e69619 Mon Sep 17 00:00:00 2001
From: Tobias Fischer <[email protected]>
Date: Wed, 5 Apr 2023 11:57:44 +1000
Subject: [PATCH 1/8] do not package third_party folder

---
python/setup.py | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/python/setup.py b/python/setup.py
index 2ac3accd2..4aac07c71 100644
--- a/python/setup.py
+++ b/python/setup.py
@@ -216,8 +216,8 @@ setup(
"torch",
"lit",
],
- package_data={"triton": ["third_party/**/*"]},
- include_package_data=True,
+# package_data={"triton": ["third_party/**/*"]},
+# include_package_data=True,
ext_modules=[CMakeExtension("triton", "triton/_C/")],
cmdclass={"build_ext": CMakeBuild},
zip_safe=False,
Original file line number Diff line number Diff line change
@@ -1,3 +1,12 @@
From 5dd75f7a49550ca5c461e1ab1c55d9a1ccda997d Mon Sep 17 00:00:00 2001
From: Tobias Fischer <[email protected]>
Date: Sun, 7 May 2023 14:49:23 +1000
Subject: [PATCH 2/8] Fix error that FileCheck is already defined

---
bin/CMakeLists.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bin/CMakeLists.txt b/bin/CMakeLists.txt
index 906f635f8..c6b419782 100644
--- a/bin/CMakeLists.txt
Expand Down
13 changes: 11 additions & 2 deletions recipe/patches/0003-properly-point-to-triton-includes.patch
Original file line number Diff line number Diff line change
@@ -1,8 +1,17 @@
From 206c8923442f6525e419395f9ea82df347f8cf04 Mon Sep 17 00:00:00 2001
From: "H. Vetinari" <[email protected]>
Date: Fri, 25 Feb 2022 14:59:48 +1100
Subject: [PATCH 3/8] properly point to triton includes

---
CMakeLists.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1e79e9cbf..677e050e0 100644
index d0d361fc7..378a1150c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -143,7 +143,7 @@
@@ -143,7 +143,7 @@ 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)
Expand Down
26 changes: 26 additions & 0 deletions recipe/patches/0004-Avoid-using-outdated-FindLLVM.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
From b0576d2a496e23d85d41d8b0bc9ace864bbef352 Mon Sep 17 00:00:00 2001
From: Tobias Fischer <[email protected]>
Date: Sun, 7 May 2023 14:52:07 +1000
Subject: [PATCH 4/8] Avoid using outdated FindLLVM

---
CMakeLists.txt | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 378a1150c..f04786bfa 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -7,9 +7,9 @@ set(CMAKE_INCLUDE_CURRENT_DIR ON)

project(triton)
include(CTest)
-if(NOT WIN32)
- list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
-endif()
+# if(NOT WIN32)
+# list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
+# endif()

# Options
option(TRITON_BUILD_TUTORIALS "Build C++ Triton tutorials" ON)
Loading