Fix DVAP's caffe version problem.

dockerfiles/Dockerfile.DVAP

@@ -1,4 +1,4 @@
-FROM bvlc/caffe:gpu
+FROM nvidia/cuda:8.0-cudnn5-devel
 
 LABEL maintainer="Toni Kunic <[email protected]>"
 
@@ -34,6 +34,24 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
  git && \
  rm -rf /var/lib/apt/lists/*
 
+################################################################################
+### @wenguanwang's implementation depends on HED's caffe.
+
+COPY models/docker/DVAP/model/Makefile.config /opt/Makefile.config
+
+RUN git clone https://github.com/s9xie/hed.git /opt/caffe && \
+ cd /opt/caffe && \
+ protoc src/caffe/proto/caffe.proto --cpp_out=. && \
+ mkdir include/caffe/proto && \
+ mv src/caffe/proto/caffe.pb.h include/caffe/proto && \
+ mv /opt/Makefile.config /opt/caffe/ && \
+ make -j && \
+ make tools && \
+ make pycaffe
+
+################################################################################
+### smiler_tools
+
 COPY ./smiler_tools /tmp/smiler_tools
 RUN pip install /tmp/smiler_tools
 
@@ -46,4 +64,4 @@ VOLUME ["/opt/output_vol"]
 
 WORKDIR /opt/model
 
-CMD ["/bin/bash"]
+CMD ["/bin/bash"]

models/docker/DVAP/model/Makefile.config

@@ -7,8 +7,6 @@
 # CPU-only switch (uncomment to build without GPU support).
 # CPU_ONLY := 1
 
-OPENCV_VERSION := 3
-
 # 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++
 # CUSTOM_CXX := g++
@@ -45,7 +43,7 @@ BLAS := atlas
 
 # This is required only if you will compile the matlab interface.
 # MATLAB directory should contain the mex binary in /bin.
- MATLAB_DIR := /usr/local/MATLAB/R2015a
+# MATLAB_DIR := /usr/local
 # MATLAB_DIR := /Applications/MATLAB_R2012b.app
 
 # NOTE: this is required only if you will compile the python interface.

models/docker/DVAP/model/run_model.py

@@ -8,6 +8,8 @@
 import time
 import cv2
 
+sys.path.insert(0, '/opt/caffe/python')
+
 import caffe
 
 from smiler_tools.runner import run_model