This commit is contained in:
Yangqing Jia 2013-11-19 15:05:39 -08:00
Родитель 95413ff5ab
Коммит 2a381e0b2f
1 изменённых файлов: 3 добавлений и 1 удалений

Просмотреть файл

@ -62,7 +62,6 @@ NVCC = $(CUDA_DIR)/bin/nvcc $(NVCCFLAGS) $(CPPFLAGS) $(CUDA_ARCH)
all: $(NAME) $(STATIC_NAME) examples pycaffe all: $(NAME) $(STATIC_NAME) examples pycaffe
pycaffe: $(STATIC_NAME) python/caffe/pycaffe.cpp $(PROTO_GEN_PY) 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 \ $(CXX) -o python/caffe/pycaffe.so -I/usr/include/python2.7 \
-I/usr/local/lib/python2.7/dist-packages/numpy/core/include/ -shared \ -I/usr/local/lib/python2.7/dist-packages/numpy/core/include/ -shared \
python/caffe/pycaffe.cpp $(STATIC_NAME) $(CXXFLAGS) $(LDFLAGS) \ python/caffe/pycaffe.cpp $(STATIC_NAME) $(CXXFLAGS) $(LDFLAGS) \
@ -97,6 +96,9 @@ $(EXAMPLE_OBJS): $(PROTO_GEN_CC)
$(CU_OBJS): %.cuo: %.cu $(CU_OBJS): %.cuo: %.cu
$(NVCC) -c $< -o $@ $(NVCC) -c $< -o $@
$(PROTO_GEN_PY): $(PROTO_SRCS)
protoc --proto_path=src --python_out=python $(PROTO_SRCS)
$(PROTO_GEN_CC): $(PROTO_SRCS) $(PROTO_GEN_CC): $(PROTO_SRCS)
protoc --proto_path=src --cpp_out=src $(PROTO_SRCS) protoc --proto_path=src --cpp_out=src $(PROTO_SRCS)
mkdir -p include/caffe/proto mkdir -p include/caffe/proto