[caffe-contrib] 286/362: rules: refresh CONFFLAGS

[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 bd47e5ae4a46fbc2434a7fb5e2ade3cb1ceda6d5
Author: Zhou Mo <cdluminate at gmail.com>
Date:   Wed Mar 9 07:11:52 2016 +0000

    rules: refresh CONFFLAGS
---
 debian/changelog |  1 -
 debian/rules     | 46 ++++++++++++++++++++++++----------------------
 2 files changed, 24 insertions(+), 23 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 2053f79..865b0c3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,7 +3,6 @@ caffe (1.0.0~rc3-1) experimental; urgency=low
   * Initial release. (Closes: #788539)
   
   * TODO:
-    + check and refresh all CONFFLAGS in rules.
     + test custom targets.
     + refresh man pages
 
diff --git a/debian/rules b/debian/rules
index 9b5653d..213b43d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -22,37 +22,39 @@ ifeq (installed, $(shell dpkg -s nvidia-cuda-toolkit | grep -o installed))
 	flag_build_caffe_cuda := y
 endif
 
-CONFFLAG_CPU = \
+## CMake Configuration Template, note $(FIXME) does not contain value!
+## Include template and override the fixme options in later configs.
+## * specifying compiler version because of NVCC.
+CMAKE_CONFIGURE_TEMPLATE = \
 	-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_matlab=OFF \
+	-DBUILD_python=ON \
 	-DBUILD_python_layer=ON \
-	-DCMAKE_VERBOSE_MAKEFILE=ON \
+	-Dpython_version="2" \
 	-DCMAKE_BUILD_TYPE="Release" \
-	-DCMAKE_INSTALL_PREFIX="/caffe_cpu"
-CONFFLAG_CUDA = \
-	-DBLAS="Open" \
+	-DCMAKE_CXX_COMPILER=$(FIXME) \
+	-DCMAKE_C_COMPILER=$(FIXME) \
+	-DCMAKE_INSTALL_PREFIX=$(FIXME) \
 	-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 \
+	-DCMAKE_VERBOSE_MAKEFILE=OFF \
+	-DCPU_ONLY=$(FIXME) \
 	-DCUDA_ARCH_NAME="All" \
+	-DUSE_CUDNN=OFF \
+	-DUSE_LEVELDB=ON \
+	-DUSE_LMDB=ON \
+	-DUSE_OPENCV=ON
+CONFFLAG_CPU = $(CMAKE_CONFIGURE_TEMPLATE) \
+	-DCMAKE_CXX_COMPILER=g++ \
+	-DCMAKE_C_COMPILER=gcc \
+	-DCMAKE_INSTALL_PREFIX="/caffe_cpu" \
+	-DCPU_ONLY=ON
+CONFFLAG_CUDA = $(CMAKE_CONFIGURE_TEMPLATE) \
 	-DCMAKE_CXX_COMPILER=g++-5 \
 	-DCMAKE_C_COMPILER=gcc-5 \
-	-DCMAKE_BUILD_TYPE="Release" \
-	-DCMAKE_INSTALL_PREFIX="/caffe_cuda"
+	-DCMAKE_INSTALL_PREFIX="/caffe_cuda" \
+	-DCPU_ONLY=OFF
 
 %:
 	dh $@ \

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