* [gentoo-commits] dev/maksbotan:master commit in: dev-libs/caffe/
@ 2015-03-13 17:18 Maxim Koltsov
0 siblings, 0 replies; 4+ messages in thread
From: Maxim Koltsov @ 2015-03-13 17:18 UTC (permalink / raw
To: gentoo-commits
commit: 58b733cf90a98c542be4b42dda16c0cd2bb37311
Author: Maxim <kolmax94 <AT> gmail <DOT> com>
AuthorDate: Fri Mar 13 16:58:47 2015 +0000
Commit: Maxim Koltsov <maksbotan <AT> gentoo <DOT> org>
CommitDate: Fri Mar 13 17:16:27 2015 +0000
URL: https://gitweb.gentoo.org/dev/maksbotan.git/commit/?id=58b733cf
Add dev-libs/caffe-9999 ebuild
Package-Manager: portage-2.2.17
dev-libs/caffe/Manifest | 2 +
dev-libs/caffe/caffe-9999.ebuild | 133 +++++++++++++++++++++++++++++++++++++++
dev-libs/caffe/metadata.xml | 11 ++++
3 files changed, 146 insertions(+)
diff --git a/dev-libs/caffe/Manifest b/dev-libs/caffe/Manifest
new file mode 100644
index 0000000..fd218ac
--- /dev/null
+++ b/dev-libs/caffe/Manifest
@@ -0,0 +1,2 @@
+EBUILD caffe-9999.ebuild 2849 SHA256 158e1ed5ebe1c861dcff44d474cfd3a785f2af25226c66ac1e96bc68a07e03d0 SHA512 f8bd7462bb8c8af0537a87cb33c5ddcc55d499556f1554f92326cac689a9542eca90619c15950855a87316b6f9888e6d4fcff2f8dbe93b030492a170a4a6e992 WHIRLPOOL 9205c209bd6c7675d09dc4d44ad998eb82d50fc80a89a10daf52ef15ab5a87718104f971ff7b4f02d2abec25ead60a434688c8d39c28d70177232ec9d55c66ef
+MISC metadata.xml 305 SHA256 bf868a44e6d34e3495a705d30149d16294c294141ae4b87eb0c7a2949df0d83c SHA512 a124af1bf9b9d853cd09e411b3a0558ba0b7b04b3e65c7c0625cacf5e4cbbf5e4bab747b0dab9318c2da042668ac9be79d47bb66049bf32f934221808101a2cc WHIRLPOOL 5be2ce659ffc4a20111c3ef3d827709b0ba150f7bc60aa17f1c17986aa7ac7670f775ded2850977f5f84054343a4efe52e828bfd4775003dc725ec4f43d772a1
diff --git a/dev-libs/caffe/caffe-9999.ebuild b/dev-libs/caffe/caffe-9999.ebuild
new file mode 100644
index 0000000..5472075
--- /dev/null
+++ b/dev-libs/caffe/caffe-9999.ebuild
@@ -0,0 +1,133 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=5
+
+EGIT_REPO_URI="git://github.com/BVLC/caffe.git"
+PYTHON_COMPAT=( python2_7 )
+
+inherit toolchain-funcs multilib git-r3 python-single-r1
+# Can't use cuda.eclass as nvcc does not like --compiler-bindir set there for some reason
+
+DESCRIPTION="Deep learning framework by the BVLC"
+HOMEPAGE="http://caffe.berkeleyvision.org/"
+SRC_URI=""
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS=""
+IUSE="cuda python"
+
+CDEPEND="
+ dev-libs/boost:=[python?]
+ media-libs/opencv:=
+ dev-libs/protobuf:=[python?]
+ dev-cpp/glog:=
+ dev-cpp/gflags:=
+ sci-libs/hdf5:=
+ dev-libs/leveldb:=
+ app-arch/snappy:=
+ dev-db/lmdb:=
+ cuda? (
+ dev-util/nvidia-cuda-toolkit
+ )
+ python? (
+ ${PYTHON_DEPS}
+ )
+"
+DEPEND="
+ ${CDEPEND}
+ sys-devel/bc
+"
+RDEPEND="
+ ${CDEPEND}
+ python? (
+ dev-python/pandas[${PYTHON_USEDEP}]
+ dev-python/numpy[${PYTHON_USEDEP}]
+ media-gfx/pydot[${PYTHON_USEDEP}]
+ sci-libs/scikits_image[${PYTHON_USEDEP}]
+ )
+"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+src_configure() {
+ # Respect CFLAGS
+ sed -e '/COMMON_FLAGS/s/-O2//' -i Makefile
+
+ cat > Makefile.config << EOF
+BLAS := atlas
+BUILD_DIR := build
+DISTRIBUTE_DIR := distribute
+EOF
+
+ if use cuda; then
+ cat >> Makefile.config << EOF
+CUDA_DIR := "${EPREFIX}/opt/cuda"
+
+CUDA_ARCH := -gencode arch=compute_20,code=sm_20 \
+ -gencode arch=compute_20,code=sm_21 \
+ -gencode arch=compute_30,code=sm_30 \
+ -gencode arch=compute_35,code=sm_35 \
+ -gencode arch=compute_50,code=sm_50 \
+ -gencode arch=compute_50,code=compute_50
+EOF
+
+ # This should be handled by Makefile itself, but somehow is broken
+ sed -e "/CUDA_LIB_DIR/s/lib/$(get_libdir)/" -i Makefile || die "sed failed"
+ else
+ echo "CPU_ONLY := 1" >> Makefile.config
+ fi
+
+ if use python; then
+ python_export PYTHON_INCLUDEDIR PYTHON_SITEDIR PYTHON_LIBPATH
+ cat >> Makefile.config << EOF
+PYTHON_INCLUDE := "${PYTHON_INCLUDEDIR}" "${PYTHON_SITEDIR}/numpy/core/include"
+PYTHON_LIB := "$(dirname ${PYTHON_LIBPATH})"
+WITH_PYTHON_LAYER := 1
+
+INCLUDE_DIRS += \$(PYTHON_INCLUDE)
+LIBRARY_DIRS += \$(PYTHON_LIB)
+EOF
+
+ local py_version=${EPYTHON#python}
+ sed -e "/PYTHON_LIBRARIES/s/python\s/python-${py_version} /g" \
+ -e '/blas/s/atlas//' \
+ -i Makefile || die "sed failed"
+ fi
+
+ tc-export CC CXX
+}
+
+src_compile() {
+ emake
+
+ use python && emake pycaffe
+}
+
+src_test() {
+ emake runtest
+
+ use python && emake pytest
+}
+
+src_install() {
+ emake distribute
+
+ for bin in distribute/bin/*; do
+ dobin ${bin}
+ done
+
+ insinto /usr
+ doins -r distribute/include/
+
+ dolib.a distribute/lib/libcaffe.a
+ dolib.so distribute/lib/libcaffe.so
+
+ rm distribute/python/caffe/_caffe.cpp || die "rm failed"
+ python_domodule distribute/python/caffe
+ for script in distribute/python/*.py; do
+ python_doscript ${script}
+ done
+}
diff --git a/dev-libs/caffe/metadata.xml b/dev-libs/caffe/metadata.xml
new file mode 100644
index 0000000..f6c645a
--- /dev/null
+++ b/dev-libs/caffe/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer>
+ <email>maksbotan@gentoo.org</email>
+ <name>Maxim Koltsov</name>
+</maintainer>
+<use>
+ <flag name="cuda">Enable NVIDIA CUDA toolkit support</flag>
+</use>
+</pkgmetadata>
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] dev/maksbotan:master commit in: dev-libs/caffe/
@ 2015-03-13 17:24 Maxim Koltsov
0 siblings, 0 replies; 4+ messages in thread
From: Maxim Koltsov @ 2015-03-13 17:24 UTC (permalink / raw
To: gentoo-commits
commit: 3dab63bbd08722062dbd1a01ca05f5813751393f
Author: Maxim Koltsov <maksbotan <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 13 17:22:20 2015 +0000
Commit: Maxim Koltsov <maksbotan <AT> gentoo <DOT> org>
CommitDate: Fri Mar 13 17:22:20 2015 +0000
URL: https://gitweb.gentoo.org/dev/maksbotan.git/commit/?id=3dab63bb
Add 'if use python' block in src_install for caffe
Package-Manager: portage-2.2.17
Manifest-Sign-Key: F8DBDADE
dev-libs/caffe/Manifest | 16 +++++++++++++++-
dev-libs/caffe/caffe-9999.ebuild | 12 +++++++-----
2 files changed, 22 insertions(+), 6 deletions(-)
diff --git a/dev-libs/caffe/Manifest b/dev-libs/caffe/Manifest
index fd218ac..e15b858 100644
--- a/dev-libs/caffe/Manifest
+++ b/dev-libs/caffe/Manifest
@@ -1,2 +1,16 @@
-EBUILD caffe-9999.ebuild 2849 SHA256 158e1ed5ebe1c861dcff44d474cfd3a785f2af25226c66ac1e96bc68a07e03d0 SHA512 f8bd7462bb8c8af0537a87cb33c5ddcc55d499556f1554f92326cac689a9542eca90619c15950855a87316b6f9888e6d4fcff2f8dbe93b030492a170a4a6e992 WHIRLPOOL 9205c209bd6c7675d09dc4d44ad998eb82d50fc80a89a10daf52ef15ab5a87718104f971ff7b4f02d2abec25ead60a434688c8d39c28d70177232ec9d55c66ef
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+EBUILD caffe-9999.ebuild 2879 SHA256 c0c0c42e48d5ddcb8b85b67e781e7b8aedc29b52c1b46a325396c0f9570cf1e0 SHA512 e9b1357931f4fd2943dc6f9bb21020d83ec16daf891faa4238c4ceace384bc1ee3d08eb5ea8c171cf6fb0be561e977d233c9ec11dcdf0d335b6df59a6b7a3aa7 WHIRLPOOL 5e9a519f79148448f9f32fb4d42f301f1d7d74bf98e514ee469c99f1b78c1719c30a8dc11d0c82db97b772ed56dde5e0d6f74c03bd82992bfcc96ed777cccaf2
MISC metadata.xml 305 SHA256 bf868a44e6d34e3495a705d30149d16294c294141ae4b87eb0c7a2949df0d83c SHA512 a124af1bf9b9d853cd09e411b3a0558ba0b7b04b3e65c7c0625cacf5e4cbbf5e4bab747b0dab9318c2da042668ac9be79d47bb66049bf32f934221808101a2cc WHIRLPOOL 5be2ce659ffc4a20111c3ef3d827709b0ba150f7bc60aa17f1c17986aa7ac7670f775ded2850977f5f84054343a4efe52e828bfd4775003dc725ec4f43d772a1
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2
+
+iQEcBAEBCAAGBQJVAxzMAAoJEAmJmMX429rekIkH/3yrO6/uL2DGoUecOtnQ5hBO
+ub+85yrMqbvFFHBVFQiJrrTii6roxq2aEOcUOnrpgVp7PfVkL7Ijt/EOn3/XjR9d
+s/WbFBHUAe0XP3yPq/7UCKOrjSitBVJikFFRf347KWXZx96W2MN21WkI39BNFj3c
+5hYNZbYHOYkHMnBzENJds5TGgDVmTLY4AQeuqx/8MYYSWnCDKF8sfVcAZ6Sydddk
+ZfxDoDEBnLA8L6oEAbtCZww78pZPZb65CbY+A/nC9wkiOFsBmWSRk7zOPwgolyQr
+6AEBJJ0g/p/QbUUZ+KgjaMe2dyPGn8vtgw6xR4QPGxc0CKt6+A1Fr9fWuGBICC4=
+=iLCh
+-----END PGP SIGNATURE-----
diff --git a/dev-libs/caffe/caffe-9999.ebuild b/dev-libs/caffe/caffe-9999.ebuild
index 5472075..2595655 100644
--- a/dev-libs/caffe/caffe-9999.ebuild
+++ b/dev-libs/caffe/caffe-9999.ebuild
@@ -125,9 +125,11 @@ src_install() {
dolib.a distribute/lib/libcaffe.a
dolib.so distribute/lib/libcaffe.so
- rm distribute/python/caffe/_caffe.cpp || die "rm failed"
- python_domodule distribute/python/caffe
- for script in distribute/python/*.py; do
- python_doscript ${script}
- done
+ if use python; then
+ rm distribute/python/caffe/_caffe.cpp || die "rm failed"
+ python_domodule distribute/python/caffe
+ for script in distribute/python/*.py; do
+ python_doscript ${script}
+ done
+ fi
}
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] dev/maksbotan:master commit in: dev-libs/caffe/
@ 2015-03-13 17:26 Maxim Koltsov
0 siblings, 0 replies; 4+ messages in thread
From: Maxim Koltsov @ 2015-03-13 17:26 UTC (permalink / raw
To: gentoo-commits
commit: f8f47b1436e027e0b7806fe031337dc41fb7ad2c
Author: Maxim Koltsov <maksbotan <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 13 17:24:42 2015 +0000
Commit: Maxim Koltsov <maksbotan <AT> gentoo <DOT> org>
CommitDate: Fri Mar 13 17:24:42 2015 +0000
URL: https://gitweb.gentoo.org/dev/maksbotan.git/commit/?id=f8f47b14
Fix indentation in caffe
Package-Manager: portage-2.2.17
Manifest-Sign-Key: F8DBDADE
dev-libs/caffe/Manifest | 16 ++++++++--------
dev-libs/caffe/caffe-9999.ebuild | 8 ++++----
2 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/dev-libs/caffe/Manifest b/dev-libs/caffe/Manifest
index e15b858..b6f2b82 100644
--- a/dev-libs/caffe/Manifest
+++ b/dev-libs/caffe/Manifest
@@ -1,16 +1,16 @@
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256
-EBUILD caffe-9999.ebuild 2879 SHA256 c0c0c42e48d5ddcb8b85b67e781e7b8aedc29b52c1b46a325396c0f9570cf1e0 SHA512 e9b1357931f4fd2943dc6f9bb21020d83ec16daf891faa4238c4ceace384bc1ee3d08eb5ea8c171cf6fb0be561e977d233c9ec11dcdf0d335b6df59a6b7a3aa7 WHIRLPOOL 5e9a519f79148448f9f32fb4d42f301f1d7d74bf98e514ee469c99f1b78c1719c30a8dc11d0c82db97b772ed56dde5e0d6f74c03bd82992bfcc96ed777cccaf2
+EBUILD caffe-9999.ebuild 2858 SHA256 f1ce03510a93a4ae5827962d1fbfacae6aa564c290a1ef88873d4a16fba246c3 SHA512 e9444e4ffcad83414752383fcf045afe75b2527992a78726a5486428203ea8424be0ba281c6a8cc4519475bcd07879351ff2684e21e30657235cda148ad3da1e WHIRLPOOL bf3a23b21b7f5d92b46762819bbeae0247437525d8b3d6c95d7c60f2f64a8fc983312a4245146921a7ce396438b934bedd73ab75b1549386b43d310d191c5e01
MISC metadata.xml 305 SHA256 bf868a44e6d34e3495a705d30149d16294c294141ae4b87eb0c7a2949df0d83c SHA512 a124af1bf9b9d853cd09e411b3a0558ba0b7b04b3e65c7c0625cacf5e4cbbf5e4bab747b0dab9318c2da042668ac9be79d47bb66049bf32f934221808101a2cc WHIRLPOOL 5be2ce659ffc4a20111c3ef3d827709b0ba150f7bc60aa17f1c17986aa7ac7670f775ded2850977f5f84054343a4efe52e828bfd4775003dc725ec4f43d772a1
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2
-iQEcBAEBCAAGBQJVAxzMAAoJEAmJmMX429rekIkH/3yrO6/uL2DGoUecOtnQ5hBO
-ub+85yrMqbvFFHBVFQiJrrTii6roxq2aEOcUOnrpgVp7PfVkL7Ijt/EOn3/XjR9d
-s/WbFBHUAe0XP3yPq/7UCKOrjSitBVJikFFRf347KWXZx96W2MN21WkI39BNFj3c
-5hYNZbYHOYkHMnBzENJds5TGgDVmTLY4AQeuqx/8MYYSWnCDKF8sfVcAZ6Sydddk
-ZfxDoDEBnLA8L6oEAbtCZww78pZPZb65CbY+A/nC9wkiOFsBmWSRk7zOPwgolyQr
-6AEBJJ0g/p/QbUUZ+KgjaMe2dyPGn8vtgw6xR4QPGxc0CKt6+A1Fr9fWuGBICC4=
-=iLCh
+iQEcBAEBCAAGBQJVAx1aAAoJEAmJmMX429reIXgH/2XdNXRrPupzlv+lATR8wCx1
+bxFzQQpGtqN81HLgdVlRNVPCky/8+M5oCTuSX2XC/WmvFw6OHJxUG21AkIe88a4f
+DjDAJxF1NOPkbhvthB8MCXkePJ++dojEwg16AesNw3GB500Y+2M67Z/tqm+Iiz/l
+NOD0QUgfD0GwwAQyctuQSZZGoSKvAmWwG6tZ1IRJmwVwXA6Viysis7IEsWHjivty
+7KrH4n4pd1oY7nIEln9xCJbTaol8BfDQ03ttVEMv4i/wQ9gu8IxTPsBvxAZ0xqih
+QNtpdGdH/9VjuIVxqRtEi62oHWt+MtObrsKFjdA/jlWZ7b8DrZjszQgU6z7eGjI=
+=fWTN
-----END PGP SIGNATURE-----
diff --git a/dev-libs/caffe/caffe-9999.ebuild b/dev-libs/caffe/caffe-9999.ebuild
index 2595655..88c6c93 100644
--- a/dev-libs/caffe/caffe-9999.ebuild
+++ b/dev-libs/caffe/caffe-9999.ebuild
@@ -68,10 +68,10 @@ CUDA_DIR := "${EPREFIX}/opt/cuda"
CUDA_ARCH := -gencode arch=compute_20,code=sm_20 \
-gencode arch=compute_20,code=sm_21 \
- -gencode arch=compute_30,code=sm_30 \
- -gencode arch=compute_35,code=sm_35 \
- -gencode arch=compute_50,code=sm_50 \
- -gencode arch=compute_50,code=compute_50
+ -gencode arch=compute_30,code=sm_30 \
+ -gencode arch=compute_35,code=sm_35 \
+ -gencode arch=compute_50,code=sm_50 \
+ -gencode arch=compute_50,code=compute_50
EOF
# This should be handled by Makefile itself, but somehow is broken
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] dev/maksbotan:master commit in: dev-libs/caffe/
@ 2015-07-28 19:53 Maxim Koltsov
0 siblings, 0 replies; 4+ messages in thread
From: Maxim Koltsov @ 2015-07-28 19:53 UTC (permalink / raw
To: gentoo-commits
commit: 830b912ad864fa669500f6ee6efc6fa0f87b31a7
Author: Maxim Koltsov <maksbotan <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 28 19:53:00 2015 +0000
Commit: Maxim Koltsov <maksbotan <AT> gentoo <DOT> org>
CommitDate: Tue Jul 28 19:53:00 2015 +0000
URL: https://gitweb.gentoo.org/dev/maksbotan.git/commit/?id=830b912a
Fix reinstallation of caffe, switch to NVIDIA branch
Hack Makefile to link to newly built libcaffe.so instead of using system one, thus unbreak upgrades.
Switch to NVIDIA fork of caffe, enabling to build NVIDIA digits.
Use pkg-config for OpenCV detection.
Unbreak compilation without Python.
Package-Manager: portage-2.2.18
Manifest-Sign-Key: F8DBDADE
dev-libs/caffe/Manifest | 16 ++++++++--------
dev-libs/caffe/caffe-9999.ebuild | 21 ++++++++++++++++-----
2 files changed, 24 insertions(+), 13 deletions(-)
diff --git a/dev-libs/caffe/Manifest b/dev-libs/caffe/Manifest
index b6f2b82..4df84ab 100644
--- a/dev-libs/caffe/Manifest
+++ b/dev-libs/caffe/Manifest
@@ -1,16 +1,16 @@
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256
-EBUILD caffe-9999.ebuild 2858 SHA256 f1ce03510a93a4ae5827962d1fbfacae6aa564c290a1ef88873d4a16fba246c3 SHA512 e9444e4ffcad83414752383fcf045afe75b2527992a78726a5486428203ea8424be0ba281c6a8cc4519475bcd07879351ff2684e21e30657235cda148ad3da1e WHIRLPOOL bf3a23b21b7f5d92b46762819bbeae0247437525d8b3d6c95d7c60f2f64a8fc983312a4245146921a7ce396438b934bedd73ab75b1549386b43d310d191c5e01
+EBUILD caffe-9999.ebuild 3108 SHA256 04b9122924fa348e2a1e2ae29fdc6bbe1f44ccdfff31361c3dd42e48ddcb8bed SHA512 34991504e8bb736f11b2ae9abcbf004f91484876094d85dfa4b6dfa94bbfb12f8476af790c9fdacf9b146ec07cc8bc090aefee7f4f1145c141c739d776d7591c WHIRLPOOL 46a2829c0f94f65bcca59250129006376863b7be5279346d9fa78d1e00071382e3d989eee010bdc071fee7d129a927efe2db35cd7ccae06f9af5807ecc5c1cf0
MISC metadata.xml 305 SHA256 bf868a44e6d34e3495a705d30149d16294c294141ae4b87eb0c7a2949df0d83c SHA512 a124af1bf9b9d853cd09e411b3a0558ba0b7b04b3e65c7c0625cacf5e4cbbf5e4bab747b0dab9318c2da042668ac9be79d47bb66049bf32f934221808101a2cc WHIRLPOOL 5be2ce659ffc4a20111c3ef3d827709b0ba150f7bc60aa17f1c17986aa7ac7670f775ded2850977f5f84054343a4efe52e828bfd4775003dc725ec4f43d772a1
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2
-iQEcBAEBCAAGBQJVAx1aAAoJEAmJmMX429reIXgH/2XdNXRrPupzlv+lATR8wCx1
-bxFzQQpGtqN81HLgdVlRNVPCky/8+M5oCTuSX2XC/WmvFw6OHJxUG21AkIe88a4f
-DjDAJxF1NOPkbhvthB8MCXkePJ++dojEwg16AesNw3GB500Y+2M67Z/tqm+Iiz/l
-NOD0QUgfD0GwwAQyctuQSZZGoSKvAmWwG6tZ1IRJmwVwXA6Viysis7IEsWHjivty
-7KrH4n4pd1oY7nIEln9xCJbTaol8BfDQ03ttVEMv4i/wQ9gu8IxTPsBvxAZ0xqih
-QNtpdGdH/9VjuIVxqRtEi62oHWt+MtObrsKFjdA/jlWZ7b8DrZjszQgU6z7eGjI=
-=fWTN
+iQEcBAEBCAAGBQJVt92YAAoJEAmJmMX429reKyIH/1m9T1KEragcB8mxZZXBf224
+2+UvdRiOFSmIJABEpgW8DE2W5s+/hHjIluZx23krG1Y+yWmvv7oMZnN82uKb+zSE
+Wxs4QDz1LoasmWHbyAakiXZhDtDPgUS3N8XUHdw0T/11wW/orFpPYHIjZDbZVUds
+E8TIvzUQ813E1A2inbvCRWDciQZ1X2rU/U4LXSXB/cdmg6UrZoHwo2QiW8MqyuCX
+Sht67GqDs2DgnP3J6Ayl3p5HtEWq8IppZgONxS1tNL8T2UB0HbRZJmdbpp4Vto6M
+ohu92rAndFWUWNHxn4/Rr+joqlOPXS+TgH9Qm0fw2/rjRxHUNw9o6TqpkPbWbEs=
+=dAK6
-----END PGP SIGNATURE-----
diff --git a/dev-libs/caffe/caffe-9999.ebuild b/dev-libs/caffe/caffe-9999.ebuild
index 88c6c93..793ec91 100644
--- a/dev-libs/caffe/caffe-9999.ebuild
+++ b/dev-libs/caffe/caffe-9999.ebuild
@@ -4,7 +4,8 @@
EAPI=5
-EGIT_REPO_URI="git://github.com/BVLC/caffe.git"
+#EGIT_REPO_URI="git://github.com/BVLC/caffe.git"
+EGIT_REPO_URI="git://github.com/NVIDIA/caffe"
PYTHON_COMPAT=( python2_7 )
inherit toolchain-funcs multilib git-r3 python-single-r1
@@ -60,6 +61,10 @@ src_configure() {
BLAS := atlas
BUILD_DIR := build
DISTRIBUTE_DIR := distribute
+
+USE_PKG_CONFIG := 1
+
+LIBRARY_NAME_SUFFIX := -nv
EOF
if use cuda; then
@@ -93,10 +98,15 @@ EOF
local py_version=${EPYTHON#python}
sed -e "/PYTHON_LIBRARIES/s/python\s/python-${py_version} /g" \
- -e '/blas/s/atlas//' \
-i Makefile || die "sed failed"
fi
+ sed -e '/blas/s/atlas//' \
+ -e '/^LINKFLAGS +=/ a\
+ LINKFLAGS += -L$(LIB_BUILD_DIR)
+ ' \
+ -i Makefile || die "sed failed"
+
tc-export CC CXX
}
@@ -116,14 +126,15 @@ src_install() {
emake distribute
for bin in distribute/bin/*; do
- dobin ${bin}
+ local name=$(basename ${bin})
+ newbin ${bin} ${name//.bin/}
done
insinto /usr
doins -r distribute/include/
- dolib.a distribute/lib/libcaffe.a
- dolib.so distribute/lib/libcaffe.so
+ dolib.a distribute/lib/libcaffe*.a*
+ dolib.so distribute/lib/libcaffe*.so*
if use python; then
rm distribute/python/caffe/_caffe.cpp || die "rm failed"
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2015-07-28 19:53 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-03-13 17:18 [gentoo-commits] dev/maksbotan:master commit in: dev-libs/caffe/ Maxim Koltsov
-- strict thread matches above, loose matches on Subject: below --
2015-03-13 17:24 Maxim Koltsov
2015-03-13 17:26 Maxim Koltsov
2015-07-28 19:53 Maxim Koltsov
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox