<pre style='margin:0'>
Zero King (l2dy) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/3624e5135aa1f78369d5eb61f11ac33238106284">https://github.com/macports/macports-ports/commit/3624e5135aa1f78369d5eb61f11ac33238106284</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 3624e51 caffe: update to 1de4ceb (20170817)
</span>3624e51 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 3624e5135aa1f78369d5eb61f11ac33238106284
</span>Author: Gerard Sole <gerard.sole@rakuten.com>
AuthorDate: Thu Aug 24 16:00:58 2017 +0200
<span style='display:block; white-space:pre;color:#404040;'> caffe: update to 1de4ceb (20170817)
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Port for caffe was old (2015), so this commit upgrades its source to
</span><span style='display:block; white-space:pre;color:#404040;'> current master stable. It updates required patches so library will
</span><span style='display:block; white-space:pre;color:#404040;'> install successfuly.
</span><span style='display:block; white-space:pre;color:#404040;'> Dynamic libraries are amended, so they will point to the correct
</span><span style='display:block; white-space:pre;color:#404040;'> libcaffe. Current Port, has an issue with python and caffe, that
</span><span style='display:block; white-space:pre;color:#404040;'> requires manual recolocation of affected library.
</span><span style='display:block; white-space:pre;color:#404040;'> Also, tests are added for both library and python module.
</span>---
math/caffe/Portfile | 34 ++++++++++++++++----------
math/caffe/files/patch-Makefile.config.diff | 21 +++++++++++-----
math/caffe/files/patch-Makefile.diff | 37 ++++++++++++++++-------------
math/caffe/files/patch-cpu-only.diff | 36 +++++++++++++++++-----------
math/caffe/files/patch-cudnn.diff | 4 ++--
math/caffe/files/patch-openblas.diff | 17 +++++++------
6 files changed, 89 insertions(+), 60 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/caffe/Portfile b/math/caffe/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index fd52391..8b499cb 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/math/caffe/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/math/caffe/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -3,9 +3,9 @@
</span> PortSystem 1.0
PortGroup github 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup BVLC caffe 6d92d8fcfe0eea9495ffbc326256ec5b70c3eed1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-version 20150717
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 6
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+name caffe
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup BVLC caffe 1de4cebfb81d50267d0d8c2595372b14e1408248
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 20170817
</span> categories math science
maintainers nomaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -16,8 +16,8 @@ homepage http://caffe.berkeleyvision.org/
</span> platforms darwin
license BSD
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 12d7cddfe2b38f5b1a1b1675c457a7a958bff127 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 07caf1bf1bfebe1a331e2ee61b4b3cccd415b3bd7da641ab8cb5373aabd5d612
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 fbf514385ccfb2e7c0ef3ccd85c15ffbbd52ec88 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 3fae039f041bc024c966c3f6e99395602cbcd5a29a540f6f4336b6007f8d79b6
</span>
depends_lib-append port:google-glog \
port:gflags \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -43,11 +43,15 @@ use_configure no
</span>
variant universal {}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-set defs "-DGTEST_HAS_TR1_TUPLE=0"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set defs "-DGTEST_HAS_TR1_TUPLE=0 -Wno-deprecated -Wunused-local-typedef"
</span> build.args CXX="${configure.cxx}" \
_CXXFLAGS="${configure.cxxflags} [get_canonical_archflags cxx] ${defs}" \
_PREFIX=${prefix}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+test.run yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+test.args ${build.args}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+test.target test runtest
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> set caffe_root ${prefix}/libexec/${name}
destroot {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -64,6 +68,10 @@ destroot {
</span> copy ${worksrcpath}/${dir} ${destroot}${caffe_root}
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ # copy binary data of examples
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ file mkdir ${destroot}${caffe_root}/build
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ copy ${worksrcpath}/.build_release/examples ${destroot}${caffe_root}/build/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # install additional documents
set docdir ${prefix}/share/doc/${name}
xinstall -m 755 -d ${destroot}${docdir}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -117,18 +125,18 @@ variant python27 description {Install Python 2.7 interface} {
</span> port:py27-protobuf \
port:py27-gflags \
port:py27-leveldb \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py27-dateutil
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py27-dateutil \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py27-pydot
</span>
build.target-append pycaffe
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ test.target-append pytest
</span>
post-destroot {
set packages_dir \
${frameworks_dir}/Python.framework/Versions/2.7/lib/python2.7/site-packages
xinstall -m 755 -d ${destroot}${packages_dir}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- copy ${worksrcpath}/python/caffe ${destroot}${packages_dir}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- system "install_name_tool -id ${packages_dir}/caffe/_caffe.so \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${destroot}${packages_dir}/caffe/_caffe.so"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- system "install_name_tool -change @rpath/libcaffe.so ${prefix}/lib/libcaffe.so \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${destroot}${packages_dir}/caffe/_caffe.so"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ system "install_name_tool -change @rpath/libcaffe.so.1.0.0 ${prefix}/lib/libcaffe.so \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${destroot}${caffe_root}/python/caffe/_caffe.so"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ copy ${destroot}${caffe_root}/python/caffe ${destroot}${packages_dir}
</span> }
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/caffe/files/patch-Makefile.config.diff b/math/caffe/files/patch-Makefile.config.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 91e1fa9..d70cbdc 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/math/caffe/files/patch-Makefile.config.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/math/caffe/files/patch-Makefile.config.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,6 +1,15 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- Makefile.config.orig 2015-06-05 04:14:43.000000000 +0900
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Makefile.config 2015-06-10 01:05:10.000000000 +0900
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -48,8 +48,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- Makefile.config.orig 2017-08-24 10:43:43.000000000 +0900
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ Makefile.config 2017-08-24 10:43:54.000000000 +0900
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -18,7 +18,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # ALLOW_LMDB_NOLOCK := 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Uncomment if you're using OpenCV 3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-# OPENCV_VERSION := 3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++OPENCV_VERSION := 3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # To customize your choice of compiler, uncomment and set the following.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # N.B. the default for Linux is g++ and the default for OSX is clang++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -65,8 +65,9 @@
</span>
# NOTE: this is required only if you will compile the python interface.
# We need to be able to find Python.h and numpy/arrayobject.h.
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -12,8 +21,8 @@
</span> # Anaconda Python distribution is quite popular. Include path:
# Verify anaconda location, sometimes it's in root.
# ANACONDA_HOME := $(HOME)/anaconda
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -58,7 +59,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # $(ANACONDA_HOME)/lib/python2.7/site-packages/numpy/core/include \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -80,7 +81,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # /usr/lib/python3.5/dist-packages/numpy/core/include
</span>
# We need to be able to find libpythonX.X.so or .dylib.
-PYTHON_LIB := /usr/lib
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -21,7 +30,7 @@
</span> # PYTHON_LIB := $(ANACONDA_HOME)/lib
# Homebrew installs numpy in a non standard path (keg only)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -69,8 +70,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -91,8 +92,8 @@
</span> # WITH_PYTHON_LAYER := 1
# Whatever else you find you need goes here.
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/caffe/files/patch-Makefile.diff b/math/caffe/files/patch-Makefile.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 08c1560..3482aad 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/math/caffe/files/patch-Makefile.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/math/caffe/files/patch-Makefile.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,28 +1,33 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- Makefile.orig 2015-06-24 06:48:24.000000000 +0900
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Makefile 2015-06-27 18:51:14.000000000 +0900
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -170,9 +170,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- Makefile.orig 2017-08-24 10:09:06.000000000 +0900
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ Makefile 2017-08-24 10:09:18.000000000 +0900
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -178,7 +178,7 @@
</span> LIBRARIES := cudart cublas curand
endif
<span style='display:block; white-space:pre;background:#ffe0e0;'>- LIBRARIES += glog gflags protobuf leveldb snappy \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- lmdb boost_system hdf5_hl hdf5 m \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- opencv_core opencv_highgui opencv_imgproc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--PYTHON_LIBRARIES := boost_python python2.7
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ lmdb boost_system-mt hdf5_hl hdf5 m \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ opencv_core opencv_highgui opencv_imgproc opencv_imgcodecs
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+PYTHON_LIBRARIES := boost_python-mt python2.7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-LIBRARIES += glog gflags protobuf boost_system boost_filesystem m hdf5_hl hdf5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++LIBRARIES += glog gflags protobuf boost_system-mt boost_filesystem-mt m hdf5_hl hdf5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # handle IO dependencies
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ USE_LEVELDB ?= 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -199,7 +199,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-PYTHON_LIBRARIES ?= boost_python python2.7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++PYTHON_LIBRARIES ?= boost_python-mt python2.7
</span> WARNINGS := -Wall -Wno-sign-compare
##############################
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -240,7 +240,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -270,7 +270,7 @@
</span> # clang++ instead of g++
# libstdc++ for NVCC compatibility on OS X >= 10.9 with CUDA < 7.0
ifeq ($(OSX), 1)
- CXX := /usr/bin/clang++
+ CXX ?= /usr/bin/clang++
ifneq ($(CPU_ONLY), 1)
<span style='display:block; white-space:pre;background:#ffe0e0;'>- CUDA_VERSION := $(shell $(CUDA_DIR)/bin/nvcc -V | grep -o 'release \d' | grep -o '\d')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ifeq ($(shell echo $(CUDA_VERSION) \< 7.0 | bc), 1)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -349,7 +349,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CUDA_VERSION := $(shell $(CUDA_DIR)/bin/nvcc -V | grep -o 'release [0-9.]*' | tr -d '[a-z ]')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ifeq ($(shell echo | awk '{exit $(CUDA_VERSION) < 7.0;}'), 1)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -411,7 +411,7 @@
</span>
# Complete build flags.
COMMON_FLAGS += $(foreach includedir,$(INCLUDE_DIRS),-I$(includedir))
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -31,11 +36,11 @@
</span> NVCCFLAGS += -ccbin=$(CXX) -Xcompiler -fPIC $(COMMON_FLAGS)
# mex may invoke an older gcc that is too liberal with -Wuninitalized
MATLAB_CXXFLAGS := $(CXXFLAGS) -Wno-uninitialized
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -554,7 +554,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -619,7 +619,7 @@
</span> # Target for extension-less symlinks to tool binaries with extension '*.bin'.
$(TOOL_BUILD_DIR)/%: $(TOOL_BUILD_DIR)/%.bin | $(TOOL_BUILD_DIR)
@ $(RM) $@
<span style='display:block; white-space:pre;background:#ffe0e0;'>-- @ ln -s $(abspath $<) $@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- @ ln -s $(notdir $<) $@
</span> + @ cd $(TOOL_BUILD_DIR); ln -s $(notdir $<) $(notdir $@)
$(TOOL_BINS): %.bin : %.o | $(DYNAMIC_NAME)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/caffe/files/patch-cpu-only.diff b/math/caffe/files/patch-cpu-only.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index a7b49d2..f26e827 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/math/caffe/files/patch-cpu-only.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/math/caffe/files/patch-cpu-only.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,14 +1,15 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- Makefile.config.orig 2014-12-18 01:12:23.000000000 +0900
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Makefile.config 2014-12-20 16:03:45.000000000 +0900
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -5,26 +5,26 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- Makefile.config.orig 2017-08-24 10:43:43.000000000 +0900
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ Makefile.config 2017-08-24 10:43:54.000000000 +0900
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -5,7 +5,7 @@
</span> # USE_CUDNN := 1
# CPU-only switch (uncomment to build without GPU support).
-# CPU_ONLY := 1
+CPU_ONLY := 1
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # To customize your choice of compiler, uncomment and set the following.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # N.B. the default for Linux is g++ and the default for OSX is clang++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # uncomment to disable IO dependencies and corresponding data layers
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # USE_OPENCV := 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -25,7 +25,7 @@
</span> # CUSTOM_CXX := g++
# CUDA directory contains bin/ and lib/ directories that we need.
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -17,21 +18,28 @@
</span> # On Ubuntu 14.04, if cuda tools are installed via
# "sudo apt-get install nvidia-cuda-toolkit" then use this instead:
# CUDA_DIR := /usr
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -33,15 +33,15 @@
</span> # CUDA architecture setting: going with all of them.
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # For CUDA < 6.0, comment the *_50 lines for compatibility.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # For CUDA < 6.0, comment the *_50 through *_61 lines for compatibility.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # For CUDA < 8.0, comment the *_60 and *_61 lines for compatibility.
</span> -CUDA_ARCH := -gencode arch=compute_20,code=sm_20 \
- -gencode arch=compute_20,code=sm_21 \
- -gencode arch=compute_30,code=sm_30 \
- -gencode arch=compute_35,code=sm_35 \
- -gencode arch=compute_50,code=sm_50 \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-- -gencode arch=compute_50,code=compute_50
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# CUDA_ARCH := -gencode arch=compute_20,code=sm_20 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# -gencode arch=compute_20,code=sm_21 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# -gencode arch=compute_30,code=sm_30 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# -gencode arch=compute_35,code=sm_35 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# -gencode arch=compute_50,code=sm_50 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# -gencode arch=compute_50,code=compute_50
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- -gencode arch=compute_52,code=sm_52 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- -gencode arch=compute_60,code=sm_60 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- -gencode arch=compute_61,code=sm_61 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- -gencode arch=compute_61,code=compute_61
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#CUDA_ARCH := -gencode arch=compute_20,code=sm_20 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# -gencode arch=compute_20,code=sm_21 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# -gencode arch=compute_30,code=sm_30 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# -gencode arch=compute_35,code=sm_35 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# -gencode arch=compute_50,code=sm_50 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# -gencode arch=compute_52,code=sm_52 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# -gencode arch=compute_60,code=sm_60 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# -gencode arch=compute_61,code=sm_61 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# -gencode arch=compute_61,code=compute_61
</span>
# BLAS choice:
# atlas for ATLAS (default)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/caffe/files/patch-cudnn.diff b/math/caffe/files/patch-cudnn.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 04ad905..ee3dffa 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/math/caffe/files/patch-cudnn.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/math/caffe/files/patch-cudnn.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,5 +1,5 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- Makefile.config.orig 2015-02-22 14:13:41.000000000 +0900
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Makefile.config 2015-02-22 14:15:21.000000000 +0900
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- Makefile.config.orig 2017-08-24 10:43:43.000000000 +0900
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ Makefile.config 2017-08-24 10:43:54.000000000 +0900
</span> @@ -2,7 +2,7 @@
# Contributions simplifying and improving our build system are welcome!
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/caffe/files/patch-openblas.diff b/math/caffe/files/patch-openblas.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index cc204cd..a7b91ca 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/math/caffe/files/patch-openblas.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/math/caffe/files/patch-openblas.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,6 +1,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- Makefile.config.orig 2014-12-20 01:46:25.000000000 +0900
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Makefile.config 2014-12-21 19:00:59.000000000 +0900
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -30,7 +30,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- Makefile.config.orig 2017-08-24 10:43:43.000000000 +0900
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ Makefile.config 2017-08-24 10:43:54.000000000 +0900
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -47,7 +47,7 @@
</span> # atlas for ATLAS (default)
# mkl for MKL
# open for OpenBlas
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -10,13 +10,12 @@
</span> # Leave commented to accept the defaults for your choice of BLAS
# (which should work)!
--- include/caffe/util/mkl_alternate.hpp.orig 2014-12-18 01:12:23.000000000 +0900
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ include/caffe/util/mkl_alternate.hpp 2014-12-21 18:59:58.000000000 +0900
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -8,7 +8,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #else // If use MKL, simply include the MKL header
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ include/caffe/util/mkl_alternate.hpp 2017-08-24 10:43:54.000000000 +0900
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -11,7 +11,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <Accelerate/Accelerate.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #else
</span> extern "C" {
-#include <cblas.h>
+#include <cblas_openblas.h>
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <math.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif // USE_ACCELERATE
</span></pre><pre style='margin:0'>
</pre>