summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEvan Shelhamer <shelhamer@imaginarynumber.net>2015-09-17 23:38:39 (GMT)
committerEvan Shelhamer <shelhamer@imaginarynumber.net>2015-09-17 23:38:39 (GMT)
commit3d12b5d9cb014d2e0df4db1b10250ef298e549b9 (patch)
tree6d74c99313354bd09725f884982dfc6482c43994
parent2a585f78a0f5a35e5bb2489969094fd420a986ec (diff)
parente75ae965519444fb64d67c0aa6323bc2ef4049ef (diff)
downloadcaffeonacl-3d12b5d9cb014d2e0df4db1b10250ef298e549b9.zip
caffeonacl-3d12b5d9cb014d2e0df4db1b10250ef298e549b9.tar.gz
caffeonacl-3d12b5d9cb014d2e0df4db1b10250ef298e549b9.tar.bz2
Merge pull request #3081 from shelhamer/include-io-by-default
include IO dependencies by default
-rw-r--r--Makefile7
-rw-r--r--Makefile.config.example8
2 files changed, 10 insertions, 5 deletions
diff --git a/Makefile b/Makefile
index ddaed59..a911133 100644
--- a/Makefile
+++ b/Makefile
@@ -172,6 +172,11 @@ endif
LIBRARIES += glog gflags protobuf boost_system m hdf5_hl hdf5
+# handle IO dependencies
+USE_LEVELDB ?= 1
+USE_LMDB ?= 1
+USE_OPENCV ?= 1
+
ifeq ($(USE_LEVELDB), 1)
LIBRARIES += leveldb snappy
endif
@@ -299,7 +304,7 @@ ifeq ($(USE_CUDNN), 1)
COMMON_FLAGS += -DUSE_CUDNN
endif
-# i/o libraries configuration
+# configure IO libraries
ifeq ($(USE_OPENCV), 1)
COMMON_FLAGS += -DUSE_OPENCV
endif
diff --git a/Makefile.config.example b/Makefile.config.example
index 32e67ee..a20bad2 100644
--- a/Makefile.config.example
+++ b/Makefile.config.example
@@ -7,10 +7,10 @@
# CPU-only switch (uncomment to build without GPU support).
# CPU_ONLY := 1
-# comment out to disable IO dependencies
-USE_LEVELDB := 1
-USE_LMDB := 1
-USE_OPENCV := 1
+# uncomment to disable IO dependencies and corresponding data layers
+# USE_LEVELDB := 0
+# USE_LMDB := 0
+# USE_OPENCV := 0
# To customize your choice of compiler, uncomment and set the following.
# N.B. the default for Linux is g++ and the default for OSX is clang++