[caffe-contrib] 175/362: d/rules: fix bug in 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 2478e96f89d52036a051a765f5e0e6cb04bb3148
Author: Zhou Mo <cdluminate at gmail.com>
Date:   Wed Sep 2 05:57:02 2015 +0000

    d/rules: fix bug in custom target
---
 debian/rules | 45 +++++++++++++++++++++++++++++++++++++--------
 1 file changed, 37 insertions(+), 8 deletions(-)

diff --git a/debian/rules b/debian/rules
index 1819038..9471d11 100755
--- a/debian/rules
+++ b/debian/rules
@@ -110,9 +110,40 @@ get-orig-source:
 # Since the Distributed Binary Caffe can not play the best performance
 # of user's machines, it's good to provide a custom build target,
 # allowing users to build their locally performance-optimized packages.
-# TODO: Test if following custom works
-CUSTOM_CONFIG := ""
 CUSTOM_JOBS   := "-j4"
+CONFFLAG_CPU_CUSTOM = \
+	-DBLAS="Open" \
+	-DCMAKE_SKIP_RPATH=TRUE \
+	-DCPU_ONLY=ON \
+	-DUSE_CUDNN=OFF \
+	-DBUILD_SHARED_LIBS=ON \
+	-DBUILD_python=ON \
+	-Dpython_version="2" \
+	-DBUILD_matlab=OFF \
+	-DBUILD_docs=OFF \
+	-DBUILD_python_layer=ON \
+	-DCMAKE_VERBOSE_MAKEFILE=ON \
+	-DCMAKE_BUILD_TYPE="Release" \
+	-DCMAKE_INSTALL_PREFIX="/caffe_cpu"
+CONFFLAG_CUDA_CUSTOM = \
+	-DBLAS="Open" \
+	-DCMAKE_SKIP_RPATH=TRUE \
+	-DCPU_ONLY=OFF \
+	-DUSE_CUDNN=OFF \
+	-DBUILD_SHARED_LIBS=ON \
+	-DBUILD_python=ON \
+	-Dpython_version="2" \
+	-DBUILD_matlab=OFF \
+	-DBUILD_docs=OFF \
+	-DBUILD_python_layer=ON \
+	-DCMAKE_VERBOSE_MAKEFILE=ON \
+	-DCUDA_ARCH_NAME="All" \
+	-DCMAKE_CXX_COMPILER=g++-4.9 \
+	-DCMAKE_C_COMPILER=gcc-4.9 \
+	-DCMAKE_BUILD_TYPE="Release" \
+	-DCMAKE_INSTALL_PREFIX="/caffe_cuda" \
+	-DUSE_CUDNN=ON
+
 .PHONY: custom-cpu custom-cuda
 custom-cpu:
 	dch --local='+custom' "Custom build of caffe-cpu on `uname -a`"
@@ -120,17 +151,16 @@ custom-cpu:
 	dpkg-source --before-build ./
 	dh_auto_clean --builddirectory=${CAFFE_CPU_BUILDDIR}
 	mkdir ${CAFFE_CPU_BUILDDIR}
-	cd ${CAFFE_CPU_BUILDDIR}; cmake $(CONFFLAG_CPU) $(CUSTOM_CONFIG) \
+	cd ${CAFFE_CPU_BUILDDIR}; cmake $(CONFFLAG_CPU_CUSTOM) \
 			-DCMAKE_INSTALL_PREFIX="$(shell pwd)/debian/tmp/caffe_cpu" ..
 	dh_auto_build --builddirectory=${CAFFE_CPU_BUILDDIR} -- $(CUSTOM_JOBS) \
 			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} \
-		-- install CMAKE_COMMAND="/usr/bin/cmake -DCMAKE_INSTALL_CONFIG_NAME=\"Release\""
+		-- install
 	cd ${CAFFE_CPU_BUILDDIR}; cmake -DCMAKE_INSTALL_CONFIG_NAME="Release" \
 		-P cmake_install.cmake
-	#cd ${CAFFE_CPU_BUILDDIR}; make install
 	$(RM) debian/*.symbols
 	fakeroot dh binary \
 		--package=caffe-cpu \
@@ -143,17 +173,16 @@ custom-cuda:
 	dpkg-source --before-build ./
 	dh_auto_clean --builddirectory=${CAFFE_CUDA_BUILDDIR}
 	mkdir ${CAFFE_CUDA_BUILDDIR}
-	cd ${CAFFE_CUDA_BUILDDIR}; cmake $(CONFFLAG_CUDA) $(CUSTOM_CONFIG) \
+	cd ${CAFFE_CUDA_BUILDDIR}; cmake $(CONFFLAG_CUDA_CUSTOM) \
 			-DCMAKE_INSTALL_PREFIX="$(shell pwd)/debian/tmp/caffe_cuda" ..
 	dh_auto_build --builddirectory=${CAFFE_CUDA_BUILDDIR} -- $(CUSTOM_JOBS) \
 			all caffe pycaffe test.testbin
 	-dh_auto_test --builddirectory=${CAFFE_CUDA_BUILDDIR} \
 		-- runtest LD_LIBRARY_PATH=${CAFFE_CUDA_BUILDDIR}/lib/ 
 	dh_auto_install --builddirectory=${CAFFE_CUDA_BUILDDIR} \
-		-- install CMAKE_COMMAND="/usr/bin/cmake -DCMAKE_INSTALL_CONFIG_NAME=\"Release\""
+		-- install
 	cd ${CAFFE_CUDA_BUILDDIR}; cmake -DCMAKE_INSTALL_CONFIG_NAME="Release" \
 		-P cmake_install.cmake
-	#cd ${CAFFE_CUDA_BUILDDIR}; make install
 	$(RM) debian/*.symbols
 	fakeroot dh binary \
 		--package=caffe-cuda \

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