diff options
| author | Rodrigo Benenson <rodrigo.benenson@gmail.com> | 2013-12-08 15:55:39 +1100 |
|---|---|---|
| committer | Evan Shelhamer <shelhamer@imaginarynumber.net> | 2014-03-21 13:52:34 -0700 |
| commit | e4e93f4d12ab33f6765c82b148b64cb4a808a0ee (patch) | |
| tree | cad76254806a9a796b3c8e5ed7cc464ff3e2daf1 /Makefile | |
| parent | 510b3c028f790b88276b23f41562bbca7bdbd748 (diff) | |
| download | caffe-e4e93f4d12ab33f6765c82b148b64cb4a808a0ee.tar.gz caffe-e4e93f4d12ab33f6765c82b148b64cb4a808a0ee.tar.bz2 caffe-e4e93f4d12ab33f6765c82b148b64cb4a808a0ee.zip | |
compile caffe without MKL (dependency replaced by boost::random, Eigen3)
- examples, test and pycaffe compile without problem (matcaffe not tested)
- tests show some errors (on cpu gradient tests), to be investigated
- random generators need to be double checked
- mkl commented code needs to be removed
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 11 |
1 files changed, 6 insertions, 5 deletions
@@ -87,15 +87,16 @@ 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) +LIBRARY_DIRS += $(CUDA_LIB_DIR) $(MKL_LIB_DIR) /usr/lib/atlas-base LIBRARIES := cudart cublas curand \ - mkl_rt \ + atlas cblas \ pthread \ - glog protobuf leveldb \ - snappy \ + 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 @@ -103,7 +104,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)) + $(foreach library,$(LIBRARIES),-l$(library)) -Wl,-rpath=/usr/lib/atlas-base PYTHON_LDFLAGS := $(LDFLAGS) $(foreach library,$(PYTHON_LIBRARIES),-l$(library)) |