diff options
| author | Kai Li <kaili_kloud@163.com> | 2014-02-07 18:44:10 +0800 |
|---|---|---|
| committer | Evan Shelhamer <shelhamer@imaginarynumber.net> | 2014-03-21 13:52:35 -0700 |
| commit | 1cf822e53bee3eeca5dbc3c08a1e95171688ea9a (patch) | |
| tree | dd3367b8d9a29ed4b992e6025c19c43c1eef50b7 /Makefile | |
| parent | 4f6b26632a9f201f5263cce9d1bbe9e43ec95347 (diff) | |
| download | caffe-1cf822e53bee3eeca5dbc3c08a1e95171688ea9a.tar.gz caffe-1cf822e53bee3eeca5dbc3c08a1e95171688ea9a.tar.bz2 caffe-1cf822e53bee3eeca5dbc3c08a1e95171688ea9a.zip | |
Replace atlas with multithreaded OpenBLAS to speed-up on multi-core CPU
issue: #79
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 7 |
1 files changed, 3 insertions, 4 deletions
@@ -87,16 +87,15 @@ MKL_INCLUDE_DIR := $(MKL_DIR)/include MKL_LIB_DIR := $(MKL_DIR)/lib $(MKL_DIR)/lib/intel64 INCLUDE_DIRS += ./src ./include $(CUDA_INCLUDE_DIR) $(MKL_INCLUDE_DIR) -LIBRARY_DIRS += $(CUDA_LIB_DIR) $(MKL_LIB_DIR) /usr/lib/atlas-base +LIBRARY_DIRS += $(CUDA_LIB_DIR) $(MKL_LIB_DIR) LIBRARIES := cudart cublas curand \ - atlas cblas \ + openblas \ pthread \ glog protobuf \ leveldb snappy \ boost_system \ hdf5_hl hdf5 \ opencv_core opencv_highgui opencv_imgproc - # mkl_rt mkl_intel_thread PYTHON_LIBRARIES := boost_python python2.7 WARNINGS := -Wall @@ -104,7 +103,7 @@ COMMON_FLAGS := -DNDEBUG -O2 $(foreach includedir,$(INCLUDE_DIRS),-I$(includedir CXXFLAGS += -pthread -fPIC $(COMMON_FLAGS) NVCCFLAGS := -ccbin=$(CXX) -Xcompiler -fPIC $(COMMON_FLAGS) LDFLAGS += $(foreach librarydir,$(LIBRARY_DIRS),-L$(librarydir)) \ - $(foreach library,$(LIBRARIES),-l$(library)) -Wl,-rpath=/usr/lib/atlas-base + $(foreach library,$(LIBRARIES),-l$(library)) PYTHON_LDFLAGS := $(LDFLAGS) $(foreach library,$(PYTHON_LIBRARIES),-l$(library)) |