[caffe-contrib] 01/02: rules: remove customization, syncing with cpu version

Zhou Mo cdluminate-guest at moszumanska.debian.org
Mon Jul 4 13:55:49 UTC 2016


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 05336bc5842c8cecd1b095bce6e2e8f9a93b982c
Author: Zhou Mo <cdluminate at gmail.com>
Date:   Mon Jul 4 13:46:05 2016 +0000

    rules: remove customization, syncing with cpu version
---
 debian/rules | 63 ------------------------------------------------------------
 1 file changed, 63 deletions(-)

diff --git a/debian/rules b/debian/rules
index d6499d8..e87fe80 100755
--- a/debian/rules
+++ b/debian/rules
@@ -137,66 +137,3 @@ endif
 
 get-orig-source:
 	wget -c $(ORIG_SOURCE) -O caffe_1.0.0~rc3.orig.tar.gz
-
-#### BEGIN: CUSTOM TARGETS ############################################
-##
-## NOTICE: THIS PART IS UNRELATED TO OFFICIAL PACKAGE BUILD PROCESS
-##
-## The program performance of Caffe may be boosted up a bit, after
-## building the packages locally, but not sure how much it would be.
-## 
-## For the custom build instruction please see README.Debian
-##
-CUSTOM_JOBS   := "-j5" # number of cores plus 1
-CONFFLAG_CPU_CUSTOM = $(CMAKE_CONFIGURE_TEMPLATE) \
-	-DCMAKE_INSTALL_PREFIX="$(shell pwd)/debian/tmp/caffe_cpu" \
-	-DCPU_ONLY=ON
-CONFFLAG_CUDA_CUSTOM = $(CMAKE_CONFIGURE_TEMPLATE) \
-	-DCMAKE_INSTALL_PREFIX="$(shell pwd)/debian/tmp/caffe_cuda" \
-	-DCPU_ONLY=OFF
-#
-.PHONY: custom-cpu custom-cuda
-custom-cpu:
-	dch --local='+custom' "Local custom build of caffe-cpu packages."
-	dch "Host Info: `uname -a`"
-	dpkg-source --after-build ./
-	dpkg-source --before-build ./
-	dh_auto_clean --builddirectory=$(CAFFE_CPU_BUILDDIR)
-	mkdir $(CAFFE_CPU_BUILDDIR)
-	$(RULES) autogen
-	dh_auto_configure --builddirectory=$(CAFFE_CPU_BUILDDIR) -- \
-		$(CONFFLAG_CPU_CUSTOM)
-	dh_auto_build --builddirectory=$(CAFFE_CPU_BUILDDIR) -- $(CUSTOM_JOBS) \
-			all caffe pycaffe test.testbin
-	# For Caffe's CPU-ONLY version it should not fail.
-	dh_auto_test --builddirectory=$(CAFFE_CPU_BUILDDIR) \
-		-- runtest LD_LIBRARY_PATH=$(CAFFE_CPU_BUILDDIR)/lib/ 
-	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' "Local custom build of caffe-cuda packages."
-	dch "Host Info: `uname -a`"
-	dpkg-source --after-build ./
-	dpkg-source --before-build ./
-	dh_auto_clean --builddirectory=$(CAFFE_CUDA_BUILDDIR)
-	mkdir $(CAFFE_CUDA_BUILDDIR)
-	$(RULES) autogen
-	dh_auto_configure --builddirectory=$(CAFFE_CUDA_BUILDDIR) -- \
-		$(CONFFLAG_CUDA_CUSTOM)
-	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
-	# note the '-' sign, some amd64 build machines have no GPU,
-	# so this test is allowed to fail.
-	-dh_auto_test --builddirectory=$(CAFFE_CUDA_BUILDDIR) \
-		-- runtest LD_LIBRARY_PATH=$(CAFFE_CUDA_BUILDDIR)/lib/ 
-	dh_auto_install --builddirectory=$(CAFFE_CUDA_BUILDDIR) -- install
-	cd $(CAFFE_CUDA_BUILDDIR); cmake -DCMAKE_INSTALL_CONFIG_NAME="Release" \
-		-P cmake_install.cmake
-	-$(RM) debian/*.symbols
-	fakeroot dh binary $(SUITE_CUDA_P)
-#### END: CUSTOM TARGETS ##############################################

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



More information about the debian-science-commits mailing list