Ticket #53980: caffe_rc5_update.patch

math/caffe/Portfile

@@ -2 +2 @@
 
 PortSystem          1.0
 PortGroup           github 1.0
+PortGroup           active_variants 1.1
 
-github.setup        BVLC caffe 6d92d8fcfe0eea9495ffbc326256ec5b70c3eed1
-version             20150717
-revision            5
+github.setup        BVLC caffe rc5
 categories          math science
 maintainers         nomaintainer
 
 description         a fast framework for deep learning
-long_description    ${description}
+long_description    Caffe is a deep learning framework made with expression, \
+                    speed, and modularity in mind. It is developed by the Berkeley \
+                    Vision and Learning Center (BVLC) and community contributors.
 
 homepage            http://caffe.berkeleyvision.org/
 platforms           darwin
 license             BSD
 
-checksums           rmd160  12d7cddfe2b38f5b1a1b1675c457a7a958bff127 \
-                    sha256  07caf1bf1bfebe1a331e2ee61b4b3cccd415b3bd7da641ab8cb5373aabd5d612
+checksums           rmd160  6efd33cc20a94196c5d7dfa6e3fd5f78c347ac5f \
+                    sha256  e02769c6794d9eccb4bd40f3e0437cd8c7d8971866b8b2eea59254c4ada5b540
 
 depends_lib-append  port:google-glog \
                     port:gflags \
@@ -35 +36 @@
 patchfiles          patch-Makefile.diff \
                     patch-Makefile.config.diff
 
+require_active_variants opencv python27
+
 post-extract {
     copy ${worksrcpath}/Makefile.config.example ${worksrcpath}/Makefile.config
 }
@@ -96 +99 @@
 }
 
 variant openblas description {Use OpenBLAS} {
-    depends_lib-append port:OpenBLAS
+    depends_lib-append port:OpenBLAS-devel
     patchfiles-append  patch-openblas.diff
 }
 

math/caffe/files/patch-Makefile.config.diff

@@ -1 @@
---- Makefile.config.orig        2015-06-05 04:14:43.000000000 +0900
-+++ Makefile.config     2015-06-10 01:05:10.000000000 +0900
-@@ -48,8 +48,9 @@
+--- Makefile.config.orig        2017-04-12 23:58:43.000000000 +0530
++++ Makefile.config     2017-04-12 23:59:45.000000000 +0530
+@@ -65,8 +65,9 @@
  
  # 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.
@@ -12 +12 @@
  # Anaconda Python distribution is quite popular. Include path:
  # Verify anaconda location, sometimes it's in root.
  # ANACONDA_HOME := $(HOME)/anaconda
-@@ -58,7 +59,7 @@
-                # $(ANACONDA_HOME)/lib/python2.7/site-packages/numpy/core/include \
+@@ -80,7 +81,7 @@
+ #                 /usr/lib/python3.5/dist-packages/numpy/core/include
  
  # We need to be able to find libpythonX.X.so or .dylib.
 -PYTHON_LIB := /usr/lib
@@ -21 +21 @@
  # PYTHON_LIB := $(ANACONDA_HOME)/lib
  
  # Homebrew installs numpy in a non standard path (keg only)
-@@ -69,8 +70,8 @@
+@@ -91,8 +92,8 @@
  # WITH_PYTHON_LAYER := 1
  
  # Whatever else you find you need goes here.

math/caffe/files/patch-Makefile.diff

@@ -1 @@
---- Makefile.orig       2015-06-24 06:48:24.000000000 +0900
-+++ Makefile    2015-06-27 18:51:14.000000000 +0900
-@@ -170,9 +170,9 @@
+--- Makefile.orig       2017-04-13 00:04:34.000000000 +0530
++++ Makefile    2017-04-13 20:17:58.000000000 +0530
+@@ -178,7 +178,7 @@
         LIBRARIES := cudart cublas curand
  endif
- LIBRARIES += glog gflags protobuf leveldb snappy \
--       lmdb boost_system hdf5_hl hdf5 m \
--       opencv_core opencv_highgui opencv_imgproc
--PYTHON_LIBRARIES := boost_python python2.7
-+       lmdb boost_system-mt hdf5_hl hdf5 m \
-+       opencv_core opencv_highgui opencv_imgproc opencv_imgcodecs
-+PYTHON_LIBRARIES := boost_python-mt python2.7
+ 
+-LIBRARIES += glog gflags protobuf boost_system boost_filesystem m hdf5_hl hdf5
++LIBRARIES += glog gflags protobuf boost_system-mt boost_filesystem-mt m hdf5_hl hdf5
+ 
+ # handle IO dependencies
+ USE_LEVELDB ?= 1
+@@ -199,7 +199,7 @@
+        endif
+ 
+ endif
+-PYTHON_LIBRARIES ?= boost_python python2.7
++PYTHON_LIBRARIES ?= boost_python-mt python2.7
  WARNINGS := -Wall -Wno-sign-compare
  
  ##############################
-@@ -240,7 +240,7 @@
+@@ -270,7 +270,7 @@
  # 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)
-                CUDA_VERSION := $(shell $(CUDA_DIR)/bin/nvcc -V | grep -o 'release \d' | grep -o '\d')
-                ifeq ($(shell echo $(CUDA_VERSION) \< 7.0 | bc), 1)
-@@ -349,7 +349,7 @@
+                CUDA_VERSION := $(shell $(CUDA_DIR)/bin/nvcc -V | grep -o 'release [0-9.]*' | tr -d '[a-z ]')
+                ifeq ($(shell echo | awk '{exit $(CUDA_VERSION) < 7.0;}'), 1)
+@@ -411,7 +411,7 @@
  
  # Complete build flags.
  COMMON_FLAGS += $(foreach includedir,$(INCLUDE_DIRS),-I$(includedir))
@@ -31 +36 @@
  NVCCFLAGS += -ccbin=$(CXX) -Xcompiler -fPIC $(COMMON_FLAGS)
  # mex may invoke an older gcc that is too liberal with -Wuninitalized
  MATLAB_CXXFLAGS := $(CXXFLAGS) -Wno-uninitialized
-@@ -554,7 +554,7 @@
+@@ -619,7 +619,7 @@
  # Target for extension-less symlinks to tool binaries with extension '*.bin'.
  $(TOOL_BUILD_DIR)/%: $(TOOL_BUILD_DIR)/%.bin | $(TOOL_BUILD_DIR)
         @ $(RM) $@
--       @ ln -s $(abspath $<) $@
+-       @ ln -s $(notdir $<) $@
 +       @ cd $(TOOL_BUILD_DIR); ln -s $(notdir $<) $(notdir $@)
  
  $(TOOL_BINS): %.bin : %.o | $(DYNAMIC_NAME)

math/caffe/files/patch-cpu-only.diff

@@ -1 @@
---- Makefile.config.orig        2014-12-18 01:12:23.000000000 +0900
-+++ Makefile.config     2014-12-20 16:03:45.000000000 +0900
-@@ -5,26 +5,26 @@
+--- Makefile.config.orig        2017-04-12 22:51:59.000000000 +0530
++++ Makefile.config     2017-04-12 22:55:24.000000000 +0530
+@@ -5,7 +5,7 @@
  # USE_CUDNN := 1
  
  # CPU-only switch (uncomment to build without GPU support).
 -# CPU_ONLY := 1
 +CPU_ONLY := 1
  
- # To customize your choice of compiler, uncomment and set the following.
- # N.B. the default for Linux is g++ and the default for OSX is clang++
+ # uncomment to disable IO dependencies and corresponding data layers
+ # USE_OPENCV := 0
+@@ -25,7 +25,7 @@
  # CUSTOM_CXX := g++
  
  # CUDA directory contains bin/ and lib/ directories that we need.
@@ -17 +18 @@
  # On Ubuntu 14.04, if cuda tools are installed via
  # "sudo apt-get install nvidia-cuda-toolkit" then use this instead:
  # CUDA_DIR := /usr
- 
+@@ -33,15 +33,15 @@
  # CUDA architecture setting: going with all of them.
- # For CUDA < 6.0, comment the *_50 lines for compatibility.
+ # For CUDA < 6.0, comment the *_50 through *_61 lines for compatibility.
+ # For CUDA < 8.0, comment the *_60 and *_61 lines for compatibility.
 -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 \
--               -gencode arch=compute_50,code=compute_50
+-               -gencode arch=compute_52,code=sm_52 \
+-               -gencode arch=compute_60,code=sm_60 \
+-               -gencode arch=compute_61,code=sm_61 \
+-               -gencode arch=compute_61,code=compute_61
 +# 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 \
-+#              -gencode arch=compute_50,code=compute_50
++#              -gencode arch=compute_52,code=sm_52 \
++#              -gencode arch=compute_60,code=sm_60 \
++#              -gencode arch=compute_61,code=sm_61 \
++#              -gencode arch=compute_61,code=compute_61
  
  # BLAS choice:
  # atlas for ATLAS (default)

math/caffe/files/patch-cudnn.diff

@@ -1 @@
---- Makefile.config.orig        2015-02-22 14:13:41.000000000 +0900
-+++ Makefile.config     2015-02-22 14:15:21.000000000 +0900
+--- Makefile.config.orig        2017-04-12 22:51:59.000000000 +0530
++++ Makefile.config     2017-04-12 22:56:38.000000000 +0530
 @@ -2,7 +2,7 @@
  # Contributions simplifying and improving our build system are welcome!
  

math/caffe/files/patch-openblas.diff

@@ -1 @@
---- Makefile.config.orig        2014-12-20 01:46:25.000000000 +0900
-+++ Makefile.config     2014-12-21 19:00:59.000000000 +0900
-@@ -30,7 +30,7 @@
+--- Makefile.config.orig        2017-04-12 22:51:59.000000000 +0530
++++ Makefile.config     2017-04-12 22:57:49.000000000 +0530
+@@ -47,7 +47,7 @@
  # atlas for ATLAS (default)
  # mkl for MKL
  # open for OpenBlas
@@ -9 +9 @@
  # Custom (MKL/ATLAS/OpenBLAS) include and lib directories.
  # 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
-+++ include/caffe/util/mkl_alternate.hpp        2014-12-21 18:59:58.000000000 +0900
-@@ -8,7 +8,7 @@
- #else  // If use MKL, simply include the MKL header
- 
+--- include/caffe/util/mkl_alternate.hpp.orig   2017-04-12 22:58:08.000000000 +0530
++++ include/caffe/util/mkl_alternate.hpp        2017-04-12 22:58:39.000000000 +0530
+@@ -11,7 +11,7 @@
+ #include <Accelerate/Accelerate.h>
+ #else
  extern "C" {
 -#include <cblas.h>
 +#include <cblas_openblas.h>
  }
- #include <math.h>
+ #endif  // USE_ACCELERATE