solver restructuring: now all prototxt are specified in the solver protocol buffer

[jacinto-ai/caffe-jacinto.git] / Makefile

diff --git a/Makefile b/Makefile
index 7b28bfba0e67b6583e26d5f2135e47baa1a53b69..a74d8b51bcdf44f7585d9a38a8f3d3d9f5f1b07b 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -43,11 +43,11 @@ MKL_LIB_DIR := $(MKL_DIR)/lib $(MKL_DIR)/lib/intel64
 # We put src here just for gtest
 INCLUDE_DIRS := ./src ./include /usr/local/include $(CUDA_INCLUDE_DIR) $(MKL_INCLUDE_DIR)
 LIBRARY_DIRS := /usr/lib /usr/local/lib $(CUDA_LIB_DIR) $(MKL_LIB_DIR)
 # We put src here just for gtest
 INCLUDE_DIRS := ./src ./include /usr/local/include $(CUDA_INCLUDE_DIR) $(MKL_INCLUDE_DIR)
 LIBRARY_DIRS := /usr/lib /usr/local/lib $(CUDA_LIB_DIR) $(MKL_LIB_DIR)

-LIBRARIES := cuda cudart cublas protobuf glog mkl_rt mkl_intel_thread curand \
-               leveldb snappy pthread
+LIBRARIES := cuda cudart cublas curand protobuf opencv_core opencv_highgui \
+       glog mkl_rt mkl_intel_thread leveldb snappy pthread

 WARNINGS := -Wall
 
 WARNINGS := -Wall
 

-COMMON_FLAGS := $(foreach includedir,$(INCLUDE_DIRS),-I$(includedir))
+COMMON_FLAGS := -DNDEBUG $(foreach includedir,$(INCLUDE_DIRS),-I$(includedir))

 CXXFLAGS += -pthread -fPIC -O2 $(COMMON_FLAGS)
 NVCCFLAGS := -Xcompiler -fPIC -O2 $(COMMON_FLAGS)
 LDFLAGS += $(foreach librarydir,$(LIBRARY_DIRS),-L$(librarydir)) \
 CXXFLAGS += -pthread -fPIC -O2 $(COMMON_FLAGS)
 NVCCFLAGS := -Xcompiler -fPIC -O2 $(COMMON_FLAGS)
 LDFLAGS += $(foreach librarydir,$(LIBRARY_DIRS),-L$(librarydir)) \