[caffe] 08/16: patch: cmake-using-basic-blas
Zhou Mo
cdluminate-guest at moszumanska.debian.org
Wed May 18 07:39: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.
commit f0c2d6ba8ffcdacd4916160f1a6ec0555e644f80
Author: Zhou Mo <cdluminate at gmail.com>
Date: Wed May 18 07:03:19 2016 +0000
patch: cmake-using-basic-blas
---
debian/patches/cmake-using-basic-blas | 22 ++++++++++++++++++++++
debian/patches/series | 1 +
2 files changed, 23 insertions(+)
diff --git a/debian/patches/cmake-using-basic-blas b/debian/patches/cmake-using-basic-blas
new file mode 100644
index 0000000..6e03e65
--- /dev/null
+++ b/debian/patches/cmake-using-basic-blas
@@ -0,0 +1,22 @@
+--- a/cmake/Dependencies.cmake
++++ b/cmake/Dependencies.cmake
+@@ -81,7 +81,7 @@
+
+ # ---[ BLAS
+ if(NOT APPLE)
+- set(BLAS "Atlas" CACHE STRING "Selected BLAS library")
++ set(BLAS "Generic" CACHE STRING "Selected BLAS library")
+ set_property(CACHE BLAS PROPERTY STRINGS "Atlas;Open;MKL")
+
+ if(BLAS STREQUAL "Atlas" OR BLAS STREQUAL "atlas")
+@@ -97,6 +97,10 @@
+ include_directories(SYSTEM ${MKL_INCLUDE_DIR})
+ list(APPEND Caffe_LINKER_LIBS ${MKL_LIBRARIES})
+ add_definitions(-DUSE_MKL)
++ elseif(BLAS STREQUAL "Generic")
++ set(BLA_VENDOR "Generic")
++ find_package(BLAS REQUIRED)
++ list(APPEND Caffe_LINKER_LIBS ${BLAS_LIBRARIES})
+ endif()
+ elseif(APPLE)
+ find_package(vecLib REQUIRED)
diff --git a/debian/patches/series b/debian/patches/series
index fb035da..ddc613e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
+cmake-using-basic-blas
cmake-using-gnuinstalldirs
fix-spelling-error
cmake-fix-python-module-installdir
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/caffe.git
More information about the debian-science-commits
mailing list