-
-
Couldn't load subscription status.
- Fork 50
Fix CMake metadata for CUDA-enabled libtorch #339
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
Changes from all commits
b6808c2
f52e86c
c2b6ce4
8622491
093816a
847f7b1
9a36bd4
32527dc
2a0827b
1ee54fb
f35c9aa
0d86709
fc3fa85
03cb0fe
9d80394
e2c551d
0de45db
94c000b
e284ed0
1c23e13
138456c
bdb9df5
44782b3
5ee95f4
162a7eb
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -176,11 +176,9 @@ elif [[ ${cuda_compiler_version} != "None" ]]; then | |
| # all of them. | ||
| export CUDAToolkit_BIN_DIR=${BUILD_PREFIX}/bin | ||
| export CUDAToolkit_ROOT_DIR=${PREFIX} | ||
| if [[ "${target_platform}" != "${build_platform}" ]]; then | ||
| export CUDA_TOOLKIT_ROOT=${PREFIX} | ||
| fi | ||
| # for CUPTI | ||
| export CUDA_TOOLKIT_ROOT_DIR=${PREFIX} | ||
| export CUDAToolkit_ROOT=${PREFIX} | ||
| case ${target_platform} in | ||
| linux-64) | ||
| export CUDAToolkit_TARGET_DIR=${PREFIX}/targets/x86_64-linux | ||
|
|
@@ -221,6 +219,8 @@ elif [[ ${cuda_compiler_version} != "None" ]]; then | |
| export USE_STATIC_CUDNN=0 | ||
| export MAGMA_HOME="${PREFIX}" | ||
| export USE_MAGMA=1 | ||
| # turn off noisy nvcc warnings | ||
| export CUDAFLAGS="-w --ptxas-options=-w" | ||
|
Comment on lines
+222
to
+223
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. @conda-forge/cuda, we get 10'000s of line of ptxas advice à la This is really something that (if at all) pytorch should take care off, and we shouldn't spam the logs here, making them harder to navigate and longer to download. However, I haven't had success in turning this off despite already passing There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. How about There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Sure, I can try. I went with the first (more canonical-looking) option from the docs, but AFAICT they should be equivalent? I was also wondering if perhaps for some reason There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Raised an issue: conda-forge/cuda-nvcc-feedstock#60 |
||
| else | ||
| if [[ "$target_platform" != *-64 ]]; then | ||
| # Breakpad seems to not work on aarch64 or ppc64le | ||
|
|
||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,7 +1,7 @@ | ||
| From f3a0f9aab6dce56eea590b946f60256014b61bf7 Mon Sep 17 00:00:00 2001 | ||
| From: Mark Harfouche <[email protected]> | ||
| Date: Sun, 1 Sep 2024 17:35:40 -0400 | ||
| Subject: [PATCH 01/19] Force usage of python 3 and error without numpy | ||
| Subject: [PATCH 01/21] Force usage of python 3 and error without numpy | ||
|
|
||
| --- | ||
| cmake/Dependencies.cmake | 6 +++--- | ||
|
|
||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,7 +1,7 @@ | ||
| From 21c30036b5b86f403c0cf4426165d9a6a50edb1a Mon Sep 17 00:00:00 2001 | ||
| From: Mark Harfouche <[email protected]> | ||
| Date: Tue, 1 Oct 2024 00:28:40 -0400 | ||
| Subject: [PATCH 02/19] Help find numpy | ||
| Subject: [PATCH 02/21] Help find numpy | ||
|
|
||
| --- | ||
| tools/setup_helpers/cmake.py | 6 ++++++ | ||
|
|
||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,7 +1,7 @@ | ||
| From d1826af525db41eda5020a1404f5d5521d67a5dc Mon Sep 17 00:00:00 2001 | ||
| From: Jeongseok Lee <[email protected]> | ||
| Date: Sat, 19 Oct 2024 04:26:01 +0000 | ||
| Subject: [PATCH 03/19] Add USE_SYSTEM_NVTX option (#138287) | ||
| Subject: [PATCH 03/21] Add USE_SYSTEM_NVTX option (#138287) | ||
|
|
||
| ## Summary | ||
|
|
||
|
|
||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,7 +1,7 @@ | ||
| From e3219c5fe8834753b0cf9e92be4d1ef1e874f370 Mon Sep 17 00:00:00 2001 | ||
| From: Jeongseok Lee <[email protected]> | ||
| Date: Thu, 17 Oct 2024 15:04:05 -0700 | ||
| Subject: [PATCH 04/19] Update sympy version | ||
| Subject: [PATCH 04/21] Update sympy version | ||
|
|
||
| --- | ||
| setup.py | 2 +- | ||
|
|
||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,7 +1,7 @@ | ||
| From 08a1f44fbc81324aa98d720dfb7b87a261923ac2 Mon Sep 17 00:00:00 2001 | ||
| From: Jeongseok Lee <[email protected]> | ||
| Date: Sun, 3 Nov 2024 01:12:36 -0700 | ||
| Subject: [PATCH 05/19] Fix duplicate linker script | ||
| Subject: [PATCH 05/21] Fix duplicate linker script | ||
|
|
||
| --- | ||
| setup.py | 4 +++- | ||
|
|
||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,7 +1,7 @@ | ||
| From 15df314a41c69a31c0443254d5552aa1b39d708d Mon Sep 17 00:00:00 2001 | ||
| From: William Wen <[email protected]> | ||
| Date: Fri, 13 Sep 2024 13:02:33 -0700 | ||
| Subject: [PATCH 06/19] fix 3.13 pickle error in serialization.py (#136034) | ||
| Subject: [PATCH 06/21] fix 3.13 pickle error in serialization.py (#136034) | ||
|
|
||
| Error encountered when adding dynamo 3.13 support. | ||
| Pull Request resolved: https://github.com/pytorch/pytorch/pull/136034 | ||
|
|
||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,7 +1,7 @@ | ||
| From 655f694854c3eafdd631235b60bc6c1b279218ed Mon Sep 17 00:00:00 2001 | ||
| From: Mark Harfouche <[email protected]> | ||
| Date: Thu, 3 Oct 2024 22:49:56 -0400 | ||
| Subject: [PATCH 07/19] Allow users to overwrite ld with environment variables | ||
| Subject: [PATCH 07/21] Allow users to overwrite ld with environment variables | ||
|
|
||
| This should help in the case of cross compilation. | ||
|
|
||
|
|
||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,7 +1,7 @@ | ||
| From f03bf82d9da9cccb2cf4d4833c1a6349622dc37d Mon Sep 17 00:00:00 2001 | ||
| From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <[email protected]> | ||
| Date: Wed, 27 Nov 2024 13:47:23 +0100 | ||
| Subject: [PATCH 08/19] Allow overriding CUDA-related paths | ||
| Subject: [PATCH 08/21] Allow overriding CUDA-related paths | ||
|
|
||
| --- | ||
| cmake/Modules/FindCUDAToolkit.cmake | 2 +- | ||
|
|
||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,7 +1,7 @@ | ||
| From 4b1faf6ba142953ce2730766db44f8d98d161ef0 Mon Sep 17 00:00:00 2001 | ||
| From: Haifeng Jin <[email protected]> | ||
| Date: Tue, 1 Oct 2024 07:53:24 +0000 | ||
| Subject: [PATCH 09/19] Fix test/test_linalg.py for NumPy 2 (#136800) | ||
| Subject: [PATCH 09/21] Fix test/test_linalg.py for NumPy 2 (#136800) | ||
|
|
||
| Related to #107302. | ||
|
|
||
|
|
||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,7 +1,7 @@ | ||
| From 032b9be9ca7f9ae174e75554cecc82600ea3ef54 Mon Sep 17 00:00:00 2001 | ||
| From: Haifeng Jin <[email protected]> | ||
| Date: Sat, 12 Oct 2024 02:40:17 +0000 | ||
| Subject: [PATCH 10/19] Fixes NumPy 2 test failures in test_torch.py (#137740) | ||
| Subject: [PATCH 10/21] Fixes NumPy 2 test failures in test_torch.py (#137740) | ||
|
|
||
| Related to #107302 | ||
|
|
||
|
|
||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,7 +1,7 @@ | ||
| From 56f1528fa072023fb2724d5abf8790f2f6cc3aaa Mon Sep 17 00:00:00 2001 | ||
| From: Isuru Fernando <[email protected]> | ||
| Date: Wed, 18 Dec 2024 03:59:00 +0000 | ||
| Subject: [PATCH 11/19] Use BLAS_USE_CBLAS_DOT for OpenBLAS builds | ||
| Subject: [PATCH 11/21] Use BLAS_USE_CBLAS_DOT for OpenBLAS builds | ||
|
|
||
| There are two calling conventions for *dotu functions | ||
|
|
||
|
|
||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,7 +1,7 @@ | ||
| From beba58d724cc1bd7ca73660b0a5ad9e61ae0c562 Mon Sep 17 00:00:00 2001 | ||
| From: "Zheng, Zhaoqiong" <[email protected]> | ||
| Date: Fri, 27 Dec 2024 13:49:36 +0800 | ||
| Subject: [PATCH 12/19] fix issue 142484 | ||
| Subject: [PATCH 12/21] fix issue 142484 | ||
|
|
||
| From https://github.com/pytorch/pytorch/pull/143894 | ||
| --- | ||
|
|
||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,7 +1,7 @@ | ||
| From 816a248a4425a97350959e412666e6db9012a52e Mon Sep 17 00:00:00 2001 | ||
| From: Bas Zalmstra <[email protected]> | ||
| Date: Thu, 16 May 2024 10:46:49 +0200 | ||
| Subject: [PATCH 13/19] Fix FindOpenBLAS | ||
| Subject: [PATCH 13/21] Fix FindOpenBLAS | ||
|
|
||
| --- | ||
| cmake/Modules/FindOpenBLAS.cmake | 15 +++++++++------ | ||
|
|
||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,7 +1,7 @@ | ||
| From db896f927403f55a18f931b18a6469cb4e37d322 Mon Sep 17 00:00:00 2001 | ||
| From: atalman <[email protected]> | ||
| Date: Tue, 12 Nov 2024 12:28:10 +0000 | ||
| Subject: [PATCH 14/19] CD Enable Python 3.13 on windows (#138095) | ||
| Subject: [PATCH 14/21] CD Enable Python 3.13 on windows (#138095) | ||
|
|
||
| Adding CD windows. Part of: https://github.com/pytorch/pytorch/issues/130249 | ||
| Builder PR landed with smoke test: https://github.com/pytorch/builder/pull/2035 | ||
|
|
||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,7 +1,7 @@ | ||
| From 33790dfbf966e7d8ea4ff6798d2ff92474d84079 Mon Sep 17 00:00:00 2001 | ||
| From: "H. Vetinari" <[email protected]> | ||
| Date: Thu, 23 Jan 2025 22:46:58 +1100 | ||
| Subject: [PATCH 15/19] simplify torch.utils.cpp_extension.include_paths; use | ||
| Subject: [PATCH 15/21] simplify torch.utils.cpp_extension.include_paths; use | ||
| it in cpp_builder | ||
|
|
||
| The /TH headers have not existed since pytorch 1.11 | ||
|
|
||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,7 +1,7 @@ | ||
| From 799f6fa59dac93dabbbcf72d46f4e1334e3d65d9 Mon Sep 17 00:00:00 2001 | ||
| From: "H. Vetinari" <[email protected]> | ||
| Date: Thu, 23 Jan 2025 22:58:14 +1100 | ||
| Subject: [PATCH 16/19] point include paths to $PREFIX/include | ||
| Subject: [PATCH 16/21] point include paths to $PREFIX/include | ||
|
|
||
| --- | ||
| torch/utils/cpp_extension.py | 9 +++++++++ | ||
|
|
||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,7 +1,7 @@ | ||
| From 9f73a02bacf9680833ac64657fde6762d33ab200 Mon Sep 17 00:00:00 2001 | ||
| From: Daniel Petry <[email protected]> | ||
| Date: Tue, 21 Jan 2025 17:45:23 -0600 | ||
| Subject: [PATCH 17/19] Add conda prefix to inductor include paths | ||
| Subject: [PATCH 17/21] Add conda prefix to inductor include paths | ||
|
|
||
| Currently inductor doesn't look in conda's includes and libs. This results in | ||
| errors when it tries to compile, if system versions are being used of | ||
|
|
||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,7 +1,7 @@ | ||
| From b0cfa0f728e96a3a9d6f7434e2c02d74d6daa9a9 Mon Sep 17 00:00:00 2001 | ||
| From: "H. Vetinari" <[email protected]> | ||
| Date: Tue, 28 Jan 2025 14:15:34 +1100 | ||
| Subject: [PATCH 18/19] make ATEN_INCLUDE_DIR relative to TORCH_INSTALL_PREFIX | ||
| Subject: [PATCH 18/21] make ATEN_INCLUDE_DIR relative to TORCH_INSTALL_PREFIX | ||
|
|
||
| we cannot set CMAKE_INSTALL_PREFIX without the pytorch build complaining, but we can | ||
| use TORCH_INSTALL_PREFIX, which is set correctly relative to our CMake files already: | ||
|
|
||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,7 +1,7 @@ | ||
| From f7db4cbfb0af59027ed8bdcd0387dba6fbcb1192 Mon Sep 17 00:00:00 2001 | ||
| From: "H. Vetinari" <[email protected]> | ||
| Date: Tue, 28 Jan 2025 10:58:29 +1100 | ||
| Subject: [PATCH 19/19] remove `DESTINATION lib` from CMake `install(TARGETS` | ||
| Subject: [PATCH 19/21] remove `DESTINATION lib` from CMake `install(TARGETS` | ||
| directives | ||
|
|
||
| Suggested-By: Silvio Traversaro <[email protected]> | ||
|
|
||
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think it works. The new flags are passed in "libtorch" build, and according to
diffthat's the only change in CUDA invocations. I'll know for sure when libtorch recompiles and it starts building pytorch.