[caffe] 01/02: rules: remove 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.

commit efb17b41c0312ffae990323ec2eae54a843a27f1
Author: Zhou Mo <cdluminate at gmail.com>
Date:   Wed May 18 10:56:22 2016 +0000

    rules: remove custom target
---
 debian/README.Debian | 18 ++++--------------
 debian/rules         | 40 ----------------------------------------
 2 files changed, 4 insertions(+), 54 deletions(-)

diff --git a/debian/README.Debian b/debian/README.Debian
index 577201e..56dfadc 100644
--- a/debian/README.Debian
+++ b/debian/README.Debian
@@ -80,25 +80,15 @@ How to compile these packages by myself?
 2. [Optional] Change CMAKE flags in debian/rules if you wish,
    but there is no promise whether your customized build will pass.
 
-   You may want to change this flag, which is for the number of
-   parallel compiling jobs.
-
-     * CUSTOM_JOBS   := "-j5"
-
    If you are familiar with CMAKE and able to read debian/rules,
-   then this variable is left for you to hack.
-
-     * CONFFLAG_XXX_CUSTOM
-
-   where XXX can be "CPU" or "CUDA".
+   you might hack this variable
+     * CONFFLAG_*
 
 3. Start compiling, make sure you are in the root of source tree.
 
-   Run this command for source "caffe":
-     $ debian/rules custom-cpu
+     $ dpkg-buildpackage -us -uc -j4
 
-   Run this command for source "caffe-contrib":
-     $ debian/rules custom-cuda
+   This will start the compiling process with 4 threads in parallel.
 
 4. Install the resulting .deb packages.
 
diff --git a/debian/rules b/debian/rules
index eca187f..ec027ba 100755
--- a/debian/rules
+++ b/debian/rules
@@ -116,43 +116,3 @@ override_dh_makeshlibs:
 
 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
-#
-CAFFE_CPU_BUILDDIR=$(BUILDDIR)
-SUITE_CPU_P=$(SUITE)
-.PHONY: custom-cpu
-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)
-#### END: CUSTOM TARGETS ##############################################

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