[caffe-contrib] 247/362: rules: update custom target

[Zhou Mo]

This is an automated email from the git hooks/post-receive script.

cdluminate-guest pushed a commit to branch master
in repository caffe-contrib.

commit 2191d8886dc7649f413859683c9132f9774d2d0d
Author: Zhou Mo <cdluminate at gmail.com>
Date:   Sat Dec 12 07:44:15 2015 +0000

    rules: update custom target
---
 debian/rules | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/debian/rules b/debian/rules
index 68d65cd..60bdd98 100755
--- a/debian/rules
+++ b/debian/rules
@@ -151,6 +151,7 @@ CONFFLAG_CPU_CUSTOM = \
 	-DBUILD_python_layer=ON \
 	-DCMAKE_VERBOSE_MAKEFILE=ON \
 	-DCMAKE_BUILD_TYPE="Release" \
+	-DCMAKE_CXX_FLAGS+="-mtune=native" \
 	-DCMAKE_INSTALL_PREFIX="/caffe_cpu"
 CONFFLAG_CUDA_CUSTOM = \
 	-DBLAS="Open" \
@@ -168,11 +169,12 @@ CONFFLAG_CUDA_CUSTOM = \
 	-DCMAKE_CXX_COMPILER=g++-4.9 \
 	-DCMAKE_C_COMPILER=gcc-4.9 \
 	-DCMAKE_BUILD_TYPE="Release" \
+	-DCMAKE_CXX_FLAGS+="-mtune=native" \
 	-DCMAKE_INSTALL_PREFIX="/caffe_cuda"
 
 .PHONY: custom-cpu custom-cuda
 custom-cpu:
-	dch --local='+custom' "Custom build of caffe-cpu on `uname -a`"
+	dch --local='+custom' "Custom build for caffe-cpu packages, `uname -a`"
 	dpkg-source --after-build ./
 	dpkg-source --before-build ./
 	dh_auto_clean --builddirectory=${CAFFE_CPU_BUILDDIR}
@@ -183,14 +185,14 @@ custom-cpu:
 			all caffe pycaffe test.testbin
 	dh_auto_test --builddirectory=${CAFFE_CPU_BUILDDIR} \
 		-- runtest LD_LIBRARY_PATH=${CAFFE_CPU_BUILDDIR}/lib/ 
-	dh_auto_install --builddirectory=${CAFFE_CUDA_BUILDDIR} \
+	dh_auto_install --builddirectory=${CAFFE_CPU_BUILDDIR} \
 		-- install
 	cd ${CAFFE_CPU_BUILDDIR}; cmake -DCMAKE_INSTALL_CONFIG_NAME="Release" \
 		-P cmake_install.cmake
 	$(RM) debian/*.symbols
 	fakeroot dh binary $(SUITE_CPU_P)
 custom-cuda:
-	dch --local='+custom' "Custom build of caffe-cuda on `uname -a`"
+	dch --local='+custom' "Custom build for caffe-cuda packages, `uname -a`"
 	dpkg-source --after-build ./
 	dpkg-source --before-build ./
 	dh_auto_clean --builddirectory=${CAFFE_CUDA_BUILDDIR}

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/caffe-contrib.git