| 1 |
commit: 830b912ad864fa669500f6ee6efc6fa0f87b31a7 |
| 2 |
Author: Maxim Koltsov <maksbotan <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Jul 28 19:53:00 2015 +0000 |
| 4 |
Commit: Maxim Koltsov <maksbotan <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Jul 28 19:53:00 2015 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/dev/maksbotan.git/commit/?id=830b912a |
| 7 |
|
| 8 |
Fix reinstallation of caffe, switch to NVIDIA branch |
| 9 |
|
| 10 |
Hack Makefile to link to newly built libcaffe.so instead of using system one, thus unbreak upgrades. |
| 11 |
Switch to NVIDIA fork of caffe, enabling to build NVIDIA digits. |
| 12 |
Use pkg-config for OpenCV detection. |
| 13 |
Unbreak compilation without Python. |
| 14 |
|
| 15 |
Package-Manager: portage-2.2.18 |
| 16 |
Manifest-Sign-Key: F8DBDADE |
| 17 |
|
| 18 |
dev-libs/caffe/Manifest | 16 ++++++++-------- |
| 19 |
dev-libs/caffe/caffe-9999.ebuild | 21 ++++++++++++++++----- |
| 20 |
2 files changed, 24 insertions(+), 13 deletions(-) |
| 21 |
|
| 22 |
diff --git a/dev-libs/caffe/Manifest b/dev-libs/caffe/Manifest |
| 23 |
index b6f2b82..4df84ab 100644 |
| 24 |
--- a/dev-libs/caffe/Manifest |
| 25 |
+++ b/dev-libs/caffe/Manifest |
| 26 |
@@ -1,16 +1,16 @@ |
| 27 |
-----BEGIN PGP SIGNED MESSAGE----- |
| 28 |
Hash: SHA256 |
| 29 |
|
| 30 |
-EBUILD caffe-9999.ebuild 2858 SHA256 f1ce03510a93a4ae5827962d1fbfacae6aa564c290a1ef88873d4a16fba246c3 SHA512 e9444e4ffcad83414752383fcf045afe75b2527992a78726a5486428203ea8424be0ba281c6a8cc4519475bcd07879351ff2684e21e30657235cda148ad3da1e WHIRLPOOL bf3a23b21b7f5d92b46762819bbeae0247437525d8b3d6c95d7c60f2f64a8fc983312a4245146921a7ce396438b934bedd73ab75b1549386b43d310d191c5e01 |
| 31 |
+EBUILD caffe-9999.ebuild 3108 SHA256 04b9122924fa348e2a1e2ae29fdc6bbe1f44ccdfff31361c3dd42e48ddcb8bed SHA512 34991504e8bb736f11b2ae9abcbf004f91484876094d85dfa4b6dfa94bbfb12f8476af790c9fdacf9b146ec07cc8bc090aefee7f4f1145c141c739d776d7591c WHIRLPOOL 46a2829c0f94f65bcca59250129006376863b7be5279346d9fa78d1e00071382e3d989eee010bdc071fee7d129a927efe2db35cd7ccae06f9af5807ecc5c1cf0 |
| 32 |
MISC metadata.xml 305 SHA256 bf868a44e6d34e3495a705d30149d16294c294141ae4b87eb0c7a2949df0d83c SHA512 a124af1bf9b9d853cd09e411b3a0558ba0b7b04b3e65c7c0625cacf5e4cbbf5e4bab747b0dab9318c2da042668ac9be79d47bb66049bf32f934221808101a2cc WHIRLPOOL 5be2ce659ffc4a20111c3ef3d827709b0ba150f7bc60aa17f1c17986aa7ac7670f775ded2850977f5f84054343a4efe52e828bfd4775003dc725ec4f43d772a1 |
| 33 |
-----BEGIN PGP SIGNATURE----- |
| 34 |
Version: GnuPG v2 |
| 35 |
|
| 36 |
-iQEcBAEBCAAGBQJVAx1aAAoJEAmJmMX429reIXgH/2XdNXRrPupzlv+lATR8wCx1 |
| 37 |
-bxFzQQpGtqN81HLgdVlRNVPCky/8+M5oCTuSX2XC/WmvFw6OHJxUG21AkIe88a4f |
| 38 |
-DjDAJxF1NOPkbhvthB8MCXkePJ++dojEwg16AesNw3GB500Y+2M67Z/tqm+Iiz/l |
| 39 |
-NOD0QUgfD0GwwAQyctuQSZZGoSKvAmWwG6tZ1IRJmwVwXA6Viysis7IEsWHjivty |
| 40 |
-7KrH4n4pd1oY7nIEln9xCJbTaol8BfDQ03ttVEMv4i/wQ9gu8IxTPsBvxAZ0xqih |
| 41 |
-QNtpdGdH/9VjuIVxqRtEi62oHWt+MtObrsKFjdA/jlWZ7b8DrZjszQgU6z7eGjI= |
| 42 |
-=fWTN |
| 43 |
+iQEcBAEBCAAGBQJVt92YAAoJEAmJmMX429reKyIH/1m9T1KEragcB8mxZZXBf224 |
| 44 |
+2+UvdRiOFSmIJABEpgW8DE2W5s+/hHjIluZx23krG1Y+yWmvv7oMZnN82uKb+zSE |
| 45 |
+Wxs4QDz1LoasmWHbyAakiXZhDtDPgUS3N8XUHdw0T/11wW/orFpPYHIjZDbZVUds |
| 46 |
+E8TIvzUQ813E1A2inbvCRWDciQZ1X2rU/U4LXSXB/cdmg6UrZoHwo2QiW8MqyuCX |
| 47 |
+Sht67GqDs2DgnP3J6Ayl3p5HtEWq8IppZgONxS1tNL8T2UB0HbRZJmdbpp4Vto6M |
| 48 |
+ohu92rAndFWUWNHxn4/Rr+joqlOPXS+TgH9Qm0fw2/rjRxHUNw9o6TqpkPbWbEs= |
| 49 |
+=dAK6 |
| 50 |
-----END PGP SIGNATURE----- |
| 51 |
|
| 52 |
diff --git a/dev-libs/caffe/caffe-9999.ebuild b/dev-libs/caffe/caffe-9999.ebuild |
| 53 |
index 88c6c93..793ec91 100644 |
| 54 |
--- a/dev-libs/caffe/caffe-9999.ebuild |
| 55 |
+++ b/dev-libs/caffe/caffe-9999.ebuild |
| 56 |
@@ -4,7 +4,8 @@ |
| 57 |
|
| 58 |
EAPI=5 |
| 59 |
|
| 60 |
-EGIT_REPO_URI="git://github.com/BVLC/caffe.git" |
| 61 |
+#EGIT_REPO_URI="git://github.com/BVLC/caffe.git" |
| 62 |
+EGIT_REPO_URI="git://github.com/NVIDIA/caffe" |
| 63 |
PYTHON_COMPAT=( python2_7 ) |
| 64 |
|
| 65 |
inherit toolchain-funcs multilib git-r3 python-single-r1 |
| 66 |
@@ -60,6 +61,10 @@ src_configure() { |
| 67 |
BLAS := atlas |
| 68 |
BUILD_DIR := build |
| 69 |
DISTRIBUTE_DIR := distribute |
| 70 |
+ |
| 71 |
+USE_PKG_CONFIG := 1 |
| 72 |
+ |
| 73 |
+LIBRARY_NAME_SUFFIX := -nv |
| 74 |
EOF |
| 75 |
|
| 76 |
if use cuda; then |
| 77 |
@@ -93,10 +98,15 @@ EOF |
| 78 |
|
| 79 |
local py_version=${EPYTHON#python} |
| 80 |
sed -e "/PYTHON_LIBRARIES/s/python\s/python-${py_version} /g" \ |
| 81 |
- -e '/blas/s/atlas//' \ |
| 82 |
-i Makefile || die "sed failed" |
| 83 |
fi |
| 84 |
|
| 85 |
+ sed -e '/blas/s/atlas//' \ |
| 86 |
+ -e '/^LINKFLAGS +=/ a\ |
| 87 |
+ LINKFLAGS += -L$(LIB_BUILD_DIR) |
| 88 |
+ ' \ |
| 89 |
+ -i Makefile || die "sed failed" |
| 90 |
+ |
| 91 |
tc-export CC CXX |
| 92 |
} |
| 93 |
|
| 94 |
@@ -116,14 +126,15 @@ src_install() { |
| 95 |
emake distribute |
| 96 |
|
| 97 |
for bin in distribute/bin/*; do |
| 98 |
- dobin ${bin} |
| 99 |
+ local name=$(basename ${bin}) |
| 100 |
+ newbin ${bin} ${name//.bin/} |
| 101 |
done |
| 102 |
|
| 103 |
insinto /usr |
| 104 |
doins -r distribute/include/ |
| 105 |
|
| 106 |
- dolib.a distribute/lib/libcaffe.a |
| 107 |
- dolib.so distribute/lib/libcaffe.so |
| 108 |
+ dolib.a distribute/lib/libcaffe*.a* |
| 109 |
+ dolib.so distribute/lib/libcaffe*.so* |
| 110 |
|
| 111 |
if use python; then |
| 112 |
rm distribute/python/caffe/_caffe.cpp || die "rm failed" |
Archives