diff options
| author | Rowland Depp <depp.rowland@gmail.com> | 2014-02-11 21:41:01 -0800 |
|---|---|---|
| committer | Evan Shelhamer <shelhamer@imaginarynumber.net> | 2014-03-21 13:52:36 -0700 |
| commit | a8c9b66b7f62610d71a18c798d5eb7157d49420c (patch) | |
| tree | 295704e0d2fa2d201abd3b12626d0739a777f040 /Makefile | |
| parent | 1cf822e53bee3eeca5dbc3c08a1e95171688ea9a (diff) | |
| download | caffe-a8c9b66b7f62610d71a18c798d5eb7157d49420c.tar.gz caffe-a8c9b66b7f62610d71a18c798d5eb7157d49420c.tar.bz2 caffe-a8c9b66b7f62610d71a18c798d5eb7157d49420c.zip | |
major refactoring allow coexistence of MKL and non-MKL cases
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 8 |
1 files changed, 8 insertions, 0 deletions
@@ -106,6 +106,14 @@ LDFLAGS += $(foreach librarydir,$(LIBRARY_DIRS),-L$(librarydir)) \ $(foreach library,$(LIBRARIES),-l$(library)) PYTHON_LDFLAGS := $(LDFLAGS) $(foreach library,$(PYTHON_LIBRARIES),-l$(library)) +# MKL options +ifdef USE_MKL + LIBRARIES += mkl_rt + COMMON_FLAGS += -DUSE_MKL +else + LIBRARIES += atlas cblas +endif + ############################## # Define build targets |