[caffe-contrib] 01/11: rules: remove GCC-5 workaround, change default compiler

Zhou Mo cdluminate-guest at moszumanska.debian.org
Mon Nov 28 02:50:11 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 e986fa1e6b6f8dca504b406343b66505c6609520
Author: Zhou Mo <cdluminate at gmail.com>
Date:   Sat Nov 26 07:23:49 2016 +0000

    rules: remove GCC-5 workaround, change default compiler
---
 debian/changelog | 8 ++++++++
 debian/rules     | 5 ++---
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index c554698..bedccf4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+caffe-contrib (1.0.0~rc3+20160930-ga7f950b-2) UNRELEASED; urgency=medium
+
+  * rules:
+    + Change compiler from GCC-5 to Clang-3.8 .
+    + Remove NVCC flag "-D_FORCE_INLINES" (CUDA 7.5 workaround).
+
+ -- Zhou Mo <cdluminate at gmail.com>  Sat, 26 Nov 2016 07:18:43 +0000
+
 caffe-contrib (1.0.0~rc3+20160930-ga7f950b-1) experimental; urgency=medium
 
   * Import upstream snapshot (ga7f950b). (Closes: #838789)
diff --git a/debian/rules b/debian/rules
index 54249a8..828801e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -45,9 +45,8 @@ CONFFLAG_CUDA = \
 	$(CMAKE_CONFIGURE_TEMPLATE) \
 	-DCPU_ONLY=OFF \
 	-DCUDA_ARCH_NAME="All" \
-	-DCMAKE_CXX_COMPILER=g++-5 \
-	-DCMAKE_C_COMPILER=gcc-5 \
-	-DCUDA_NVCC_FLAGS="-D_FORCE_INLINES"
+	-DCMAKE_CXX_COMPILER=clang++-3.8 \
+	-DCMAKE_C_COMPILER=clang-3.8
 
 %:: %.in
 	perl -p \

-- 
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