summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorYangqing Jia <jiayq84@gmail.com>2013-11-19 15:05:39 -0800
committerYangqing Jia <jiayq84@gmail.com>2013-11-19 15:05:39 -0800
commit2a381e0b2fa69667320cb21aff1a29867bd5562e (patch)
tree8e3bea6346d41ab1b1183a6767daea222a0e9b26 /Makefile
parent95413ff5abc63d60356d2b4fbfd51c61a2a26f82 (diff)
downloadcaffeonacl-2a381e0b2fa69667320cb21aff1a29867bd5562e.tar.gz
caffeonacl-2a381e0b2fa69667320cb21aff1a29867bd5562e.tar.bz2
caffeonacl-2a381e0b2fa69667320cb21aff1a29867bd5562e.zip
fix pycaffe dependency
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile4
1 files changed, 3 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index c444c84e..b9253060 100644
--- a/Makefile
+++ b/Makefile
@@ -62,7 +62,6 @@ NVCC = $(CUDA_DIR)/bin/nvcc $(NVCCFLAGS) $(CPPFLAGS) $(CUDA_ARCH)
all: $(NAME) $(STATIC_NAME) examples pycaffe
pycaffe: $(STATIC_NAME) python/caffe/pycaffe.cpp $(PROTO_GEN_PY)
- protoc --proto_path=src --python_out=python $(PROTO_SRCS)
$(CXX) -o python/caffe/pycaffe.so -I/usr/include/python2.7 \
-I/usr/local/lib/python2.7/dist-packages/numpy/core/include/ -shared \
python/caffe/pycaffe.cpp $(STATIC_NAME) $(CXXFLAGS) $(LDFLAGS) \
@@ -97,6 +96,9 @@ $(EXAMPLE_OBJS): $(PROTO_GEN_CC)
$(CU_OBJS): %.cuo: %.cu
$(NVCC) -c $< -o $@
+$(PROTO_GEN_PY): $(PROTO_SRCS)
+ protoc --proto_path=src --python_out=python $(PROTO_SRCS)
+
$(PROTO_GEN_CC): $(PROTO_SRCS)
protoc --proto_path=src --cpp_out=src $(PROTO_SRCS)
mkdir -p include/caffe/proto