| 1 |
commit: 10670e7e6bcefd2e396297bd4ea36e884af28198 |
| 2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Feb 17 12:26:59 2019 +0000 |
| 4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Feb 17 12:39:00 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=10670e7e |
| 7 |
|
| 8 |
sci-libs/flann: Fix build with CUDA > 9.0 |
| 9 |
|
| 10 |
Supposedly. |
| 11 |
|
| 12 |
Closes: https://bugs.gentoo.org/678030 |
| 13 |
Package-Manager: Portage-2.3.60, Repoman-2.3.12 |
| 14 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
| 15 |
|
| 16 |
sci-libs/flann/files/flann-1.9.1-cuda-9.patch | 22 ++++++++++++++++++++++ |
| 17 |
sci-libs/flann/flann-1.9.1-r2.ebuild | 5 ++++- |
| 18 |
2 files changed, 26 insertions(+), 1 deletion(-) |
| 19 |
|
| 20 |
diff --git a/sci-libs/flann/files/flann-1.9.1-cuda-9.patch b/sci-libs/flann/files/flann-1.9.1-cuda-9.patch |
| 21 |
new file mode 100644 |
| 22 |
index 00000000000..561c379af9a |
| 23 |
--- /dev/null |
| 24 |
+++ b/sci-libs/flann/files/flann-1.9.1-cuda-9.patch |
| 25 |
@@ -0,0 +1,22 @@ |
| 26 |
+From b9dd074526c18e7423085853518b58d602cb0b57 Mon Sep 17 00:00:00 2001 |
| 27 |
+From: "Petr A. Ermolaev" <petr.a.ermolaev@×××××.com> |
| 28 |
+Date: Fri, 4 May 2018 07:50:24 +0000 |
| 29 |
+Subject: [PATCH] fix compilation via gcc and cuda 9.1 add missing #include |
| 30 |
+ <thrust/gather> to kdtree_cuda_3d_index.cu |
| 31 |
+ |
| 32 |
+--- |
| 33 |
+ src/cpp/flann/algorithms/kdtree_cuda_3d_index.cu | 1 + |
| 34 |
+ 1 file changed, 1 insertion(+) |
| 35 |
+ |
| 36 |
+diff --git a/src/cpp/flann/algorithms/kdtree_cuda_3d_index.cu b/src/cpp/flann/algorithms/kdtree_cuda_3d_index.cu |
| 37 |
+index e9b05080..8465322e 100644 |
| 38 |
+--- a/src/cpp/flann/algorithms/kdtree_cuda_3d_index.cu |
| 39 |
++++ b/src/cpp/flann/algorithms/kdtree_cuda_3d_index.cu |
| 40 |
+@@ -32,6 +32,7 @@ |
| 41 |
+ #include <flann/util/cuda/result_set.h> |
| 42 |
+ // #define THRUST_DEBUG 1 |
| 43 |
+ #include <cuda.h> |
| 44 |
++#include <thrust/gather.h> |
| 45 |
+ #include <thrust/copy.h> |
| 46 |
+ #include <thrust/device_vector.h> |
| 47 |
+ #include <vector_types.h> |
| 48 |
|
| 49 |
diff --git a/sci-libs/flann/flann-1.9.1-r2.ebuild b/sci-libs/flann/flann-1.9.1-r2.ebuild |
| 50 |
index 73e6a60c52b..c240ca1dcf1 100644 |
| 51 |
--- a/sci-libs/flann/flann-1.9.1-r2.ebuild |
| 52 |
+++ b/sci-libs/flann/flann-1.9.1-r2.ebuild |
| 53 |
@@ -32,7 +32,10 @@ RDEPEND="${DEPEND}" |
| 54 |
# readd dependencies for test suite, |
| 55 |
# requires multiple ruby dependencies |
| 56 |
|
| 57 |
-PATCHES=( "${FILESDIR}"/flann-1.9.1-cmake-3.11.patch ) |
| 58 |
+PATCHES=( |
| 59 |
+ "${FILESDIR}"/${P}-cmake-3.11.patch |
| 60 |
+ "${FILESDIR}"/${P}-cuda-9.patch |
| 61 |
+) |
| 62 |
|
| 63 |
pkg_pretend() { |
| 64 |
[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp |
Archives