| 1 |
commit: f957a4700c88e595c6ccf055417fff747ada0bdb |
| 2 |
Author: Sébastien Fabbro <bicatali <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Jul 27 18:07:54 2017 +0000 |
| 4 |
Commit: Sebastien Fabbro <bicatali <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Jul 27 18:50:41 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f957a470 |
| 7 |
|
| 8 |
sci-libs/dlib: fixed more cuda stuff |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.6, Repoman-2.3.3 |
| 11 |
|
| 12 |
sci-libs/dlib/dlib-19.4.ebuild | 10 ++++++---- |
| 13 |
sci-libs/dlib/metadata.xml | 2 +- |
| 14 |
2 files changed, 7 insertions(+), 5 deletions(-) |
| 15 |
|
| 16 |
diff --git a/sci-libs/dlib/dlib-19.4.ebuild b/sci-libs/dlib/dlib-19.4.ebuild |
| 17 |
index 9d44e7177a7..c6116343a93 100644 |
| 18 |
--- a/sci-libs/dlib/dlib-19.4.ebuild |
| 19 |
+++ b/sci-libs/dlib/dlib-19.4.ebuild |
| 20 |
@@ -3,7 +3,7 @@ |
| 21 |
|
| 22 |
EAPI=6 |
| 23 |
|
| 24 |
-inherit cmake-utils |
| 25 |
+inherit cmake-utils cuda |
| 26 |
|
| 27 |
DESCRIPTION="Numerical and networking C++ library" |
| 28 |
HOMEPAGE="http://dlib.net/" |
| 29 |
@@ -19,20 +19,22 @@ IUSE="cblas debug cuda examples gif jpeg lapack mkl png |
| 30 |
|
| 31 |
RDEPEND=" |
| 32 |
cblas? ( virtual/cblas:= ) |
| 33 |
- cuda? ( >=dev-util/nvidia-cuda-toolkit-7 ) |
| 34 |
+ cuda? ( dev-libs/cudnn:= ) |
| 35 |
jpeg? ( virtual/jpeg:0= ) |
| 36 |
lapack? ( virtual/lapack:= ) |
| 37 |
- mkl? ( sci-libs/mkl ) |
| 38 |
+ mkl? ( sci-libs/mkl:= ) |
| 39 |
png? ( media-libs/libpng:0= ) |
| 40 |
sqlite? ( dev-db/sqlite:3= ) |
| 41 |
- X? ( x11-libs/libX11 ) |
| 42 |
+ X? ( x11-libs/libX11:= ) |
| 43 |
" |
| 44 |
DEPEND="test? ( ${RDEPEND} )" |
| 45 |
|
| 46 |
src_prepare() { |
| 47 |
+ use cuda && cuda_src_prepare |
| 48 |
cmake-utils_src_prepare |
| 49 |
sed -i -e '/LICENSE.txt/d' dlib/CMakeLists.txt || die |
| 50 |
} |
| 51 |
+ |
| 52 |
src_configure() { |
| 53 |
local mycmakeargs=( |
| 54 |
-DLIB_INSTALL_DIR="$(get_libdir)" |
| 55 |
|
| 56 |
diff --git a/sci-libs/dlib/metadata.xml b/sci-libs/dlib/metadata.xml |
| 57 |
index 3d2eccafb59..422f29c52e5 100644 |
| 58 |
--- a/sci-libs/dlib/metadata.xml |
| 59 |
+++ b/sci-libs/dlib/metadata.xml |
| 60 |
@@ -13,7 +13,7 @@ |
| 61 |
</longdescription> |
| 62 |
<use> |
| 63 |
<flag name="cblas">Build with CBLAS <pkg>virtual/cblas</pkg></flag> |
| 64 |
- <flag name="cuda">Enable support for CUDA for GPU (cuDNN)</flag> |
| 65 |
+ <flag name="cuda">Enable support for CUDA for Deep Neural Networks (cuDNN) on GPU (experimental)</flag> |
| 66 |
<flag name="mkl">Enable support for Intel FFT <pkg>sci-libs/mkl</pkg></flag> |
| 67 |
</use> |
| 68 |
<upstream> |
Archives